From d876d3ed3c8bae09e6aaaa712e06168e9550925c Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 08 七月 2024 15:41:54 +0800
Subject: [PATCH] 流水线入库上传生成入库单改为根据组织、生产订单单据类型来汇总区分生成单据
---
CLOUDWEB/WebService1.asmx.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index a344bcf..7d33dc9 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -17623,6 +17623,7 @@
string HBillNo_PL = "";
string HBillNo = "";
long HOrgID = 0;
+ string HERPBillType = "";
DataSet Ds;
DataSet Ds1;
//鍐欏叆WMS浜у搧鍏ュ簱鍗�
@@ -17657,7 +17658,8 @@
}
//鏍规嵁鍗曟嵁ID鑾峰彇鎵弿鐨勭粍缁囨湁鍝嚑涓�
string tt = "";
- Ds1 = oCn.RunProcReturn("exec h_p_Kf_GetOrgIDByTemp_CLD " + oMain.HInterID.ToString(), "h_p_Kf_GetOrgIDByTemp_CLD");
+ Ds1 = oCn.RunProcReturn("exec h_p_Kf_GetOrgIDByTemp_CLD_New " + oMain.HInterID.ToString(), "h_p_Kf_GetOrgIDByTemp_CLD_New"); //20240708淇敼
+ //Ds1 = oCn.RunProcReturn("exec h_p_Kf_GetOrgIDByTemp_CLD " + oMain.HInterID.ToString(), "h_p_Kf_GetOrgIDByTemp_CLD");
sRemark = sRemark + " 锛涜幏鍙栫粍缁囦釜鏁�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
@@ -17675,8 +17677,10 @@
for (int y = 0; y < Ds1.Tables[0].Rows.Count; y++)
{
HOrgID = Pub_Class.ClsPub.isLong(Ds1.Tables[0].Rows[y][0]);
+ HERPBillType = Pub_Class.ClsPub.isStrNull(Ds1.Tables[0].Rows[y][1]);
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
- Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBillByOrgID_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'," + HOrgID.ToString(), "h_p_Kf_GetProductInBillByOrgID_CLD");
+ Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBillByOrgID_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'," + HOrgID.ToString() + ",'" + HERPBillType + "'", "h_p_Kf_GetProductInBillByOrgID_CLD_New"); //20240708淇敼
+ //Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBillByOrgID_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'," + HOrgID.ToString(), "h_p_Kf_GetProductInBillByOrgID_CLD");
sRemark = sRemark + " 锛涜幏鍙朅PI鏁版嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
@@ -17862,12 +17866,14 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
sErrMsg = sErrMsg + "浜у搧鍏ュ簱鍗曞け璐ワ紒" + HReturn + "999" + tt + "888" + sJson;
+ LogService.Write("鐢熸垚鐢熶骇鍏ュ簱鍗曪紙婧愬崟锛氱敓浜т换鍔″崟锛夊婧愬崟澶辫触锛�" + HReturn + tt +sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
}
else
{
sErrMsg = sErrMsg + "999" + tt + "888" + HReturn;
+ LogService.Write("鐢熸垚骞跺鏍哥敓浜у叆搴撳崟锛堟簮鍗曪細鐢熶骇浠诲姟鍗曪級澶氭簮鍗曟垚鍔燂紒" + HReturn + tt + sJson);
oCn.Commit();
return true;
}
--
Gitblit v1.9.1