From 0e826c3150ca3d93fbbc82a4e6cf8be97ab111a8 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 15 九月 2022 13:40:51 +0800
Subject: [PATCH] 销售出库（源单：发货通知单）上传生成CLOUD单据IsEntryBatchFill参数递入值修改，扫物料条码获取系统参数方法修改
---
CLOUDWEB/WebService1.asmx.cs | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 859cf7f..d3c4c23 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -14014,6 +14014,7 @@
{
string sCheckFlag = ""; //鏄惁瀹℃牳鏍囧織
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
+ string sIsEntryBatchFill = "True"; //鏄惁鎵归噺濉厖鍒嗗綍锛岄粯璁rue锛堥潪蹇呭綍锛�
//鏍规嵁缁勭粐鑾峰彇鏄惁瀹℃牳鏍囧織锛岃繑鍥� 涓嶄负绌猴紝鑾峰彇瀵瑰簲缁勭粐 鏄惁瀹℃牳鏍囧織
sCheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
@@ -14024,8 +14025,14 @@
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
+ if (oSystemParameterMain.WMS_CampanyName == "鍗氭棩绉戞妧") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ sIsEntryBatchFill = "false";
+ }
+
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
- "\"IsEntryBatchFill\":\"false\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\"," +
+ "\"IsEntryBatchFill\":\"" + sIsEntryBatchFill + "\"," +
+ "\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\"," +
"\"Model\":{ " +
//\"FID\":\"0\",
"\"FBillTypeID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\"}," +
@@ -40100,7 +40107,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Sc_ICMOReportBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Sc_ICMOReportBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40152,7 +40159,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_POStockInBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_POStockInBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40204,7 +40211,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_ProductInBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_ProductInBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40256,7 +40263,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_OtherInBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_OtherInBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40308,7 +40315,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_EntrustInBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_EntrustInBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40355,7 +40362,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_MateOutBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_MateOutBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40407,7 +40414,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_SellOutBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_SellOutBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40459,7 +40466,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_OtherOutBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_OtherOutBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40506,7 +40513,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_EntrustOutBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_EntrustOutBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40558,7 +40565,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_MateReplenishOutBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_MateReplenishOutBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40605,7 +40612,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_MoveStockBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_MoveStockBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40657,7 +40664,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_MoveStockStepOutBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_MoveStockStepOutBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40709,7 +40716,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_MoveStockStepInBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_MoveStockStepInBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40756,7 +40763,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_POStockInBackBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_POStockInBackBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40803,7 +40810,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_ProductInBackBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_ProductInBackBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40850,7 +40857,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_OtherInBackBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_OtherInBackBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40897,7 +40904,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_EntrustInBackBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_EntrustInBackBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40944,7 +40951,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_MateOutBackBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_MateOutBackBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -40991,7 +40998,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_SellOutBackBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_SellOutBackBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -41038,7 +41045,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_OtherOutBackBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_OtherOutBackBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -41085,7 +41092,7 @@
//鎵爜鏁伴噺鑳藉惁鍙秴鍗曟嵁鏁伴噺鎺у埗锛堝皬浜庣瓑浜庡簲鏀躲�佸畬鍏ㄧ瓑浜庡簲鏀躲�佷笉鎺у埗锛�
if (oSystemParameterMain.Kf_EntrustOutBackBill_MustQtyCtl == "灏忎簬绛変簬搴旀敹")
{
- sMustQtyCtl = "灏忎簬绛変簬搴旀敹Y";
+ sMustQtyCtl = "灏忎簬绛変簬搴旀敹";
}
else if (oSystemParameterMain.Kf_EntrustOutBackBill_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
@@ -42362,8 +42369,7 @@
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");
if (DsWMS == null || DsWMS.Tables[0].Rows.Count == 0)
{
- sErrMsg = "鍒ゆ柇WMS鏉＄爜搴撳瓨锛屽彂鐢熼敊璇紒";
- return false;
+ sRelQty = 0;
}
else
{
@@ -42428,7 +42434,7 @@
if (sRelQty == 0)
{
- sErrMsg = "鎵�鎵弿鏉＄爜鏃犳潯鐮佸簱瀛樻垨瀵瑰簲鐗╂枡鏃燛RP搴撳瓨锛�";
+ sErrMsg = "鍚敤鏉＄爜搴撳瓨鎺у埗锛屾墍鎵弿鏉＄爜鏃犳潯鐮佸簱瀛橈紒";
return false;
}
--
Gitblit v1.9.1