From c23b8434054d5de5ef8575e25c4441ede6c6ac2d Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期日, 09 十月 2022 15:28:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 5993416..7d1c3d9 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -489,7 +489,7 @@
                     oBill.omodel.HMainSourceInterID = list[i].HMainSourceInterID;
                     oBill.omodel.HMainSourceBillNo = list[i].HMainSourceBillNo;
                     oBill.omodel.HMainSourceBillType = list[i].HMainSourceBillType;
-                    oBill.omodel.HLastSubProc = list[i].HLastSubProc;
+                    oBill.omodel.HLastSubProc = true;
                     oBill.omodel.HEmpID2 = list[i].HEmpID2;
                     oBill.omodel.HEmpID3 = list[i].HEmpID3;
                     oBill.omodel.HEmpID4 = list[i].HEmpID4;
@@ -499,6 +499,7 @@
                     oBill.omodel.HPriceRate = list[i].HPriceRate;
                     oBill.omodel.HWorkTimes = list[i].HWorkTimes;
                     oBill.omodel.HQCCheckID = list[i].HQCCheckID;
+                    oBill.omodel.HMaker = msg4;
 
                     //string HBillSubType = "3791";
                     //long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D

--
Gitblit v1.9.1