From 47819def1cb13bd5d080bd396f2c38c2cb218e47 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 19 五月 2022 15:27:06 +0800
Subject: [PATCH] 采购入库扫码上传生成WISE单据时，主表增加写入到货时间HArrivalDate；扫描物料条码启用ERP库存管理、条码类型为批次码时，ERP库存数量获取修改
---
CLOUDWEB/WebService1.asmx.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 0783d03..3897992 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -21706,11 +21706,13 @@
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
+ ",HArrivalDate" +
") " +
" values('1201','1201'," + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "',convert(varchar(10),getdate(),120),'" + oMain.HMainSourceBillType + "'" +
", " + oMain.HYear.ToString() + "," + oMain.HPeriod.ToString() + ",'" + oMain.HRemark + "','" + oMain.HMaker + "',convert(varchar(10),getdate(),120)" +
", " + oMain.HSupID.ToString() + "," + oMain.HWHID.ToString() + "," + oMain.HSCWHID.ToString() + "," + oMain.HEmpID.ToString() + "," + oMain.HManagerID.ToString() + "," + oMain.HSecManagerID.ToString() +
", " + oMain.HKeeperID.ToString() + "," + oMain.HDeptID.ToString() + ",'" + oMain.HExplanation + "','" + oMain.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(oMain.HRedBlueFlag) +
+ ",'" + oMain.HArrivalDate.ToShortDateString() + "'" +
") ");
//鏂板K3瀛愯〃銆佷富琛�
@@ -33383,6 +33385,7 @@
{
dal.omodel_View.HMaterID = DBUtility.ClsPub.isLong(ds6.Tables[0].Rows[0]["HMaterID"]);
HQty = DBUtility.ClsPub.isDoule(ds6.Tables[0].Rows[0]["HQty"]);
+ sRelQty = HQty;
}
else
{
@@ -36346,7 +36349,7 @@
double sERPQty = 0; //ERP搴撳瓨鏁伴噺
//搴撳瓨鎺у埗-WMS璐熷簱瀛樻帶鍒�
- if (oSystemParameterMain.WMS_WMSStockCtl == "Y")
+ if (omodel_View.HBarCodeType == "鍞竴鏉＄爜" && oSystemParameterMain.WMS_WMSStockCtl == "Y")
{
//鍒ゆ柇ERP搴撳瓨 杩斿洖ERP搴撳瓨鏁伴噺
DataSet DsWMS = oCn.RunProcReturn("exec h_p_KF_ICInventory_WMS_GetWHAndSP " + HBillID.ToString() + ",'" + HBillType + "','" + omodel_View.HBarCode + "'," + HSCWHID.ToString() + "," + HSCSPID.ToString(), "h_p_KF_ICInventory_WMS_GetWHAndSP");
@@ -36596,7 +36599,7 @@
|| HBillType == "1254")
{
//搴撳瓨鎺у埗-WMS璐熷簱瀛樻帶鍒�
- if (oSystemParameterMain.WMS_WMSStockCtl == "Y")
+ if (omodel_View.HBarCodeType == "鍞竴鏉＄爜" && oSystemParameterMain.WMS_WMSStockCtl == "Y")
{
//鍒ゆ柇ERP搴撳瓨 杩斿洖ERP搴撳瓨鏁伴噺
DataSet DsWMS = oCn.RunProcReturn("exec h_p_KF_ICInventory_WMS_GetWHAndSP " + HBillID.ToString() + ",'" + HBillType + "','" + omodel_View.HBarCode + "'," + HWhID.ToString() + "," + HSPID.ToString(), "h_p_KF_ICInventory_WMS_GetWHAndSP");
--
Gitblit v1.9.1