From b7ede349929b44bd664d059728919f6c8eede66a Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期四, 30 三月 2023 09:39:44 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 103 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 79 insertions(+), 24 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs index 2b9d5e1..b81594d 100644 --- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs @@ -293,27 +293,6 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); - - //鍙嶅簭鍒楀寲 - msg2 = "[" + msg2.ToString() + "]"; - List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(msg2); - - long HItemID = list[0].HItemID; - string HNumber = list[0].HNumber; - string HName = list[0].HName; - string HHelpCode = list[0].HHelpCode; - string HShortNumber = list[0].HShortNumber; - long HParentID = list[0].HParentID; - long HLevel = list[0].HLevel; - bool HEndFlag = list[0].HEndFlag; - bool HStopflag = list[0].HStopFlag; - string HRemark = list[0].HRemark; - string HBarCode = list[0].HBarCode; - long HEmpID = list[0].HEmpID; - string HAddress = list[0].HAddress; - string HPhone = list[0].HPhone; - long HUSEORGID = list[0].HUSEORGID; - string HUpDater = list[0].HUpDater; ////鍒ゆ柇鏉冮檺 if (!ClsPub.Security_Log("Gy_Warehouse_Edit", 1, false, msg3)) @@ -324,6 +303,63 @@ objJsonResult.data = null; return objJsonResult; } + + //鍙嶅簭鍒楀寲 + msg2 = "[" + msg2.ToString() + "]"; + List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(msg2); + + long HItemID = list[0].HItemID; + string HNumber = list[0].HNumber; + string HName = list[0].HName; + string HHelpCode = list[0].HHelpCode; + bool HStopflag = list[0].HStopFlag; + string HRemark = list[0].HRemark; + string HBarCode = list[0].HBarCode; + long HEmpID = list[0].HEmpID; + string HAddress = list[0].HAddress; + string HPhone = list[0].HPhone; + long HUSEORGID = list[0].HUSEORGID; + //long HCREATEORGID = list[0].HCREATEORGID; + string HUpDater = list[0].HUpDater; + long HSPFlag = list[0].HSPFlag; + //寰楀埌鐭唬鐮� + string HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber); + if (HShortNumber.Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + 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_Warehouse where HNumber='" + sParent + "' and HStopFlag=0 ", "Gy_Warehouse"); + 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; + } + } + //鏈骇鏍囧織 + int HEndFlag = 1; //if (!DBUtility.ClsPub.AllowNumber(HNumber)) //{ @@ -349,11 +385,18 @@ oCN.BeginTran(); oCN.RunProc("Insert into Gy_Warehouse " + " (HNumber,HName,HHelpCode,HShortNumber,HParentID" + - ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID) " + + ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID,HSPFlag,HCREATEORGID,HMaker,HMakeTime) " + " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + - "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID.ToString() + ",'" + HAddress + "','" + HPhone + "','"+ HUSEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo); + "," + HLevel.ToString() + "," + HEndFlag + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID.ToString() + ",'" + HAddress + "','" + HPhone + "','"+ HUSEORGID + "',"+ HSPFlag + ","+ HUSEORGID + ",'"+msg3+"',getdate())", ref DBUtility.ClsPub.sExeReturnInfo); //淇敼涓婄骇涓洪潪鏈骇浠g爜 oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); + //鍚敤浠撲綅 + if (HSPFlag == 1) + { + //鍥炲~ HSPGroupID + oCN.RunProc("Update Gy_Warehouse set HSPGroupID=HItemID where HNumber='" + HNumber + "' and HName='" + HName + "' ", ref DBUtility.ClsPub.sExeReturnInfo); + } + oCN.Commit(); } else { @@ -367,12 +410,14 @@ ",HHelpCode='" + HHelpCode + "'" + ",HLevel=" + HLevel.ToString() + ",HParentID=" + HParentID.ToString() + - ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) + ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) + ",HEmpID=" + HEmpID.ToString() + ",HAddress='" + HAddress + "'" + ",HPhone='" + HPhone + "'" + ",HUSEORGID='" + HUSEORGID + "'" + + ",HCREATEORGID='" + HUSEORGID + "'" + + ",HSPFlag='" + HSPFlag + "'" + + //",HSPGroupID='" + HSPGroupID + "'" + ",HUpdater='" + HUpDater + "'" + ",HUpdateDate= getdate()" + ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); @@ -381,6 +426,16 @@ //灏嗕笂绾� 涓洪潪鏈骇 oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); // + //鍚敤浠撲綅 + if (HSPFlag == 1) + { + //鍥炲~ HSPGroupID + oCN.RunProc("Update Gy_Warehouse set HSPGroupID=HItemID where HItemID=" + HItemID , ref DBUtility.ClsPub.sExeReturnInfo); + } + else { + //鍥炲~ HSPGroupID + oCN.RunProc("Update Gy_Warehouse set HSPGroupID=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); + } oCN.Commit(); } objJsonResult.code = "0"; -- Gitblit v1.9.1