From 7e792ee7422893109cd82577fcd4eff8e1741da3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 04 二月 2026 11:58:49 +0800
Subject: [PATCH] 生产领料出库，添加物料条码剩余可出库数量赋值判断；拆分物料条码扫码记录
---
CLOUDWEB/WebService1.asmx.cs | 66 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 1 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 34da991..ddad04b 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -23877,6 +23877,7 @@
oCn.BeginTran();
//鍐欏叆鏉＄爜鍑哄叆搴撹〃
oCn.RunProc("EXEC h_p_Kf_ICStockBillSub_WMS_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillType + "','" + oMain.HBillNo + "'");
+ LogService.Write(DateTime.Now + "鍐欏叆鏉＄爜鍑哄叆搴撹〃锛�" + "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))
@@ -23958,13 +23959,20 @@
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
oCn.RollBack();
return false;
+ } else if (Ds2.Tables[0].Rows[0]["HBack"].ToString() == "1")
+ {
+ sErrMsg = Ds2.Tables[0].Rows[0]["HBackRemark"].ToString();
+ oCn.RollBack();
+ return false;
}
else
{
+
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[\"FEntity\",\"F_SMRKS\"]," +
"\"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"]) + "\"," +
+ "\"FDATE\":\"" + Ds2.Tables[0].Rows[0]["FDATE"] + "\"," +
"\"FEntity\": [ ";
string sJson_Entry = "";
for (int i = 0; i < Ds2.Tables[1].Rows.Count; i++)
@@ -23981,6 +23989,7 @@
}
string sJson_End = " ] }}";
string sJson = sJson_Main + sJson_Entry + sJson_End;
+ LogService.Write("淇濆瓨淇敼鐢熶骇棰嗘枡鍗曪細" + sJson);
//楠岃瘉鐢ㄦ埛淇℃伅
string HReturn;
@@ -24013,11 +24022,16 @@
}
else
{
+ LogService.Write("鏍￠獙淇敼鐢熶骇棰嗘枡鍗曟垚鍔燂紒" + sJson); //鍐欏叆txt鏂囨湰
HReturn = "";
//鎻愪氦鍗曟嵁
string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "PRD_PickMtrl", sJson2 });
+
+ if (result2.ToString().Contains("\"IsSuccess\":false") == true) {
+ LogService.Write("鎻愪氦棰嗘枡鍗曪紒" + result2.ToString() + sJson2 + sCLOUDUseName); //鍐欏叆txt鏂囨湰
+ }
//瀹℃牳鍗曟嵁
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
@@ -24043,7 +24057,11 @@
return false;
}
else
- {
+ {
+ LogService.Write("寮�濮嬫媶鍒嗘壂鐮佽褰曪紒鍗曟嵁鍙蜂负锛�" + "exec h_p_Kf_MateOutSplitQty '" + oMain.HBillNo + "'"); //鍐欏叆txt鏂囨湰
+ //鎷嗗垎鎵爜璁板綍
+ oCn.RunProc("exec h_p_Kf_MateOutSplitQty '" + oMain.HBillNo + "'");
+ LogService.Write("鎵爜璁板綍鎷嗛櫎鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo); //鍐欏叆txt鏂囨湰
//閲嶆柊鍚屾鐢熶骇棰嗘枡鍗�
oCn.RunProc("exec h_p_IFCLD_ERPSourceBillToLocal_MateOut '" + oMain.HBillNo + "'");
sErrMsg = "淇敼骞跺鏍哥敓浜ч鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
@@ -56870,6 +56888,29 @@
}
}
}
+
+ //鑾峰彇鍞竴鏉＄爜鍓╀綑鍙壂鎻忔暟閲�
+ if (omodel_View.HBarCodeType == "鍞竴鏉＄爜" && HBillType.ToString() == "1204")
+ {
+ DataSet DsOutQty = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_GetInBillQty '" + omodel_View.HBarCode + "','" + HBillType + "'," + omodel_View.HQty.ToString(), "h_p_WMS_AddBarCode_GetInBillQty");
+ if (DsOutQty == null || DsOutQty.Tables[0].Rows.Count == 0)
+ {
+ //姝ｅ父锛屼笉瀛樺湪宸叉壂鐮佷笂浼犺褰�
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isDoule(DsOutQty.Tables[0].Rows[0]["HQty"]) == 0)
+ {
+ sErrMsg = "鎵�鎵弿鐗╂枡鏉＄爜锛� " + omodel_View.HBarCode + " 锛屽凡琚叾浠栧崟鎹壂鎻忎笂浼狅紝涓嶅厑璁稿啀娆℃壂鐮侊紒";
+ return null;
+ }
+ else if (DBUtility.ClsPub.isDoule(DsOutQty.Tables[0].Rows[0]["HQty"]) < sRelQty)
+ {
+ sRelQty = DBUtility.ClsPub.isDoule(DsOutQty.Tables[0].Rows[0]["HQty"]);
+ }
+ }
+ }
+
}
//閲囪喘鍏ュ簱锛�1201锛夈�佷骇鍝佸叆搴擄紙1202锛夈�佸叾浠栧叆搴撹摑瀛楋紙1203锛夈�佸澶栧叆搴擄紙1210锛夈�佺敓浜ф眹鎶ワ紙3711锛�
//鐢熶骇閫�鏂欙紙1244锛夈�侀攢鍞��搴擄紙1247锛夈�佸叾浠栧嚭搴撶孩瀛楋紙1249锛夈�佸澶栭��鏂欙紙1238锛�
@@ -62681,6 +62722,29 @@
}
}
}
+
+ //鑾峰彇鍞竴鏉＄爜鍓╀綑鍙壂鎻忔暟閲�
+ if (omodel_View.HBarCodeType == "鍞竴鏉＄爜" && HBillType.ToString() == "1204")
+ {
+ DataSet DsOutQty = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_GetInBillQty '" + omodel_View.HBarCode + "','" + HBillType + "'," + omodel_View.HQty.ToString(), "h_p_WMS_AddBarCode_GetInBillQty");
+ if (DsOutQty == null || DsOutQty.Tables[0].Rows.Count == 0)
+ {
+ //姝ｅ父锛屼笉瀛樺湪宸叉壂鐮佷笂浼犺褰�
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isDoule(DsOutQty.Tables[0].Rows[0]["HQty"]) == 0)
+ {
+ sErrMsg = "鎵�鎵弿鐗╂枡鏉＄爜锛� " + omodel_View.HBarCode + " 锛屽凡琚叾浠栧崟鎹壂鎻忎笂浼狅紝涓嶅厑璁稿啀娆℃壂鐮侊紒";
+ return false;
+ }
+ else if (DBUtility.ClsPub.isDoule(DsOutQty.Tables[0].Rows[0]["HQty"]) < sRelQty)
+ {
+ sRelQty = DBUtility.ClsPub.isDoule(DsOutQty.Tables[0].Rows[0]["HQty"]);
+ }
+ }
+ }
+
}
//閲囪喘鍏ュ簱锛�1201锛夈�佷骇鍝佸叆搴擄紙1202锛夈�佸叾浠栧叆搴撹摑瀛楋紙1203锛夈�佸澶栧叆搴擄紙1210锛�
//鐢熶骇閫�鏂欙紙1244锛夈�侀攢鍞��搴擄紙1247锛夈�佸叾浠栧嚭搴撶孩瀛楋紙1249锛夈�佸澶栭��鏂欙紙1238锛�
--
Gitblit v1.9.1