From 96a94a59c08f55712ba04eb413e7f61739f11f66 Mon Sep 17 00:00:00 2001
From: zhanghonglin <zhanghonglin@hnkhzn.com>
Date: 星期二, 19 八月 2025 17:09:31 +0800
Subject: [PATCH] 定时一周自动清楚重量厚度,不合格背景红色提示、筛选功能

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ZXJ/ZXJJob.cs |   61 +++++++++++++++++++++---------
 1 files changed, 42 insertions(+), 19 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ZXJ/ZXJJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ZXJ/ZXJJob.cs"
index 8973d07..ad7290b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ZXJ/ZXJJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ZXJ/ZXJJob.cs"
@@ -15,6 +15,7 @@
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using WIDESEAWCS_Common.WeightThicknessEnum;
 using WIDESEAWCS_Communicator;
 using WIDESEAWCS_Core.Helper;
 using WIDESEAWCS_ISystemServices;
@@ -161,34 +162,56 @@
                             dt_thickness.centreright = tz6;
                             dt_thickness.bottomleft = tz7;
                             dt_thickness.bottomright = tz8;
+
+                            int a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0;
                             //鍒ゆ柇鍚堟牸
                             if (tz1 < tza2 && tz1 > tza1)
                             {
-                                dt_thickness.qualified = 1;
-                            }else if (tz2 < tzb2 && tz1 > tzb1)
+                                a = 1;
+                            }
+
+                            if (tz2 < tzb2 && tz2 > tzb1)
                             {
-                                dt_thickness.qualified = 1;
-                            }else if (tz3 < tzc2 && tz1 > tzc1)
+                                b = 1;
+                            }
+
+                            if (tz3 < tzc2 && tz3 > tzc1)
                             {
-                                dt_thickness.qualified = 1;
-                            }else if (tz4 < tzd2 && tz1 > tzd1)
+                                c = 1;
+                            }
+
+                            if (tz4 < tzd2 && tz4 > tzd1)
                             {
-                                dt_thickness.qualified = 1;
-                            }else if (tz5 < tze2 && tz1 > tze1)
+                                d = 1;
+                            }
+
+                            if (tz5 < tze2 && tz5 > tze1)
                             {
-                                dt_thickness.qualified = 1;
-                            }else if (tz6 < tzf2 && tz1 > tzf1)
+                                e = 1;
+                            }
+
+                            if (tz6 < tzf2 && tz6 > tzf1)
                             {
-                                dt_thickness.qualified = 1;
-                            }else if (tz7 < tzg2 && tz1 > tzg1)
+                                f = 1;
+                            }
+
+                            if (tz7 < tzg2 && tz7 > tzg1)
                             {
-                                dt_thickness.qualified = 1;
-                            }else if (tz8 < tzh2 && tz1 > tzh1)
+                                g = 1;
+                            }
+
+                            if (tz8 < tzh2 && tz8 > tzh1)
                             {
-                                dt_thickness.qualified = 1;
-                            }else
+                                h = 1;
+                            }
+
+                            if (a == 1 && b == 1 && c == 1 && d == 1 && e == 1 && f == 1 && g == 1 && h == 1)
                             {
-                                dt_thickness.qualified = 0;
+                                dt_thickness.qualified = (int)WeightThicknessEnum.yes;
+                            }
+                            else
+                            {
+                                dt_thickness.qualified = (int)WeightThicknessEnum.on;
                             }
                             //鍖洪棿鍊�
                             dt_thickness.interval = tza1 + "-" + tza2+","+ tzb1 + "-" + tzb2 + "," + tzc1 + "-" + tzc2 + "," + tzd1 + "-" + tzd2 + "," + tze1 + "-" + tze2 + "," + tzf1 + "-" + tzf2 + "," + tzg1 + "-" + tzg2 + "," + tzh1 + "-" + tzh2;
@@ -211,11 +234,11 @@
                             //鍒ゆ柇鍚堟牸
                             if (w>ws1&&w<ws2)
                             {
-                                dt_weight.qualified = 1;
+                                dt_weight.qualified = (int)WeightThicknessEnum.yes;
                             }
                             else
                             {
-                                dt_weight.qualified = 0;
+                                dt_weight.qualified = (int)WeightThicknessEnum.on;
                             }
                             //鍖洪棿鍊�
                             dt_weight.interval = ws1+"-"+ws2;

--
Gitblit v1.9.3