From a0b18678561a91dead002684e6589c51dc789299 Mon Sep 17 00:00:00 2001 From: yxj <yxj@hz-kingdee.com> Date: 星期二, 17 十二月 2024 14:43:40 +0800 Subject: [PATCH] PDA校验缓存模块相关方法新增 --- WebAPI/Controllers/条码管理/WEBSController.cs | 447 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 445 insertions(+), 2 deletions(-) diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" index 9e6e063..98ba87a 100644 --- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" +++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" @@ -5281,6 +5281,48 @@ #endregion + #region 鎵弿鍗曟嵁鏉$爜 宸插瓨鍦ㄦ壂鐮佽褰曚笖鍗曟嵁鍙戠敓鍙樻洿鍚庝袱杈规暟鎹笉涓�鑷存椂锛屾竻绌哄師鎵爜鏁版嵁 20241216 + + /// <summary> + /// 宸插瓨鍦ㄦ壂鐮佽褰曚笖鍗曟嵁鍙戠敓鍙樻洿鍚庝袱杈规暟鎹笉涓�鑷存椂锛屾竻绌哄師鎵爜鏁版嵁 + /// </summary> + /// <returns></returns> + [Route("WEBSController/get_ClearBarCode_BillCheck_Json")] + [HttpGet] + public object get_ClearBarCode_BillCheck_Json(Int64 HInterID, string HBillType, string HMaker, Int64 HStockOrgID) + { + try + { + ds = oCn.RunProcReturn("exec h_p_WMS_ClearBarCode_BillCheck " + HInterID.ToString() + ",'" + HBillType + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_ClearBarCode_BillCheck"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娓呯┖鍘熸壂鐮佹暟鎹彂鐢熼敊璇紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娓呯┖鍘熸壂鐮佹暟鎹け璐ワ紒" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + #region 鎵弿鐗╂枡鏉$爜 鍑哄叆搴撴ā鍧� /// <summary> @@ -5294,7 +5336,7 @@ //鑾峰彇绯荤粺鍙傛暟 string sErrMsg = ""; string sJXCode = ""; - if (oSystemParameter.ShowBill(ref sErrMsg) == true) + if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true) { string sSourceBarCodeCtl = "N"; //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 @@ -5689,7 +5731,7 @@ #endregion - #region 缂撳瓨妯″潡 杩斿洖缂撳瓨鍒楄〃淇℃伅 + #region 鏍¢獙缂撳瓨妯″潡 杩斿洖缂撳瓨鍒楄〃淇℃伅 /// <summary> /// 杩斿洖缂撳瓨鍒楄〃淇℃伅 鏍¢獙妯″紡 @@ -5733,6 +5775,186 @@ objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "鑾峰彇缂撳瓨鍒楄〃淇℃伅澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + + #region 鏍¢獙缂撳瓨妯″潡 鏍规嵁鍗曟嵁ID,鍒犻櫎涓存椂琛ㄨ褰� 20241216 + + /// <summary> + /// 鏍规嵁鍗曟嵁ID,鍒犻櫎涓存椂琛ㄨ褰� + /// </summary> + /// <returns></returns> + [Route("WEBSController/DeleteTempBillList_BillCheck_Json")] + [HttpGet] + public object DeleteTempBillList_BillCheck_Json(long HInterID, string HBillNo, string HBillType, string HMaker, string MvarReportTitle, Int64 HStockOrgID) + { + string WorkList = "鍒犻櫎鏍¢獙缂撳瓨鍗曟嵁锛屽崟鎹彿锛�" + HBillNo; + string SystemName = "WMS-" + MvarReportTitle + "妯″潡"; + //鑾峰彇绯荤粺鍙傛暟 + string sErrMsg = ""; + if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true) + { + string sSourceBarCodeCtl = "N"; //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + + #region 绯荤粺鍙傛暟鑾峰彇 + //閲囪喘鍏ュ簱鍗� + if (HBillType == "1201") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //鐢熶骇鍏ュ簱鍗� + if (HBillType == "1202") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //鍏朵粬鍏ュ簱鍗� + if (HBillType == "1203") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //棰嗘枡鍑哄簱鍗� + else if (HBillType == "1204") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //閿�鍞嚭搴撳崟 + else if (HBillType == "1205") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //鍏朵粬鍑哄簱鍗� + else if (HBillType == "1206") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //濮斿棰嗘枡鍗� + else if (HBillType == "1211") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //鐢熶骇琛ユ枡鍗� + else if (HBillType == "1254") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //濮斿琛ユ枡鍗� + else if (HBillType == "1255") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //鐩存帴璋冩嫧鍗� + else if (HBillType == "1207") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + #endregion + + //鍘熷崟鎹负鎵爜鐢熸垚锛屽鍘熸壂鎻忕殑鏉$爜杩涜鏍稿锛屽垹闄ゆ潯鐮佸嚭鍏ュ簱鏍¢獙缂撳瓨璁板綍 + if (sSourceBarCodeCtl == "Y") + { + try + { + oCn.BeginTran(); + oCn.RunProc("Delete from KF_PonderationBillMain_Temp_Verify where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "'", ref DBUtility.ClsPub.sExeReturnInfo); + //鍐欏叆鏃ュ織 + oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " + + "(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','鍒犻櫎')" + ); + oCn.Commit(); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + oCn.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒犻櫎鎵�閫夊崟鎹潯鐮佸嚭鍏ュ簱涓存椂琛ㄨ褰曞け璐ワ紒" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + //鍘熷崟鎹潪鎵爜鐢熸垚锛屽垹闄ゆ潯鐮佸嚭鍏ュ簱缂撳瓨鍒楄〃璁板綍 + else + { + try + { + oCn.BeginTran(); + oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "' and HSubBillType=1", ref DBUtility.ClsPub.sExeReturnInfo); + //鍐欏叆鏃ュ織 + oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " + + "(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','鍒犻櫎')" + ); + oCn.Commit(); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + oCn.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒犻櫎鎵�閫夊崟鎹潯鐮佸嚭鍏ュ簱涓存椂琛ㄨ褰曞け璐ワ紒" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; objJsonResult.data = null; return objJsonResult; } @@ -5816,6 +6038,227 @@ #endregion + #region 鏍¢獙缂撳瓨妯″潡 宸蹭笂浼犳煡璇㈢晫闈㈠埛鏂� 20241216 + + /// <summary> + /// 宸蹭笂浼犳煡璇㈢晫闈紝鏍规嵁鍗曟嵁绫诲瀷銆佸崟鎹彿銆佺敤鎴锋煡璇㈠凡涓婁紶鍗曟嵁淇℃伅 + /// </summary> + /// <returns></returns> + [Route("WEBSController/GetKf_ICStockBillQueryList_User_BillCheck_Json")] + [HttpGet] + public object GetKf_ICStockBillQueryList_User_BillCheck_Json(string HBillType, string HBillNo, string HMaker, Int64 HStockOrgID) + { + try + { + ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBillQueryByUserList_BillCheck '" + HBillType + "','" + HBillNo + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_Kf_ICStockBillQueryByUserList_BillCheck"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏌ヨ涓嶅埌璇ュ崟鎹褰曪紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + List<object> columnNameList = new List<object>(); + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇鍗曟嵁淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鑾峰彇宸蹭笂浼犲崟鎹俊鎭け璐ワ紒" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + + #region 鏍¢獙缂撳瓨妯″潡 宸蹭笂浼犲垪琛ㄧ晫闈紝鎾ら攢鍔熻兘锛屽垹闄MS琛ㄨ褰曪紝骞舵洿鏂癟EMP琛ㄤ腑鐨勪笂浼犲瓧娈� HRelationInterID=0 20241216 + + /// <summary> + /// 宸蹭笂浼犲垪琛ㄧ晫闈紝鎾ら攢鍔熻兘锛屽垹闄MS琛ㄨ褰曪紝骞舵洿鏂癟EMP琛ㄤ腑鐨勪笂浼犲瓧娈� HRelationInterID=0 + /// </summary> + /// <returns></returns> + [Route("WEBSController/set_DeleteICStockBillAndWMS_BillCheck_Json")] + [HttpGet] + public object set_DeleteICStockBillAndWMS_BillCheck_Json(Int64 HInterID, string HBillNo, string HBillType, string HMaker, string MvarReportTitle, Int64 HStockOrgID) + { + string WorkList = "鎾ら攢鏍¢獙宸蹭笂浼犲崟鎹紝鍗曟嵁鍙凤細" + HBillNo; + string SystemName = "WMS-" + MvarReportTitle + "妯″潡"; + //鑾峰彇绯荤粺鍙傛暟 + string sErrMsg = ""; + if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true) + { + string sERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode; //搴撳瓨鎺у埗-WMS搴撳瓨鎺у埗ERP妯″紡 (WISE銆丆LOUD銆丮ES) + string sSourceBarCodeCtl = "N"; //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + + #region 绯荤粺鍙傛暟鑾峰彇 + //閲囪喘鍏ュ簱鍗� + if (HBillType == "1201") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //鐢熶骇鍏ュ簱鍗� + if (HBillType == "1202") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //鍏朵粬鍏ュ簱鍗� + if (HBillType == "1203") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //棰嗘枡鍑哄簱鍗� + else if (HBillType == "1204") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //閿�鍞嚭搴撳崟 + else if (HBillType == "1205") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //鍏朵粬鍑哄簱鍗� + else if (HBillType == "1206") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //濮斿棰嗘枡鍗� + else if (HBillType == "1211") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //鐢熶骇琛ユ枡鍗� + else if (HBillType == "1254") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //濮斿琛ユ枡鍗� + else if (HBillType == "1255") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + //鐩存帴璋冩嫧鍗� + else if (HBillType == "1207") + { + //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級 + if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y") + { + sSourceBarCodeCtl = "Y"; + } + } + #endregion + + try + { + oCn.BeginTran(); + ds = oCn.RunProcReturn("exec h_p_WMS_ICStockBillAndWMS_Delete_BillCheck " + HInterID + ",'" + HBillNo + "','" + HBillType + "','" + sSourceBarCodeCtl + "','" + sERPMode + "'", "h_p_WMS_ICStockBillAndWMS_Delete_BillCheck"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + oCn.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鎾ら攢鍗曟嵁宸蹭笂浼犺褰曞け璐ワ紝鎾ら攢鍗曟嵁鍒ゆ柇閿欒锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1) + { + oCn.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; //澶辫触锛� + objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]); + objJsonResult.data = null; + return objJsonResult; + } + else + { + //鍐欏叆鏃ュ織 + oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " + + "(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','鎾ら攢')" + ); + oCn.Commit(); + objJsonResult.code = "0"; + objJsonResult.count = 1; //鎴愬姛锛� + objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]); + objJsonResult.data = null; + return objJsonResult; + } + } + catch (Exception e) + { + oCn.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鎾ら攢鍗曟嵁宸蹭笂浼犺褰曞け璐ワ紒" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + #region 缂撳瓨妯″潡 宸蹭笂浼犲垪琛ㄧ晫闈紝鎾ら攢鍔熻兘 /// <summary> -- Gitblit v1.9.1