From 3b39b355d0d79f27c781dc1b71996238db0c8849 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 20 一月 2026 13:56:20 +0800
Subject: [PATCH] 扫码校验模块扫描物料条码调用方法优化，启用条码库存根据库存带出仓库仓位
---
CLOUDWEB/WebService1.asmx.cs | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 71e2c85..e35d551 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -67972,6 +67972,7 @@
string sOneScanCtl = "N"; //涓�娆℃壂鐮佹帶鍒讹紙'Y'涓烘帶鍒讹級
string sStockPlaceAutoCtl = "Y"; //浠撲綅鏄惁浠嶦RP鍚屾锛�'N'涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝'Y'涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴锛�
string sFIFOCtl = "4"; //鍏堣繘鍏堝嚭鎺у埗锛�1銆佷笉鎺у埗浠呮樉绀轰笅鏋舵竻鍗� 2銆佷弗鏍兼帶鍒跺厛杩涘厛鍑� 3銆佷粎鎻愮ず鍜屾樉绀轰笅鏋舵竻鍗� 4銆佷笉鏄剧ず涓嬫灦娓呭崟涔熶笉鎺у埗锛�
+ string sWMSStockCtl = oSystemParameterMain.WMS_WMSStockCtl.ToUpper(); //搴撳瓨鎺у埗-鏉＄爜搴撳瓨鎺у埗
#region 绯荤粺鍙傛暟鑾峰彇
//閲囪喘鍏ュ簱鍗�
@@ -68621,8 +68622,8 @@
#endregion
string HMaterNumber; //鐗╂枡浠ｇ爜
- //鍒ゆ柇鏄惁瀛樺湪鐩稿悓鏉＄爜锛屽垽鏂墍鎵潯鐮佹槸鍚﹀湪鍗曟嵁涓�
- DataSet ds1 = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_BillCheck_New '" + omodel_View.HBarCode + "'," + HBillID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID + "," + HSPID + ",'" + sWHSPCtl + "','" + sWHCtl + "','" + sMultilineCtl + "'", "h_p_WMS_AddBarCode_BillCheck_New");
+ //鍒ゆ柇鏄惁瀛樺湪鐩稿悓鏉＄爜锛屽垽鏂墍鎵潯鐮佹槸鍚﹀湪鍗曟嵁涓紱鍑哄簱銆佺孩瀛楀叆搴撱�佽皟鎷紝鍒ゆ柇鏉＄爜搴撳瓨
+ DataSet ds1 = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_BillCheck_New '" + omodel_View.HBarCode + "'," + HBillID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID + "," + HSPID + ",'" + sWHSPCtl + "','" + sWHCtl + "','" + sWMSStockCtl + "','" + sStockPlaceAutoCtl + "','" + sMultilineCtl + "'," + HOWNERID.ToString(), "h_p_WMS_AddBarCode_BillCheck_New");
if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
{
sErrMsg = "鍒ゆ柇鎵�鎵潯鐮佹槸鍚﹀湪鍗曟嵁涓彂鐢熼敊璇紒";
@@ -68753,38 +68754,26 @@
|| HBillType == "1254" || HBillType == "1255" || HBillType == "1207" || HBillType == "1250")
{
//搴撳瓨鎺у埗-WMS璐熷簱瀛樻帶鍒�
- if (oSystemParameterMain.WMS_WMSStockCtl.ToUpper() == "Y")
+ if (sWMSStockCtl == "Y")
{
- //鍒ゆ柇WMS搴撳瓨 杩斿洖WMS搴撳瓨鏁伴噺
- DataSet DsWMS = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_GetWMSICInventory " + HBillID.ToString() + ",'" + HBillType + "','" + omodel_View.HBarCode + "'," + HWhID.ToString() + "," + HSPID.ToString() + "," + HOWNERID.ToString(), "h_p_WMS_AddBarCode_GetWMSICInventory");
- if (DsWMS == null || DsWMS.Tables[0].Rows.Count == 0)
+ sWMSQty = DBUtility.ClsPub.isDoule(ds1.Tables[0].Rows[0]["HWMSQty"]);
+ sWhName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HWhName"]);
+ sSPName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HSPName"]);
+
+ if (sWMSQty <= 0)
{
- sErrMsg = "鎵�鎵弿鐗╂枡鏉＄爜锛� " + omodel_View.HBarCode + " 锛屾棤鏉＄爜搴撳瓨锛�";
+ sErrMsg = "鎵�鎵弿鐗╂枡鏉＄爜锛�" + omodel_View.HBarCode + " 锛屽湪浠撳簱[ " + sWhName + " ]銆佷粨浣峓 " + sSPName + " ]涓紝鏃犳潯鐮佸簱瀛橈紒";
return false;
}
- else
+ //鍒ゆ柇鎵弿鏁伴噺涓庢潯鐮佸簱瀛樻暟閲�
+ else if (sRelQty > sWMSQty)
{
- HWhID = DBUtility.ClsPub.isLong(DsWMS.Tables[0].Rows[0]["HWhID"]);
- HSPID = DBUtility.ClsPub.isLong(DsWMS.Tables[0].Rows[0]["HSPID"]);
- sWMSQty = DBUtility.ClsPub.isDoule(DsWMS.Tables[0].Rows[0]["HQty"]);
- sWhName = DBUtility.ClsPub.isStrNull(DsWMS.Tables[0].Rows[0]["HWhName"]);
- sSPName = DBUtility.ClsPub.isStrNull(DsWMS.Tables[0].Rows[0]["HSPName"]);
-
- if (sWMSQty <= 0)
- {
- sErrMsg = "鎵�鎵弿鐗╂枡鏉＄爜锛�" + omodel_View.HBarCode + " 锛屽湪浠撳簱[ " + sWhName + " ]銆佷粨浣峓 " + sSPName + " ]涓紝鏃犳潯鐮佸簱瀛橈紒";
- return false;
- }
- //鍒ゆ柇鎵弿鏁伴噺涓庢潯鐮佸簱瀛樻暟閲�
- else if (sRelQty > sWMSQty)
- {
- sRelQty = sWMSQty;
- }
+ sRelQty = sWMSQty;
}
}
//搴撳瓨鎺у埗-ERP璐熷簱瀛樻帶鍒� 閲戣澏浜戠鏈変簯妯″紡
- if (oSystemParameterMain.WMS_ERPStockCtl.ToUpper() == "Y" && oSystemParameterMain.WMS_CloudMode.ToUpper() == "Y")
+ if (oSystemParameterMain.WMS_ERPStockCtl_BillCheck.ToUpper() == "Y" && oSystemParameterMain.WMS_CloudMode.ToUpper() == "Y")
{
//鍒ゆ柇ERP搴撳瓨 杩斿洖ERP搴撳瓨鏁伴噺
DataSet DsERP = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_GetERPICInventory_New " + HBillID.ToString() + ",'" + HBillType + "','" + omodel_View.HBarCode + "'," + HWhID.ToString() + "," + HSPID.ToString() + "," + HOWNERID.ToString(), "h_p_WMS_AddBarCode_GetERPICInventory_New");
--
Gitblit v1.9.1