From fd2d833bf010d0be1bb308d9c431eee1dfd931ff Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 20 十二月 2024 16:46:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 543ee6c..25f15f5 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -451,6 +451,7 @@
                     ",HSourceID5=" + HSourceID5 +
                     ",HPayProcID=" + HPayProcID +
                     ",HGroupID=" + HGroupID +
+                    ",HShiftsID=" + HShiftsID +
                     ",HWorkTimes=" + HWorkTimes +
                     ",HSaveBillFlag=0 " +
                     ",HBadCount=" + HBadCount +
@@ -468,10 +469,9 @@
                     ",HWasterQty_Work=" + HWasterQty_Work +
                     ",HWasterQty_Mater=" + HWasterQty_Mater +
                     ",HBackWorkQty=" + HBackWorkQty +
-                    ",HShiftsID=" + HShiftsID +
                     ",HBackWorkByMaterQty=" + HBackWorkByMaterQty +
                     ",HMouldID=" + HMouldID +
-                    ",HMachineWorkTimes=" + HMachineWorkTimes +
+                    ",HMachineWorkTimes=" + HMachineWorkTimes +  
                     " where HInterID=" + HInterID);
 
                     LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭鍑虹珯鍗曟嵁:" + HBillNo);

--
Gitblit v1.9.1