From d4a636d91941498d470ac4c94a3145599cf7429d Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 08 七月 2022 19:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
index 5724165..d04ecdf 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -256,8 +256,8 @@
}
//鍙嶅簭鍒楀寲
- msg2 = "[" + msg2.ToString() + "]";
- List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg2);
+ msg1 = "[" + msg1.ToString() + "]";
+ List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg1);
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
@@ -277,9 +277,10 @@
var HProcID = list[0].HProcID;
var HLevel = list[0].HLevel;
var HWorkTimes = list[0].HWorkTimes;
+ int HUSEORGID = list[0].HUSEORGID;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg3))
+ if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -314,11 +315,11 @@
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HDeptNumber,HWorkTimes,HQty" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
- ",HProcID,HDayMoney) " +
+ ",HProcID,HDayMoney,HUSEORGID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
",'" + HDeptNumber + "'," + HWorkTimes + "," + HQty +
"," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) +
- ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
--
Gitblit v1.9.1