From 4286ee5823987af404e167a7c4aeacbe7def3c36 Mon Sep 17 00:00:00 2001 From: 王 垚 <1402714037@qq.com> Date: 星期三, 27 七月 2022 10:19:37 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API into master --- WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs index 7b5f663..105b64e 100644 --- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs @@ -323,6 +323,11 @@ long HProcID = list[0].HProcID; int HUSEORGID = list[0].HUSEORGID; + + + long HWorkCenterID = list[0].HWorkCenterID; //宸ヤ綔涓績 + + //鍒ゆ柇鏉冮檺 //if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3)) //{ @@ -360,13 +365,13 @@ ",HTypeFlow,HTypeCount,HDeptNumber,HSNo" + ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" + ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" + - ",HUSEORGID) " + + ",HUSEORGID,HWorkCenterID) " + " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + "," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "','" + HSNo.ToString() + "'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID + ",'" + HBarCode + "'," + HProcessID_K3 + ",'" +HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) + ",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" + - ","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo); + ","+ HUSEORGID + "," + HWorkCenterID + ")", ref DBUtility.ClsPub.sExeReturnInfo); //淇敼涓婄骇涓洪潪鏈骇浠g爜 oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); oCN.Commit(); @@ -397,6 +402,7 @@ ",HFixPrice= " + HFixPrice + ",HOverFixPrice= " + HOverFixPrice + ",HProcMulID= " + HProcMulID + + ",HWorkCenterID= " + HWorkCenterID + ",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); //淇敼涓婄骇涓洪潪鏈骇浠g爜 oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); -- Gitblit v1.9.1