From d0d6ab23709780d8f9a8b3eac1912057bd120b9c Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 10 十月 2024 09:23:54 +0800
Subject: [PATCH] 考勤汇报单,出战汇报单pda网页自动审核

---
 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 12ba45d..9d1b57f 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -405,7 +405,7 @@
             foreach (Gy_RoutingBillSub oSub in DetailColl)
             {
                 i++;
-                if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤")
+                if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧")
                 {
                     if (oSub.HWorkQty <= 0)
                     {
@@ -450,7 +450,7 @@
                     //璁′环鏂瑰紡涓嶄负璁℃椂锛屽垯鎶婅鏃舵殏浼板瓧娈垫洿鏂颁负绌�
                     if (oSub.HIsTime == false)
                     {
-                        oCN.RunProc("update Gy_RoutingBillSub set HEstimate = null where HInterID = " + HInterID + " and HEntryID = " + i);                  
+                        oCN.RunProc("update Gy_RoutingBillSub set HEstimate = 0 where HInterID = " + HInterID + " and HEntryID = " + i);                  
                     }
 
                     if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
@@ -494,7 +494,7 @@
                     //璁′环鏂瑰紡涓嶄负璁℃椂锛屽垯鎶婅鏃舵殏浼板瓧娈垫洿鏂颁负绌�
                     if (oSub.HIsTime == false)
                     {
-                        oCN.RunProc("update Gy_RoutingBillSub set HEstimate = null where HInterID = " + HInterID + " and HEntryID = " + i);
+                        oCN.RunProc("update Gy_RoutingBillSub set HEstimate = 0 where HInterID = " + HInterID + " and HEntryID = " + i);
                     }
 
                     if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)

--
Gitblit v1.9.1