From 38189dd485d2d171bcca2e0ced35d6c8d187bdd3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 06 二月 2023 08:32:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index c3752c1..5418030 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -212,7 +212,8 @@
                     return objJsonResult;
                 }
 
-                List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2); 
+                List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2);
+                DBUtility.ClsPub.CurUserName = user;
                 long HMainInterID = 0;
                 HMainInterID = list[0].HMainInterID;
                 string eventType = list[0].eventType;
@@ -375,6 +376,7 @@
                     ",HTaxRate=" + HTaxRate +
                     ",HMaterID=" + HMaterID +
                     ",HProcID=" + HProcID +
+                    ",HEmpID=" + HEmpID +
                     ",HProcNo=" + HProcNo +
                     ",HOrderProcNO='" + HOrderProcNO + "'" +
                     " where HInterID=" + HInterID);
@@ -433,7 +435,7 @@
                 }
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+                objJsonResult.Message = "鎿嶄綔鍗曟嵁鎴愬姛锛�";
                 objJsonResult.data = ds.Tables[0];
                 return objJsonResult;
             }

--
Gitblit v1.9.1