From 036b201725444739c8c5ee9166df83d650fc0d72 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 31 十月 2022 16:48:13 +0800
Subject: [PATCH] 销售出库扫描条码优化修改
---
CLOUDWEB/WebService1.asmx.cs | 71 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 20dcb0e..a029f9e 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -39359,6 +39359,13 @@
//搴撳瓨鎺у埗-WMS璐熷簱瀛樻帶鍒� 鍞竴鏉＄爜銆佸惎鐢ㄦ潯鐮佸簱瀛橈紝浠撳簱浠撲綅鑾峰彇椤哄簭锛氱晫闈笂浠撳簱浠撲綅 > 鏉＄爜搴撳瓨浠撳簱浠撲綅
if (dal.omodel_View.HBarCodeType == "鍞竴鏉＄爜" && oSystemParameterMain.WMS_WMSStockCtl == "Y")
{
+ //sWHSPCtl=1锛岃〃绀虹晫闈笂浠撳簱浠撲綅涓虹┖
+ if (sWHSPCtl == 1)
+ {
+ HWhID = 0;
+ HSPID = 0;
+ }
+
//鍒ゆ柇鏉＄爜搴撳瓨 杩斿洖鏉＄爜搴撳瓨鏁伴噺
DataSet DsWMS = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_GetWMSICInventory_Pack_ZhuoLi " + HInterID.ToString() + ",'" + HBillType + "','" + sHBarCode_Pack + "'," + HWhID.ToString() + "," + HSPID.ToString() + "," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_GetWMSICInventory_Pack_ZhuoLi");
if (DsWMS == null || DsWMS.Tables[0].Rows.Count == 0)
@@ -40827,7 +40834,7 @@
//鍏堣繘鍏堝嚭鎺у埗
if (oSystemParameter.omodel.Kf_SellOutBill_FIFOCtl == "Y") //绯荤粺鍙傛暟 閿�鍞嚭搴撳崟-鍏堣繘鍏堝嚭鎺у埗
{
- DataSet FIFO = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFO_SellOut " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString(), "h_p_WMS_AddSourceFIFO_SellOut");
+ DataSet FIFO = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFO_SellOut " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString() + "," + HOWNERID.ToString(), "h_p_WMS_AddSourceFIFO_SellOut");
if (FIFO == null || FIFO.Tables[0].Rows.Count == 0)
{
sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涘瓨鍏ュ厛杩涘厛鍑轰复鏃惰〃澶辫触锛�";
@@ -40845,7 +40852,7 @@
//鍏堣繘鍏堝嚭涓嬫灦娓呭崟
else if (oSystemParameter.omodel.Kf_SellOutBill_FIFOList == "Y") //绯荤粺鍙傛暟 閿�鍞嚭搴撳崟-鍏堣繘鍏堝嚭涓嬫灦娓呭崟
{
- DataSet FIFOList = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFOList_SellOut " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString(), "h_p_WMS_AddSourceFIFOList_SellOut");
+ DataSet FIFOList = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFOList_SellOut " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString() + "," + HOWNERID.ToString(), "h_p_WMS_AddSourceFIFOList_SellOut");
if (FIFOList == null || FIFOList.Tables[0].Rows.Count == 0)
{
sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涘瓨鍏ュ厛杩涘厛鍑轰笅鏋舵竻鍗曞け璐ワ紒";
@@ -42708,6 +42715,13 @@
//搴撳瓨鎺у埗-WMS璐熷簱瀛樻帶鍒� 鍞竴鏉＄爜銆佸惎鐢ㄦ潯鐮佸簱瀛橈紝浠撳簱浠撲綅鑾峰彇椤哄簭锛氱晫闈笂浠撳簱浠撲綅 > 鏉＄爜搴撳瓨浠撳簱浠撲綅
if (omodel_View.HBarCodeType == "鍞竴鏉＄爜" && oSystemParameterMain.WMS_WMSStockCtl == "Y")
{
+ //sWHSPCtl=1锛岃〃绀虹晫闈笂浠撳簱浠撲綅涓虹┖
+ if (sWHSPCtl == 1)
+ {
+ HWhID = 0;
+ HSPID = 0;
+ }
+
//鍒ゆ柇鏉＄爜搴撳瓨 杩斿洖鏉＄爜搴撳瓨鏁伴噺
DataSet DsWMS = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_GetWMSICInventory " + HInterID.ToString() + ",'" + HBillType + "','" + omodel_View.HBarCode + "'," + HWhID.ToString() + "," + HSPID.ToString() + "," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_GetWMSICInventory");
if (DsWMS == null || DsWMS.Tables[0].Rows.Count == 0)
@@ -42738,42 +42752,31 @@
else
//鏈惎鐢ㄦ潯鐮佸簱瀛橈紝浠撳簱浠撲綅鑾峰彇椤哄簭锛氱晫闈笂浠撳簱浠撲綅 > 婧愬崟浠撳簱浠撲綅 > 鐗╂枡榛樿浠撳簱浠撲綅
{
- if (HWhID == 0)
+ //sWHSPCtl=1锛岃〃绀虹晫闈笂浠撳簱浠撲綅涓虹┖ 鍖归厤婧愬崟鏁版嵁鏃惰繑鍥炲琛屾暟鎹紝鍒ゆ柇杩斿洖鐨勫琛屾暟鎹腑浠撳簱浠撲綅鏄惁鐩稿悓
+ if (sWHSPCtl == 1 && dsSource.Tables[0].Rows.Count > 1)
{
- //鍖归厤婧愬崟鏁版嵁鏃跺彧杩斿洖鍞竴涓�琛屾暟鎹紝涓斾粨搴揑D涓嶄负0锛屼粨搴撲粨浣嶅彇杩斿洖鐨勪粨搴撲粨浣嶅��
- if (dsSource.Tables[0].Rows.Count == 1 && omodel_View.HWHID != 0)
+ double sSumQty2 = 0;
+ double sRemQty2 = 0;
+ long sWHID = 0;
+ long sSPID = 0;
+ for (int i = 0; i < dsSource.Tables[0].Rows.Count; i++)
{
- HWhID = omodel_View.HWHID;
- HSPID = omodel_View.HSPID;
- }
- //鍖归厤婧愬崟鏁版嵁鏃惰繑鍥炲琛屾暟鎹紝鍒ゆ柇鎷嗗垎鍚庣殑瀛愯〃瀵瑰簲浠撳簱浠撲綅鏄惁鐩稿悓锛岀浉鍚� 鍙栬繑鍥炵殑浠撳簱浠撲綅鍊硷紱涓嶅悓 鍙栫晫闈笂浠撳簱浠撲綅
- else
- {
- double sSumQty2 = 0;
- double sRemQty2 = 0;
- long sWHID = 0;
- long sSPID = 0;
- for (int i = 0; i < dsSource.Tables[0].Rows.Count; i++)
+ omodel_View.HSourceQty = DBUtility.ClsPub.isDoule(dsSource.Tables[0].Rows[i]["HQtyMust"]); //瀛樺湪鐩稿悓鐗╂枡鏃讹紝鍏朵腑涓�琛屾簮鍗曞墿浣欏彲鎵暟閲�
+ sSumQty2 = sSumQty2 + omodel_View.HSourceQty;
+ sRemQty2 = sRelQty - sSumQty2;
+
+ if (i > 0 && (sWHID != DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[i]["HWhID"]) || sSPID != DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[i]["HSPID"])))
{
- omodel_View.HSourceQty = DBUtility.ClsPub.isDoule(dsSource.Tables[0].Rows[i]["HQtyMust"]); //瀛樺湪鐩稿悓鐗╂枡鏃讹紝鍏朵腑涓�琛屾簮鍗曞墿浣欏彲鎵暟閲�
- sSumQty2 = sSumQty2 + omodel_View.HSourceQty;
- sRemQty2 = sRelQty - sSumQty2;
-
- if (i > 0 && (sWHID != DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[i]["HWhID"]) || sSPID != DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[i]["HSPID"])))
- {
- sErrMsg = "鍚屾椂鍚敤浜嗚幏鍙栨簮鍗曞瓙琛ㄤ粨搴撲粨浣嶃�佸瓨鍦ㄥ琛岀浉鍚岀墿鏂欐椂鑷姩鎷嗗垎鎹㈣鍔熻兘锛屼絾婧愬崟涓浉鍚岀墿鏂欏搴斾粨搴撲粨浣嶄笉鍚岋紝鍚屼竴鏉＄爜鏃犳硶鍒嗛厤缁欏涓粨搴撲粨浣嶏紝璇烽�夋嫨浠撳簱浠撲綅鍚庡啀鎵爜锛�";
- return null;
- }
- sWHID = DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[i]["HWhID"]);
- sSPID = DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[i]["HSPID"]);
-
- if (sRemQty2 <= 0)
- {
- break;
- }
+ sErrMsg = "鍚屾椂鍚敤浜嗚幏鍙栨簮鍗曞瓙琛ㄤ粨搴撲粨浣嶃�佸瓨鍦ㄥ琛岀浉鍚岀墿鏂欐椂鑷姩鎷嗗垎鎹㈣鍔熻兘锛屼絾婧愬崟涓浉鍚岀墿鏂欏搴斾粨搴撲粨浣嶄笉鍚岋紝鍚屼竴鏉＄爜鏃犳硶鍒嗛厤缁欏涓粨搴撲粨浣嶏紝璇烽�夋嫨浠撳簱浠撲綅鍚庡啀鎵爜锛�";
+ return null;
}
- HWhID = omodel_View.HWHID;
- HSPID = omodel_View.HSPID;
+ sWHID = DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[i]["HWhID"]);
+ sSPID = DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[i]["HSPID"]);
+
+ if (sRemQty2 <= 0)
+ {
+ break;
+ }
}
}
}
--
Gitblit v1.9.1