From 54cc0b5dcce2c0e0dea85ec831f467d6302eecad Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期三, 11 一月 2023 13:27:00 +0800
Subject: [PATCH] 直接调拨、其他入库、其他出库无源单扫码上传生成单据，单据类型递入值取界面上所选单据类型；扫描物料条码时递入数量判断优化修改
---
CLOUDWEB/WebService1.asmx.cs | 123 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 108 insertions(+), 15 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 0463c05..176b2a2 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -8523,7 +8523,17 @@
{
string sJson_StockStyle = "";
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
+ string sJson_BillTypeID = ""; //鍗曟嵁绫诲瀷
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
+
+ if (oMain.HBillSubType == "" || oMain.HBillSubType == null)
+ {
+ sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\" },";
+ }
+ else
+ {
+ sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + oMain.HBillSubType + "\" },";
+ }
if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
@@ -8537,7 +8547,7 @@
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[]," +
"\"Model\":{ " +
"\"FBillNo\":\"" + oMain.HBillNo + "\"," +
- "\"FBillTypeID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\" }," +
+ sJson_BillTypeID +
"\"FBizType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBizType"]) + "\"," +
"\"FTransferDirect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FTransferDirect"]) + "\"," +
"\"FTransferBizType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FTransferBizType"]) + "\"," +
@@ -21956,7 +21966,17 @@
{
string sJson_StockStyle = "";
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
+ string sJson_BillTypeID = ""; //鍗曟嵁绫诲瀷
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
+
+ if (oMain.HBillSubType == "" || oMain.HBillSubType == null)
+ {
+ sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\" },";
+ }
+ else
+ {
+ sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + oMain.HBillSubType + "\" },";
+ }
if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
@@ -21972,7 +21992,7 @@
}
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"Model\":{ \"FBillNo\":\"" + oMain.HBillNo + "\"," +
//\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FID"]) + "\"," +
- "\"FBillTypeID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\"}," +
+ sJson_BillTypeID +
"\"FStockOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockOrgId"]) + "\"}," +
"\"FPickOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FPickOrgId"]) + "\"}," +
"\"FStockDirect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockDirect"]) + "\"," +
@@ -31358,7 +31378,17 @@
{
string sJson_StockStyle = "";
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
+ string sJson_BillTypeID = ""; //鍗曟嵁绫诲瀷
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
+
+ if (oMain.HBillSubType == "" || oMain.HBillSubType == null)
+ {
+ sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\" },";
+ }
+ else
+ {
+ sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + oMain.HBillSubType + "\" },";
+ }
if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
@@ -31376,7 +31406,7 @@
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"Model\":{\"FBillNo\":\"" + oMain.HBillNo + "\"," +
//\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FID"]) + "\"," +
- "\"FBillTypeID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\"}," +
+ sJson_BillTypeID +
"\"FStockOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockOrgId"]) + "\"}," +
"\"FStockDirect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockDirect"]) + "\"," +
"\"FDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDate"]) + "\"," +
@@ -36074,7 +36104,10 @@
{
NewBarCode = sBarCode.Split(Convert.ToChar("#"));
sBarCode = NewBarCode[0];
- HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ if (HQty == 0)
+ {
+ HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ }
}
//鏍规嵁鐗╂枡鏉＄爜寰楀埌瀵瑰簲婧愬崟淇℃伅锛岄潪澶氭簮鍗曟ā寮忥紝鍒ゆ柇鏄惁宸叉湁婧愬崟璁板綍(鍗曟嵁绫诲瀷=1203锛屽叾浠栧叆搴撳崟闄ゅ)
if (SourceFlag || HBillType == "1203")
@@ -36632,7 +36665,10 @@
{
NewBarCode = sBarCode.Split(Convert.ToChar("#"));
sBarCode = NewBarCode[0];
- HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ if (HQty == 0)
+ {
+ HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ }
}
//鏍规嵁鏉＄爜鑾峰彇鏉＄爜淇℃伅锛屽瓨鍦ㄧ浉鍚岀墿鏂欐椂鑷姩鑾峰彇涓�琛屾簮鍗曚俊鎭�
DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
@@ -37141,7 +37177,10 @@
{
NewBarCode = sBarCode.Split(Convert.ToChar("#"));
sBarCode = NewBarCode[0];
- HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ if (HQty == 0)
+ {
+ HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ }
}
//鏍规嵁鏉＄爜鑾峰彇鏉＄爜淇℃伅
DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
@@ -37878,7 +37917,10 @@
{
NewBarCode = sBarCode.Split(Convert.ToChar("#"));
sBarCode = NewBarCode[0];
- HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ if (HQty == 0)
+ {
+ HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ }
}
//鏍规嵁鏉＄爜鑾峰彇鏉＄爜淇℃伅
@@ -38185,7 +38227,10 @@
{
NewBarCode = sBarCode.Split(Convert.ToChar("#"));
sBarCode = NewBarCode[0];
- HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ if (HQty == 0)
+ {
+ HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ }
}
//鑾峰彇绯荤粺鍙傛暟
@@ -40555,7 +40600,10 @@
{
NewBarCode = sBarCode.Split(Convert.ToChar("#"));
sBarCode = NewBarCode[0];
- HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ if (HQty == 0)
+ {
+ HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ }
}
//鑾峰彇绯荤粺鍙傛暟
@@ -41671,6 +41719,36 @@
+
+
+
+ #region 鐣岄潰鎺т欢鍔熻兘璋冪敤鏂规硶
+
+ //鏍规嵁鍗曟嵁绫诲瀷鑾峰彇鍗曟嵁瀛愮被鍨�
+ [WebMethod]
+ public DataSet get_BillSubType(string HBillType, Int64 HStockOrgID)
+ {
+ try
+ {
+ DataSet ds;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("exec h_p_WMS_GetBillSubType '" + HBillType + "'," + HStockOrgID.ToString(), "h_p_WMS_GetBillSubType");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ return null;
+ }
+ else
+ {
+ return ds;
+ }
+ }
+ catch (Exception e)
+ {
+ return null;
+ }
+ }
+
+ #endregion
#region 婧愬崟澶勭悊鏂规硶
@@ -42940,7 +43018,7 @@
}
}
else if (oSystemParameter.omodel.WMS_CampanyName == "鍗撳姏" || oSystemParameter.omodel.WMS_CampanyName == "寮�灞遍噸宸�"
- || oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏅鸿" || oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�"
+ || oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏅鸿"
|| oSystemParameter.omodel.WMS_CampanyName == "鍥涚淮灏�" || oSystemParameter.omodel.WMS_CampanyName == "鍦ｉ緳"
|| oSystemParameter.omodel.WMS_CampanyName == "闆呯惇璇�" || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒"
|| oSystemParameter.omodel.WMS_CampanyName == "濂ラ偊" || oSystemParameter.omodel.WMS_CampanyName == "鍗氭棩绉戞妧"
@@ -44063,7 +44141,10 @@
{
NewBarCode = sBarCode.Split(Convert.ToChar("#"));
sBarCode = NewBarCode[0];
- HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ if(HQty==0)
+ {
+ HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ }
}
}
//鎴彇鏉＄爜鍓嶄笁浣嶅瓧绗︿覆
@@ -45003,7 +45084,10 @@
{
NewBarCode = sBarCode.Split(Convert.ToChar("#"));
sBarCode = NewBarCode[0];
- HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ if (HQty == 0)
+ {
+ HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ }
}
}
@@ -46734,7 +46818,10 @@
{
NewBarCode = sBarCode.Split(Convert.ToChar("#"));
sBarCode = NewBarCode[0];
- HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ if (HQty == 0)
+ {
+ HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ }
}
}
@@ -47647,7 +47734,10 @@
{
NewBarCode = sBarCode.Split(Convert.ToChar("#"));
sBarCode = NewBarCode[0];
- HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ if (HQty == 0)
+ {
+ HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ }
}
}
@@ -48453,7 +48543,10 @@
{
NewBarCode = sBarCode.Split(Convert.ToChar("#"));
sBarCode = NewBarCode[0];
- HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ if (HQty == 0)
+ {
+ HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
+ }
}
//鑾峰彇绯荤粺鍙傛暟
--
Gitblit v1.9.1