From 4b9bfa2737a7ff20c828749e5068197ee4b846fa Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 28 十一月 2022 15:14:05 +0800
Subject: [PATCH] 先进先出控制修改
---
CLOUDWEB/WebService1.asmx.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 404be34..162c637 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -43883,7 +43883,7 @@
}
//鍏堣繘鍏堝嚭鎺у埗
- if (sFIFOCtl == "Y")
+ if (HSourceBillType != "-1" && sFIFOCtl == "Y")
{
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)
@@ -44697,7 +44697,7 @@
oMain.HOWNERID = HStockInOrgID;
//鍏堣繘鍏堝嚭鎺у埗
- if (HBillType != "1251" && sFIFOCtl == "Y")
+ if (HSourceBillType != "-1" && HBillType != "1251" && sFIFOCtl == "Y")
{
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)
@@ -45525,6 +45525,10 @@
{
sFIFOCtl = "Y";
}
+ else if (HBillType == "1206" && (oSystemParameter.omodel.Kf_OtherOutBill_FIFOCtl == "Y" || oSystemParameter.omodel.Kf_OtherOutBill_FIFOList == "Y")) //鍏朵粬鍑哄簱鍗�-鍏堣繘鍏堝嚭鎺у埗
+ {
+ sFIFOCtl = "Y";
+ }
else if (HBillType == "1207" && (oSystemParameter.omodel.Kf_MoveStockBill_FIFOCtl == "Y" || oSystemParameter.omodel.Kf_MoveStockBill_FIFOList == "Y")) //鐩存帴璋冩嫧鍗�-鍏堣繘鍏堝嚭鎺у埗
{
sFIFOCtl = "Y";
--
Gitblit v1.9.1