From 4ca7514bcf157501fa0a9ee99c468e865f054877 Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期三, 14 六月 2023 13:19:25 +0800 Subject: [PATCH] 按钮设置:用户自定义 --- WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs | 51 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 41 insertions(+), 10 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs index e7fa17a..941cffa 100644 --- a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs @@ -304,32 +304,59 @@ long HItemID = list[0].HItemID; string HNumber = list[0].HNumber; string HName = list[0].HName; - string HShortNumber = list[0].HShortNumber; string HDeptNumber = list[0].HDeptNumber; - long HParentID = list[0].HParentID; string HHelpCode = list[0].HHelpCode; string HRemark = list[0].HRemark; bool HStopflag = list[0].HStopflag; - bool HEndFlag = list[0].HStopflag; string HUseFlag = list[0].HUseFlag; var HQty = list[0].HQty; var HBarCodeForBase = list[0].HBarCodeForBase; var HDayMoney = list[0].HDayMoney; var HDeptID = list[0].HDeptID; var HProcID = list[0].HProcID; - var HLevel = list[0].HLevel; var HWorkTimes = list[0].HWorkTimes; int HUSEORGID = list[0].HUSEORGID; + string HMaker = msg2; - //鍒ゆ柇鏉冮檺 - if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2)) + //鏈骇鏍囧織 + bool HEndFlag = true; + //寰楀埌鐭唬鐮� + string HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber); + if (HShortNumber.Trim() == "") { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒"; - objJsonResult.data = null; + objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠g爜涓虹┖锛�"; + objJsonResult.data = 1; return objJsonResult; } + //绛夌骇 + int HLevel = DBUtility.ClsPub.GetLevel(HNumber); + + //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦� + long HParentID = 0; + string sParent = DBUtility.ClsPub.GetParentCode(HNumber); + if (sParent.Trim() == "") + { + HParentID = 0; + } + else + { + ds = oCN.RunProcReturn("select * from Gy_WorkCenter where HNumber='" + sParent + "' and HStopFlag=0 ", "Gy_WorkCenter"); + if (ds.Tables[0].Rows.Count > 0) + { + HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString()); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + } + //if (!DBUtility.ClsPub.AllowNumber(HNumber)) //{ @@ -357,11 +384,12 @@ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" + ",HDeptNumber,HWorkTimes,HQty" + ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" + - ",HProcID,HDayMoney,HUSEORGID) " + + ",HProcID,HDayMoney,HUSEORGID,HMaker,HMakeTime) " + " 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 + ","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo); + ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ","+ HUSEORGID + "" + + ",'"+ HMaker + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo); //淇敼涓婄骇涓洪潪鏈骇浠g爜 oCN.RunProc("Update Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); oCN.Commit(); @@ -378,7 +406,10 @@ ",HParentID=" + HParentID + ",HStopflag='" + HStopflag + "'" + ",HRemark= '" + HRemark + "'" + + ",HUpDater= '" + HMaker + "'" + + ",HUpDateDate= getdate()" + ",HDeptID=" + HDeptID + + ",HLevel=" + HLevel + ",HQty=" + HQty + ",HWorkTimes=" + HWorkTimes + ",HBarCodeForBase='" + HBarCodeForBase + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); -- Gitblit v1.9.1