From 6ca558d705f7f8cbc1d58e334202476ad3359543 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期三, 09 十一月 2022 09:38:59 +0800
Subject: [PATCH] 先进先出控制优化
---
CLOUDWEB/WebService1.asmx.cs | 67 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index d13554b..c6741f9 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -24108,7 +24108,7 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曞け璐ワ紒" + HReturn + sJson;
+ sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曞け璐ワ紒" + HReturn;
LogService.Write("鐢熸垚閲囪喘鍏ュ簱鍗曪紙婧愬崟锛氭敹鏂欓�氱煡鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -33527,7 +33527,8 @@
}
else if (oSystemParameter.omodel.WMS_CampanyName == "鍥涚淮灏�")
{
- SqlConnection ocn = new SqlConnection(@"Data Source=192.168.0.200;DataBase=master;User ID=HX_USER;PWD=lc@841022;max pool size=32767");//鍥涚淮灏�
+ SqlConnection ocn = new SqlConnection(@"Data Source=192.168.0.193\SWE2014;DataBase=master;User ID=HX_USER;PWD=lc@841022;max pool size=32767");//鍥涚淮灏�
+ //SqlConnection ocn = new SqlConnection(@"Data Source=192.168.0.200;DataBase=master;User ID=HX_USER;PWD=lc@841022;max pool size=32767");//鍥涚淮灏�
ocn.Open();
SqlCommand cm = new SqlCommand(sSQL, ocn);
cm.CommandTimeout = 600;
@@ -37069,20 +37070,21 @@
DataSet FIFO = oCn.RunProcReturn("exec h_p_Kf_ICInventory_FIFO_Tmp_BarCode " + HBillID.ToString() + ",'" + HBillType + "','" + model.HBatchNo + "','" + model.HBarCode + "'," + model.HQty.ToString(), "h_p_Kf_ICInventory_FIFO_Tmp_BarCode");
if (FIFO == null || FIFO.Tables[0].Rows.Count == 0)
{
- sErrMsg = "璇锋牴鎹厛杩涘厛鍑烘竻鍗曟壂鐮侊紒";
+ sErrMsg = "鍒ゆ柇鍏堣繘鍏堝嚭鎺у埗鍙戠敓閿欒锛�";
return false;
}
- //else
- //{
- // model.HWhID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HWHID"]);
- // model.HStockPlaceID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSPID"]);
- // model.HQty = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HQty"]);
- // model.HQtyMust = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HSumQtyMust"]);
- // model.HSourceInterID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceInterID"]);
- // model.HSourceEntryID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceEntryID"]);
- // model.HSourceBillNo = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillNo"]);
- // model.HSourceBillType = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillType"]);
- //}
+ else
+ {
+ if (DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0][0]) == 0)
+ {
+ sRelQty = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HQty"]);
+ }
+ else
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
}
//鐗╂枡鏉＄爜鍐欏叆涓存椂琛ㄦ椂锛屽垽鏂粨搴撲粨浣嶆槸鍚︽纭�
@@ -42938,12 +42940,20 @@
DataSet dsFIFO = oCn.RunProcReturn("exec h_p_Kf_ICInventory_FIFO_Tmp_BarCode " + HInterID.ToString() + ",'" + HBillType + "','" + omodel_View.HBatchNo + "','" + omodel_View.HBarCode + "'," + sRelQty.ToString(), "h_p_Kf_ICInventory_FIFO_Tmp_BarCode");
if (dsFIFO == null || dsFIFO.Tables[0].Rows.Count == 0)
{
- sErrMsg = "鍚敤鍏堣繘鍏堝嚭鎺у埗锛屾墍鎵潯鐮佷笉鍦ㄥ厛杩涘厛鍑哄垪琛ㄦ竻鍗曚腑锛�";
+ sErrMsg = "鍒ゆ柇鍏堣繘鍏堝嚭鎺у埗鍙戠敓閿欒锛�";
return null;
}
else
{
- sRelQty = DBUtility.ClsPub.isDoule(dsFIFO.Tables[0].Rows[0]["HQty"]);
+ if (DBUtility.ClsPub.isLong(dsFIFO.Tables[0].Rows[0][0]) == 0)
+ {
+ sRelQty = DBUtility.ClsPub.isDoule(dsFIFO.Tables[0].Rows[0]["HQty"]);
+ }
+ else
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(dsFIFO.Tables[0].Rows[0]["HRemark"]);
+ return null;
+ }
}
}
}
@@ -43711,20 +43721,21 @@
DataSet FIFO = oCn.RunProcReturn("exec h_p_Kf_ICInventory_FIFO_Tmp_BarCode " + HBillID.ToString() + ",'" + HBillType + "','" + oMain.HBatchNo + "','" + oMain.HBarCode + "'," + oMain.HQty.ToString(), "h_p_Kf_ICInventory_FIFO_Tmp_BarCode");
if (FIFO == null || FIFO.Tables[0].Rows.Count == 0)
{
- sErrMsg = "璇锋牴鎹厛杩涘厛鍑烘竻鍗曟壂鐮侊紒";
+ sErrMsg = "鍒ゆ柇鍏堣繘鍏堝嚭鎺у埗鍙戠敓閿欒锛�";
return false;
}
- //else
- //{
- // oMain.HWhID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HWHID"]);
- // oMain.HStockPlaceID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSPID"]);
- // oMain.HQty = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HQty"]);
- // oMain.HQtyMust = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HSumQtyMust"]);
- // oMain.HSourceInterID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceInterID"]);
- // oMain.HSourceEntryID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceEntryID"]);
- // oMain.HSourceBillNo = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillNo"]);
- // oMain.HSourceBillType = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillType"]);
- //}
+ else
+ {
+ if (DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0][0]) == 0)
+ {
+ sRelQty = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HQty"]);
+ }
+ else
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
}
oCn.RunProc("Insert into KF_PonderationBillMain_Temp " +
--
Gitblit v1.9.1