From ab1e0724c5f0277e40115bfff22d3b5f2fdab460 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 29 七月 2024 10:01:03 +0800
Subject: [PATCH] 流水线入库上传生成入库单改为根据生产组织、入库组织、入库货主、生产订单单据类型来汇总区分生成单据

---
 CLOUDWEB/WebService1.asmx.cs |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 00a45f9..d11fc55 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -17622,7 +17622,9 @@
                 string sJson_End_PL = "";
                 string HBillNo_PL = "";
                 string HBillNo = "";
-                long HOrgID = 0;
+                long HPRDORGID = 0;
+                long HSTOCKINORGID = 0;
+                long HINSTOCKOWNERID = 0;
                 string HERPBillType = "";
                 DataSet Ds;
                 DataSet Ds1;
@@ -17658,7 +17660,7 @@
                 }
                 //鏍规嵁鍗曟嵁ID鑾峰彇鎵弿鐨勭粍缁囨湁鍝嚑涓�
                 string tt = "";
-                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_New2 " + oMain.HInterID.ToString(), "h_p_Kf_GetOrgIDByTemp_CLD_New2");    //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");
@@ -17676,10 +17678,12 @@
                            "\"InterationFlags\": \"\",\"IsAutoSubmitAndAudit\":\"false\", \"Model\":[";
                     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]);
+                        HPRDORGID = Pub_Class.ClsPub.isLong(Ds1.Tables[0].Rows[y]["HPRDORGID"]);
+                        HSTOCKINORGID = Pub_Class.ClsPub.isLong(Ds1.Tables[0].Rows[y]["HSTOCKINORGID"]);
+                        HINSTOCKOWNERID = Pub_Class.ClsPub.isLong(Ds1.Tables[0].Rows[y]["HINSTOCKOWNERID"]);
+                        HERPBillType = Pub_Class.ClsPub.isStrNull(Ds1.Tables[0].Rows[y]["HERPBillType"]);
                         //鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
-                        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_New2 " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'," + HPRDORGID.ToString() + "," + HSTOCKINORGID.ToString() + "," + HINSTOCKOWNERID.ToString() + ",'" + HERPBillType + "'", "h_p_Kf_GetProductInBillByOrgID_CLD_New2");    //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");

--
Gitblit v1.9.1