From 535573f01de5368f3f2eafb565d276bc035a27ac Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期五, 18 十一月 2022 13:44:54 +0800
Subject: [PATCH] 新增销售出库校验上传、生产补料校验上传方法，校验扫码方法修改
---
DLL/Pub_Class.dll | 0
CLOUDWEB/WebService1.asmx.cs | 502 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 502 insertions(+), 0 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 511d0d4..9af949e 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -14964,6 +14964,218 @@
#endregion
+ #region 閿�鍞嚭搴� 鏍￠獙妯″紡*
+
+ //鏍￠獙閿�鍞嚭搴撳崟
+ [WebMethod]
+ public bool set_SaveSellOutBill_BillCheck(Model.ClsKf_SellOutBillMain oMain, ref string sErrMsg)
+ {
+ if (set_SaveSellOutBill_CLD_BillCheck(oMain, ref sErrMsg) == true)
+ {
+ //涓婁紶鎴愬姛
+ return true;
+ }
+ else
+ {
+ //涓婁紶澶辫触
+ sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛涗笂浼犲崟鎹け璐ワ紒" + sErrMsg;
+ return false;
+ }
+ }
+
+ private bool set_SaveSellOutBill_CLD_BillCheck(Model.ClsKf_SellOutBillMain oMain, ref string sErrMsg)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ {
+ sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ return false;
+ }
+ //涓婁紶鍓嶅垽鏂�
+ DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_SellOutBillCheck " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "','" + oSystemParameter.omodel.Kf_SellOutBillCheck_MustQtyCtl + "'", "h_p_WMS_BeforeUpload_SellOutBillCheck");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "鏍￠獙涓婁紶鍓嶅垽鏂紝鍙戠敓閿欒锛�";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+
+ try
+ {
+ oCn.BeginTran();
+ //鍐欏叆鏉＄爜鍑哄叆搴撹〃
+ oCn.RunProc("EXEC h_p_Kf_ICStockBillSub_WMS_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillType + "','" + oMain.HBillNo + "'");
+
+ //浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+ if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
+ {
+ sErrMsg = Pub_Class.ClsPub.sExeReturnInfo;
+ return false;
+ }
+
+ //鑾峰彇CLOUD璐﹀彿瀵嗙爜
+ string sCLOUDUseName = Pub_Class.ClsPub.sCLOUDUseName;
+ string sCLOUDPsd = Pub_Class.ClsPub.sCLOUDPsd;
+ DataSet ds11 = get_SaveCLOUDUseNameandPsd(oMain.HInterID);
+ if (ds11 == null || ds11.Tables[0].Rows.Count == 0)
+ {
+ }
+ else
+ {
+ sCLOUDUseName = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserName"]);
+ sCLOUDPsd = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserPsd"]);
+ }
+
+ if (oSystemParameter.omodel.Kf_SellOutBillCheck_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
+ {
+ string HReturn;
+ ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
+ string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
+ bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
+ if (bLogin)
+ {
+ //鎻愪氦鍗曟嵁
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "SAL_OUTSTOCK", sJson2 });
+ //瀹℃牳鍗曟嵁
+ string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
+ new object[] { "SAL_OUTSTOCK", sJson3 });
+
+ HReturn = result3.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ sErrMsg = "瀹℃牳閿�鍞嚭搴撳崟澶辫触锛�" + HReturn;
+ oCn.RollBack();
+ return false;
+ }
+ else
+ {
+ sErrMsg = "瀹℃牳閿�鍞嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ else
+ {
+ sErrMsg = "鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛侀噾铦朵簯鐧诲綍澶辫触锛�";
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else
+ {
+ //鏍规嵁TMP琛� 杩斿洖 淇敼淇℃伅
+ DataSet Ds2;
+ Ds2 = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBillCheck " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBillCheck");
+ if (Ds2 == null || Ds2.Tables[0].Rows.Count == 0 || Ds2.Tables[1].Rows.Count == 0)
+ {
+ sErrMsg = "鑾峰彇淇敼淇℃伅澶辫触锛�";
+ oCn.RollBack();
+ return false;
+ }
+ else
+ {
+ string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[\"FEntity\",\"FRealQty\"]," +
+ "\"NeedReturnFields\":[],\"IsDeleteEntry\":\"false\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
+ "\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\"," +
+ "\"Model\": { \"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds2.Tables[0].Rows[0]["FID"]) + "\"," +
+ "\"FEntity\": [ ";
+ string sJson_Entry = "";
+ for (int i = 0; i < Ds2.Tables[1].Rows.Count; i++)
+ {
+ if (sJson_Entry != "")
+ {
+ sJson_Entry = sJson_Entry + " , ";
+ }
+
+ sJson_Entry = sJson_Entry + "{" +
+ "\"FEntryID\":\"" + Pub_Class.ClsPub.isStrNull(Ds2.Tables[1].Rows[i]["FEntryID"]) + "\"," +
+ "\"FRealQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds2.Tables[1].Rows[i]["FRealQty"]) + "\" " +
+ "}";
+ }
+ string sJson_End = " ] }}";
+ string sJson = sJson_Main + sJson_Entry + sJson_End;
+
+ //楠岃瘉鐢ㄦ埛淇℃伅
+ string HReturn;
+ ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
+ string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
+ bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
+ if (bLogin)
+ {
+ //淇敼鍗曟嵁
+ var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
+ new object[] { "SAL_OUTSTOCK", sJson });
+
+ HReturn = result.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ sErrMsg = "淇敼閿�鍞嚭搴撳崟澶辫触锛�" + HReturn + sJson;
+ oCn.RollBack();
+ return false;
+ }
+ else
+ {
+ HReturn = "";
+ //鎻愪氦鍗曟嵁
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "SAL_OUTSTOCK", sJson2 });
+ //瀹℃牳鍗曟嵁
+ string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
+ new object[] { "SAL_OUTSTOCK", sJson3 });
+
+ HReturn = result3.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ sErrMsg = "鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛�" + HReturn + sJson;
+ oCn.RollBack();
+ return false;
+ }
+ else
+ {
+ //閲嶆柊鍚屾閿�鍞嚭搴撳崟
+ oCn.RunProc("exec h_p_IFCLD_ERPSourceBillToLocal_SellOut '" + oMain.HBillNo + "'");
+ sErrMsg = "淇敼骞跺鏍搁攢鍞嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ }
+ else
+ {
+ sErrMsg = "鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛侀噾铦朵簯鐧诲綍澶辫触锛�";
+ oCn.RollBack();
+ return false;
+ }
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ sErrMsg = "鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+
+ #endregion
+
#region 杩涚珯璁板綍
//杩涚珯璁板綍琛�
@@ -17716,6 +17928,218 @@
LogService.Write("鐢熸垚鐢熶骇琛ユ枡鍗曪紙婧愬崟锛氱敓浜х敤鏂欐竻鍗曪級鎴愬姛锛�" + sRemark);
sErrMsg = "鐢熸垚鐢熶骇琛ユ枡鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + oMain.HBillNo;
return true;
+ }
+ }
+
+ #endregion
+
+ #region 鐢熶骇琛ユ枡 鏍￠獙妯″紡*
+
+ //鏍￠獙鐢熶骇琛ユ枡鍗�
+ [WebMethod]
+ public bool set_SaveMateReplenishOutBill_BillCheck(Model.ClsKf_MateReplenishOutBillMain oMain, ref string sErrMsg)
+ {
+ if (set_SaveMateReplenishOutBill_CLD_BillCheck(oMain, ref sErrMsg) == true)
+ {
+ //涓婁紶鎴愬姛
+ return true;
+ }
+ else
+ {
+ //涓婁紶澶辫触
+ sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛涗笂浼犲崟鎹け璐ワ紒" + sErrMsg;
+ return false;
+ }
+ }
+
+ private bool set_SaveMateReplenishOutBill_CLD_BillCheck(Model.ClsKf_MateReplenishOutBillMain oMain, ref string sErrMsg)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ {
+ sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ return false;
+ }
+ //涓婁紶鍓嶅垽鏂�
+ DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MateReplenishOutBillCheck " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "','" + oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_MustQtyCtl + "'", "h_p_WMS_BeforeUpload_MateReplenishOutBillCheck");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "鏍￠獙涓婁紶鍓嶅垽鏂紝鍙戠敓閿欒锛�";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+
+ try
+ {
+ oCn.BeginTran();
+ //鍐欏叆鏉＄爜鍑哄叆搴撹〃
+ oCn.RunProc("EXEC h_p_Kf_ICStockBillSub_WMS_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillType + "','" + oMain.HBillNo + "'");
+
+ //浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+ if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
+ {
+ sErrMsg = Pub_Class.ClsPub.sExeReturnInfo;
+ return false;
+ }
+
+ //鑾峰彇CLOUD璐﹀彿瀵嗙爜
+ string sCLOUDUseName = Pub_Class.ClsPub.sCLOUDUseName;
+ string sCLOUDPsd = Pub_Class.ClsPub.sCLOUDPsd;
+ DataSet ds11 = get_SaveCLOUDUseNameandPsd(oMain.HInterID);
+ if (ds11 == null || ds11.Tables[0].Rows.Count == 0)
+ {
+ }
+ else
+ {
+ sCLOUDUseName = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserName"]);
+ sCLOUDPsd = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserPsd"]);
+ }
+
+ if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
+ {
+ string HReturn;
+ ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
+ string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
+ bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
+ if (bLogin)
+ {
+ //鎻愪氦鍗曟嵁
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "PRD_FeedMtrl", sJson2 });
+ //瀹℃牳鍗曟嵁
+ string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
+ new object[] { "PRD_FeedMtrl", sJson3 });
+
+ HReturn = result3.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ sErrMsg = "瀹℃牳鐢熶骇琛ユ枡鍗曞け璐ワ紒" + HReturn;
+ oCn.RollBack();
+ return false;
+ }
+ else
+ {
+ sErrMsg = "瀹℃牳鐢熶骇琛ユ枡鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ else
+ {
+ sErrMsg = "鏍￠獙瀹℃牳鐢熶骇琛ユ枡鍗曞け璐ワ紒閲戣澏浜戠櫥褰曞け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else
+ {
+ //鏍规嵁TMP琛� 杩斿洖 淇敼淇℃伅
+ DataSet Ds2;
+ Ds2 = oCn.RunProcReturn("exec h_p_Kf_GetMateReplenishOutBillCheck " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateReplenishOutBillCheck");
+ if (Ds2 == null || Ds2.Tables[0].Rows.Count == 0 || Ds2.Tables[1].Rows.Count == 0)
+ {
+ sErrMsg = "鑾峰彇淇敼淇℃伅澶辫触锛�";
+ oCn.RollBack();
+ return false;
+ }
+ else
+ {
+ string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[\"FEntity\",\"FActualQty\"]," +
+ "\"NeedReturnFields\":[],\"IsDeleteEntry\":\"false\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
+ "\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\"," +
+ "\"Model\": { \"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds2.Tables[0].Rows[0]["FID"]) + "\"," +
+ "\"FEntity\": [ ";
+ string sJson_Entry = "";
+ for (int i = 0; i < Ds2.Tables[1].Rows.Count; i++)
+ {
+ if (sJson_Entry != "")
+ {
+ sJson_Entry = sJson_Entry + " , ";
+ }
+
+ sJson_Entry = sJson_Entry + "{" +
+ "\"FEntryID\":\"" + Pub_Class.ClsPub.isStrNull(Ds2.Tables[1].Rows[i]["FEntryID"]) + "\"," +
+ "\"FActualQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds2.Tables[1].Rows[i]["FActualQty"]) + "\"," +
+ "}";
+ }
+ string sJson_End = " ] }}";
+ string sJson = sJson_Main + sJson_Entry + sJson_End;
+
+ //楠岃瘉鐢ㄦ埛淇℃伅
+ string HReturn;
+ ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
+ string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
+ bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
+ if (bLogin)
+ {
+ //淇敼鍗曟嵁
+ var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
+ new object[] { "PRD_FeedMtrl", sJson });
+
+ HReturn = result.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ sErrMsg = "淇敼鐢熶骇琛ユ枡鍗曞け璐ワ紒" + HReturn + sJson;
+ oCn.RollBack();
+ return false;
+ }
+ else
+ {
+ HReturn = "";
+ //鎻愪氦鍗曟嵁
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "PRD_FeedMtrl", sJson2 });
+ //瀹℃牳鍗曟嵁
+ string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
+ new object[] { "PRD_FeedMtrl", sJson3 });
+
+ HReturn = result3.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ sErrMsg = "鏍￠獙瀹℃牳鐢熶骇琛ユ枡鍗曞け璐ワ紒" + HReturn + sJson;
+ oCn.RollBack();
+ return false;
+ }
+ else
+ {
+ //閲嶆柊鍚屾閿�鍞嚭搴撳崟
+ oCn.RunProc("exec h_p_IFCLD_ERPSourceBillToLocal_MateReplenishOut '" + oMain.HBillNo + "'");
+ sErrMsg = "淇敼骞跺鏍哥敓浜цˉ鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ }
+ else
+ {
+ sErrMsg = "鏍￠獙瀹℃牳鐢熶骇琛ユ枡鍗曞け璐ワ紒閲戣澏浜戠櫥褰曞け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ sErrMsg = "鏍￠獙瀹℃牳鐢熶骇琛ユ枡鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
}
}
@@ -45796,6 +46220,16 @@
//棰嗘枡鍑哄簱鍗�
sWHSPCtl = "N";
}
+ else if (HBillType == "1205" && oSystemParameterMain.Kf_SellOutBillCheck_WHSPCtl == "N")
+ {
+ //閿�鍞嚭搴撳崟
+ sWHSPCtl = "N";
+ }
+ else if (HBillType == "1254" && oSystemParameterMain.Kf_MateReplenishOutBillCheck_WHSPCtl == "N")
+ {
+ //鐢熶骇琛ユ枡鍗�
+ sWHSPCtl = "N";
+ }
else if (HBillType == "1206")
{
//鍏朵粬鍑哄簱鍗�
@@ -45811,6 +46245,16 @@
else if (HBillType == "1204" && oSystemParameterMain.Kf_MateOutBillCheck_MultilineCtl == "Y")
{
//棰嗘枡鍑哄簱鍗�
+ sMultilineCtl = "Y";
+ }
+ else if (HBillType == "1205" && oSystemParameterMain.Kf_SellOutBillCheck_MultilineCtl == "Y")
+ {
+ //閿�鍞嚭搴撳崟
+ sMultilineCtl = "Y";
+ }
+ else if (HBillType == "1254" && oSystemParameterMain.Kf_MateReplenishOutBillCheck_MultilineCtl == "Y")
+ {
+ //鐢熶骇琛ユ枡鍗�
sMultilineCtl = "Y";
}
else if (HBillType == "1206")
@@ -45896,6 +46340,34 @@
return false;
}
}
+ //閿�鍞嚭搴撴牎楠岋紝鏍规嵁绯荤粺鍙傛暟锛氶攢鍞嚭搴撴牎楠�-搴旀敹鏁伴噺 鎺у埗鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
+ else if (HBillType == "1205" && (oSystemParameterMain.Kf_SellOutBillCheck_MustQtyCtl == "灏忎簬绛変簬搴旀敹" || oSystemParameterMain.Kf_SellOutBillCheck_MustQtyCtl == "瀹屽叏绛変簬搴旀敹"))
+ {
+ if (omodel_View.HSourceQty == 0)
+ {
+ sErrMsg = "鎵�鎵墿鏂欏湪鍗曟嵁涓墿浣欏彲鎵暟閲忎负0锛屼笉鍏佽鎵爜锛�";
+ return false;
+ }
+ else if (sRelQty > omodel_View.HSourceQty)
+ {
+ sErrMsg = "鎵�鎵弿鏉＄爜鏁伴噺涓� " + sRelQty.ToString() + " 澶т簬瀵瑰簲婧愬崟鍓╀綑鍙壂鎻忔暟閲�" + omodel_View.HSourceQty.ToString() + "锛屼笉鍏佽鎵爜锛�";
+ return false;
+ }
+ }
+ //鐢熶骇琛ユ枡鏍￠獙锛屾牴鎹郴缁熷弬鏁帮細鐢熶骇琛ユ枡鏍￠獙-搴旀敹鏁伴噺 鎺у埗鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
+ else if (HBillType == "1254" && (oSystemParameterMain.Kf_MateReplenishOutBillCheck_MustQtyCtl == "灏忎簬绛変簬搴旀敹" || oSystemParameterMain.Kf_MateReplenishOutBillCheck_MustQtyCtl == "瀹屽叏绛変簬搴旀敹"))
+ {
+ if (omodel_View.HSourceQty == 0)
+ {
+ sErrMsg = "鎵�鎵墿鏂欏湪鍗曟嵁涓墿浣欏彲鎵暟閲忎负0锛屼笉鍏佽鎵爜锛�";
+ return false;
+ }
+ else if (sRelQty > omodel_View.HSourceQty)
+ {
+ sErrMsg = "鎵�鎵弿鏉＄爜鏁伴噺涓� " + sRelQty.ToString() + " 澶т簬瀵瑰簲婧愬崟鍓╀綑鍙壂鎻忔暟閲�" + omodel_View.HSourceQty.ToString() + "锛屼笉鍏佽鎵爜锛�";
+ return false;
+ }
+ }
//鍏朵粬鍑哄簱鏍￠獙锛屼笉鍙秴鍗曟嵁鏁伴噺
else if (HBillType == "1206")
{
@@ -45943,6 +46415,34 @@
}
//棰嗘枡鍑哄簱鏍￠獙锛屾牴鎹郴缁熷弬鏁帮細棰嗘枡鍑哄簱鏍￠獙-搴旀敹鏁伴噺 鎺у埗鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
else if (HBillType == "1204" && (oSystemParameterMain.Kf_MateOutBillCheck_MustQtyCtl == "灏忎簬绛変簬搴旀敹" || oSystemParameterMain.Kf_MateOutBillCheck_MustQtyCtl == "瀹屽叏绛変簬搴旀敹"))
+ {
+ if (omodel_View.HSourceQty == 0)
+ {
+ sErrMsg = "鎵�鎵墿鏂欏湪鍗曟嵁涓墿浣欏彲鎵暟閲忎负0锛屼笉鍏佽鎵爜锛�";
+ return false;
+ }
+ else if (sRelQty > omodel_View.HSourceQty)
+ {
+ sErrMsg = "鎵�鎵弿鏉＄爜鏁伴噺涓� " + sRelQty.ToString() + " 澶т簬瀵瑰簲婧愬崟鍓╀綑鍙壂鎻忔暟閲�" + omodel_View.HSourceQty.ToString() + "锛屼笉鍏佽鎵爜锛�";
+ return false;
+ }
+ }
+ //閿�鍞嚭搴撴牎楠岋紝鏍规嵁绯荤粺鍙傛暟锛氶攢鍞嚭搴撴牎楠�-搴旀敹鏁伴噺 鎺у埗鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
+ else if (HBillType == "1205" && (oSystemParameterMain.Kf_SellOutBillCheck_MustQtyCtl == "灏忎簬绛変簬搴旀敹" || oSystemParameterMain.Kf_SellOutBillCheck_MustQtyCtl == "瀹屽叏绛変簬搴旀敹"))
+ {
+ if (omodel_View.HSourceQty == 0)
+ {
+ sErrMsg = "鎵�鎵墿鏂欏湪鍗曟嵁涓墿浣欏彲鎵暟閲忎负0锛屼笉鍏佽鎵爜锛�";
+ return false;
+ }
+ else if (sRelQty > omodel_View.HSourceQty)
+ {
+ sErrMsg = "鎵�鎵弿鏉＄爜鏁伴噺涓� " + sRelQty.ToString() + " 澶т簬瀵瑰簲婧愬崟鍓╀綑鍙壂鎻忔暟閲�" + omodel_View.HSourceQty.ToString() + "锛屼笉鍏佽鎵爜锛�";
+ return false;
+ }
+ }
+ //鐢熶骇琛ユ枡鏍￠獙锛屾牴鎹郴缁熷弬鏁帮細鐢熶骇琛ユ枡鏍￠獙-搴旀敹鏁伴噺 鎺у埗鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
+ else if (HBillType == "1254" && (oSystemParameterMain.Kf_MateReplenishOutBillCheck_MustQtyCtl == "灏忎簬绛変簬搴旀敹" || oSystemParameterMain.Kf_MateReplenishOutBillCheck_MustQtyCtl == "瀹屽叏绛変簬搴旀敹"))
{
if (omodel_View.HSourceQty == 0)
{
@@ -46046,6 +46546,8 @@
//涓�娆℃壂鐮佹帶鍒讹紝鍚屼竴鏉＄爜銆佸悓涓�鍗曟嵁绫诲瀷锛屽湪WMS琛ㄥ拰TEMP琛ㄩ噷锛屽彧鍏佽杩涜涓�娆℃壂鐮�
if ((HBillType == "1203" && oSystemParameterMain.Kf_OtherInBill_BillTypeOneScan == "Y")
|| (HBillType == "1204" && oSystemParameterMain.Kf_MateOutBill_BillTypeOneScan == "Y")
+ || (HBillType == "1205" && oSystemParameterMain.Kf_SellOutBill_BillTypeOneScan == "Y")
+ || (HBillType == "1254" && oSystemParameterMain.Kf_MateReplenishOutBill_BillTypeOneScan == "Y")
|| (HBillType == "1206" && oSystemParameterMain.Kf_OtherOutBill_BillTypeOneScan == "Y"))
{
DataSet dsOneScan = oCn.RunProcReturn("exec h_p_WMS_CheckBarCodeOneScan_New '" + omodel_View.HBarCode + "'," + HBillID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID + "," + HSPID + ",0,0,'" + HMaker + "'", "h_p_WMS_CheckBarCodeOneScan_New");
diff --git a/DLL/Pub_Class.dll b/DLL/Pub_Class.dll
index d6de0c2..9a67e58 100644
--- a/DLL/Pub_Class.dll
+++ b/DLL/Pub_Class.dll
Binary files differ
--
Gitblit v1.9.1