From cc7b48fc5e4082bb5acc774b7e4975e9bdbd4412 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 19 八月 2021 15:40:11 +0800
Subject: [PATCH] 生产入库（源单：生产订单、生产汇报单），生产汇报单（源单：生产订单）自定义字段写入修改
---
CLOUDWEB/WebService1.asmx.cs | 70 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index cd357f9..b8b62c4 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -4260,20 +4260,20 @@
[WebMethod]
public bool set_SaveICMOReportBill_CLD_New(Model.ClsSc_ICMOReportBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
- ////涓婁紶鍓嶅垽鏂槸鍚﹀瓨鍦ㄧ浉鍚屾潯鐮�
- //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- //DataSet ds = oCn.RunProcReturn("exec h_p_WMS_UpLoadControl " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "'", "h_p_WMS_UpLoadControl");
- //if (ds == null || ds.Tables[0].Rows.Count == 0)
- //{
- //}
- //else
- //{
- // if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
- // {
- // sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
- // return false;
- // }
- //}
+ //涓婁紶鍓嶅垽鏂槸鍚﹀瓨鍦ㄧ浉鍚屾潯鐮�
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet ds = oCn.RunProcReturn("exec h_p_WMS_UpLoadControl " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "'", "h_p_WMS_UpLoadControl");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
//if (sHSourceType == "3710") //婧愬崟锛氱敓浜ц鍗�
//{
@@ -17499,7 +17499,9 @@
{
sJson_StockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
}
- sJson_Custom = " \"F_QOUL_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT"]) + "\", "; //閿�鍞鍗曞彿
+ sJson_Custom = "\"F_QOUL_TEXT1\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT"]) + "\"," + //閿�鍞鍗曞彿
+ "\"F_QOUL_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT"]) + "\"," + //閿�鍞鍗曞彿
+ "\"F_QOUL_ASSISTANT\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_ASSISTANT"]) + "\"},"; //浜у搧绛夌骇
}
else
{
@@ -18513,18 +18515,18 @@
{
//涓婁紶鍓嶅垽鏂槸鍚﹀瓨鍦ㄧ浉鍚屾潯鐮�
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- //DataSet ds = oCn.RunProcReturn("exec h_p_WMS_UpLoadControl " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "'", "h_p_WMS_UpLoadControl");
- //if (ds == null || ds.Tables[0].Rows.Count == 0)
- //{
- //}
- //else
- //{
- // if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
- // {
- // sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
- // return false;
- // }
- //}
+ DataSet ds = oCn.RunProcReturn("exec h_p_WMS_UpLoadControl " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "'", "h_p_WMS_UpLoadControl");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
if (sHSourceType == "3710") //鐢熶骇璁㈠崟
{
@@ -18666,6 +18668,7 @@
}
string sJson_BatchNo = "";
string sJson_StockPlace = "";
+ string sJson_EntryCustom = "";
if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HISBATCHMANAGE"]) == "1") //鏄惁鍚敤鎵规绠＄悊
{
sJson_BatchNo = " \"FLOT\": {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"}, \"FLOT_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\" , ";
@@ -18682,6 +18685,12 @@
else
{
sJson_StockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
+ }
+ if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ sJson_EntryCustom = "\"F_QOUL_TEXT1\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT1"]) + "\"," + //閿�鍞鍗曞彿
+ "\"F_QOUL_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT1"]) + "\"," + //閿�鍞鍗曞彿
+ "\"F_QOUL_ASSISTANT\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_ASSISTANT"]) + "\"},"; //浜у搧绛夌骇
}
//
sJson_Entry = sJson_Entry + " {" +
@@ -18741,6 +18750,7 @@
" \"FREQBILLID\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FREQBILLID"]) + "," +
" \"FREQENTRYSEQ\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FREQENTRYSEQ"]) + "," +
" \"FREQENTRYID\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FREQENTRYID"]) + "," +
+ sJson_EntryCustom +
//\"FSerialSubEntity\":[{\"FDetailID\":\"0\",
//\"FSerialNo\":\"\",
@@ -18946,7 +18956,9 @@
}
if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
- sJson_EntryCustom = "\"F_QOUL_TEXT1\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT1"]) + "\","; //閿�鍞鍗曞彿
+ sJson_EntryCustom = "\"F_QOUL_TEXT1\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT1"]) + "\"," + //閿�鍞鍗曞彿
+ "\"F_QOUL_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT1"]) + "\"," + //閿�鍞鍗曞彿
+ "\"F_QOUL_ASSISTANT\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_ASSISTANT"]) + "\"},"; //浜у搧绛夌骇
}
//
sJson_Entry = sJson_Entry + " {" +
@@ -19065,7 +19077,7 @@
new object[] { "PRD_INSTOCK", sJson }); //璋冪敤淇濆瓨鏂瑰紡
////鐢熸垚鍗曟嵁鍚庢洿鏂拌嚜瀹氫箟瀛楁
- oCn.RunProc("exec h_p_Sc_UpDateSelfFildProductIn '" + oMain.HBillNo + "'");
+ //oCn.RunProc("exec h_p_Sc_UpDateSelfFildProductIn '" + oMain.HBillNo + "'");
if (oSystemParameterMain.Kf_ProductInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
--
Gitblit v1.9.1