From 50aa756c6ea31d6e3bb4b2904f2555746d87c806 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 31 十二月 2025 09:30:03 +0800
Subject: [PATCH] 全部上传生成金蝶云单据调用方法中增加根据参数“仓位是否从ERP同步”来获取数据

---
 CLOUDWEB/WebService1.asmx.cs |  888 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 740 insertions(+), 148 deletions(-)

diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 67e81e9..c262b69 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -6670,13 +6670,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetICMOReportBill_ICMO_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetICMOReportBill_ICMO_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetICMOReportBill_ICMO_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetICMOReportBill_ICMO_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetICMOReportBill_ICMO_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetICMOReportBill_ICMO_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetICMOReportBill_ICMO_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetICMOReportBill_ICMO_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetICMOReportBill_ICMO_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetICMOReportBill_ICMO_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetICMOReportBill_ICMO_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetICMOReportBill_ICMO_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -10987,13 +11003,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PPBom_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PPBom_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PPBom_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PPBom_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PPBom_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PPBom_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PPBom_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PPBom_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -11457,13 +11489,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_WWPPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_WWPPBom_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_WWPPBom_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_WWPPBom_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_WWPPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_WWPPBom_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_WWPPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_WWPPBom_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_WWPPBom_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_WWPPBom_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_WWPPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_WWPPBom_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -11922,13 +11970,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_SeOutStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_SeOutStock_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_SeOutStock_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_SeOutStock_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_SeOutStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_SeOutStock_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_SeOutStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_SeOutStock_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_SeOutStock_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_SeOutStock_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_SeOutStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_SeOutStock_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -12422,13 +12486,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MoveStockRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MoveStockRequest_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MoveStockRequest_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MoveStockRequest_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MoveStockRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MoveStockRequest_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MoveStockRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MoveStockRequest_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MoveStockRequest_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MoveStockRequest_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MoveStockRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MoveStockRequest_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -12898,13 +12978,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_StockOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_StockOutRequest_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_StockOutRequest_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_StockOutRequest_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_StockOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_StockOutRequest_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_StockOutRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_StockOutRequest_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_StockOutRequest_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_StockOutRequest_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_StockOutRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_StockOutRequest_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -13366,13 +13462,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MateOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MateOutRequest_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MateOutRequest_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MateOutRequest_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MateOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MateOutRequest_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MateOutRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MateOutRequest_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MateOutRequest_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MateOutRequest_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MateOutRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MateOutRequest_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -13843,13 +13955,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PrepareMTRL_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PrepareMTRL_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PrepareMTRL_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PrepareMTRL_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PrepareMTRL_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PrepareMTRL_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PrepareMTRL_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PrepareMTRL_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PrepareMTRL_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PrepareMTRL_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PrepareMTRL_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PrepareMTRL_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -14314,13 +14442,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveOutBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveOutBill_PUBCLD");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveOutBill_SPPUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveOutBill_SPPUBCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveOutBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveOutBill_PUBCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveOutBill_CLD");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveOutBill_SPCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveOutBill_SPCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveOutBill_CLD");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -15454,13 +15598,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -15908,13 +16068,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_SeOutStock_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_SeOutStock_PUBCLD");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_SeOutStock_SPPUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_SeOutStock_SPPUBCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_SeOutStock_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_SeOutStock_PUBCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_SeOutStock_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_SeOutStock_CLD");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_SeOutStock_SPCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_SeOutStock_SPCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_SeOutStock_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_SeOutStock_CLD");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -16394,13 +16570,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_PUBCLD");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_SPPUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_SPPUBCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_PUBCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_CLD");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_SPCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_SPCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_CLD");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -16933,13 +17125,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_PUBCLD");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_SPPUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_SPPUBCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_PUBCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_CLD");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_SPCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_SPCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_CLD");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -18473,13 +18681,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOutStockBack_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOutStockBack_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOutStockBack_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOutStockBack_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOutStockBack_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOutStockBack_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOutStockBack_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOutStockBack_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOutStockBack_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOutStockBack_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOutStockBack_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOutStockBack_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -18968,13 +19192,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOrder_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOrder_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOrder_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOrder_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOrder_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOrder_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOrder_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOrder_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -20730,13 +20970,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOrder_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOrder_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOrder_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOrder_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOrder_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOrder_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOrder_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOrder_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -21239,13 +21495,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOutStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOutStock_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOutStock_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOutStock_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOutStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOutStock_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOutStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOutStock_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOutStock_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOutStock_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOutStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOutStock_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -23415,13 +23687,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_PPBom_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_PPBom_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_PPBom_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_PPBom_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_PPBom_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_PPBom_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_PPBom_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_PPBom_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -23870,13 +24158,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_MateOut_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_MateOut_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_MateOut_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_MateOut_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_MateOut_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_MateOut_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_MateOut_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_MateOut_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_MateOut_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_MateOut_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_MateOut_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_MateOut_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -24831,13 +25135,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PPBom_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PPBom_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PPBom_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PPBom_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PPBom_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PPBom_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PPBom_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PPBom_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -25290,13 +25610,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_MateOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_MateOutRequest_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_MateOutRequest_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_MateOutRequest_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_MateOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_MateOutRequest_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_MateOutRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_MateOutRequest_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_MateOutRequest_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_MateOutRequest_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_MateOutRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_MateOutRequest_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -25744,13 +26080,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PrepareMTRL_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PrepareMTRL_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PrepareMTRL_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PrepareMTRL_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PrepareMTRL_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PrepareMTRL_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PrepareMTRL_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PrepareMTRL_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PrepareMTRL_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PrepareMTRL_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PrepareMTRL_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PrepareMTRL_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -26987,13 +27339,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateReplenishOutBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateReplenishOutBill_PPBom_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateReplenishOutBill_PPBom_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateReplenishOutBill_PPBom_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateReplenishOutBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateReplenishOutBill_PPBom_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateReplenishOutBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'," + oMain.HOWNERID.ToString(), "h_p_Kf_GetMateReplenishOutBill_PPBom_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateReplenishOutBill_PPBom_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'," + oMain.HOWNERID.ToString(), "h_p_Kf_GetMateReplenishOutBill_PPBom_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateReplenishOutBill_PPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'," + oMain.HOWNERID.ToString(), "h_p_Kf_GetMateReplenishOutBill_PPBom_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -28929,13 +29297,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBackBill_WWPPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBackBill_WWPPBom_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBackBill_WWPPBom_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBackBill_WWPPBom_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBackBill_WWPPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBackBill_WWPPBom_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBackBill_WWPPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBackBill_WWPPBom_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBackBill_WWPPBom_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBackBill_WWPPBom_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBackBill_WWPPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBackBill_WWPPBom_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -29853,13 +30237,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBill_WWPPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBill_WWPPBom_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBill_WWPPBom_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBill_WWPPBom_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBill_WWPPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBill_WWPPBom_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBill_WWPPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBill_WWPPBom_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBill_WWPPBom_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBill_WWPPBom_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBill_WWPPBom_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBill_WWPPBom_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -32495,13 +32895,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_StockOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_StockOutRequest_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_StockOutRequest_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_StockOutRequest_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_StockOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_StockOutRequest_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_StockOutRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_StockOutRequest_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_StockOutRequest_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_StockOutRequest_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_StockOutRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_StockOutRequest_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -32902,13 +33318,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_PUBCLD");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_SPPUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_SPPUBCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_PUBCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_CLD");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_SPCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_SPCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_CLD");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -34676,13 +35108,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POOrder_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POOrder_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POOrder_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POOrder_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POOrder_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POOrder_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POOrder_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POOrder_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -35172,13 +35620,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POInStockBack_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POInStockBack_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POInStockBack_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POInStockBack_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POInStockBack_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POInStockBack_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POInStockBack_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POInStockBack_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POInStockBack_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POInStockBack_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POInStockBack_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POInStockBack_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -35656,13 +36120,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POStockIn_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POStockIn_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POStockIn_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POStockIn_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POStockIn_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POStockIn_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POStockIn_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POStockIn_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POStockIn_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POStockIn_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POStockIn_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POStockIn_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -37174,13 +37654,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -37656,13 +38152,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POOrder_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POOrder_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POOrder_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POOrder_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POOrder_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POOrder_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POOrder_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POOrder_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POOrder_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -40961,13 +41473,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMO_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMO_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMO_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMO_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMO_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMO_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMO_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMO_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMO_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMO_SPCLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMO_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMO_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -41395,13 +41923,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMOReport_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMOReport_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMOReport_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMOReport_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMOReport_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMOReport_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMOReport_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMOReport_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMOReport_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMOReport_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMOReport_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMOReport_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -41842,13 +42386,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ProcessReport_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ProcessReport_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ProcessReport_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ProcessReport_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ProcessReport_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ProcessReport_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ProcessReport_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ProcessReport_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ProcessReport_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ProcessReport_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ProcessReport_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ProcessReport_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -43820,13 +44380,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_SPPUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_SPPUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_CLD_New");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_SPCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_SPCLD_New");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_CLD_New");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
@@ -45380,13 +45956,29 @@
                 DataSet Ds;
                 if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherInBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherInBill_PUBCLD");
-                    sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherInBill_SPPUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherInBill_SPPUBCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherInBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherInBill_PUBCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
+                    }
                 }
                 else
                 {
-                    Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherInBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherInBill_CLD");
-                    sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    if (oSystemParameterMain.WMS_StockPlaceAutoCtl.ToUpper() == "N") //绯荤粺鍙傛暟  浠撲綅鏄惁浠嶦RP鍚屾(N涓轰粨浣嶆暟鎹湰鍦扮淮鎶わ紝Y涓轰粨浣嶆暟鎹粠ERP涓悓姝ヨ嚦鏈湴)
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherInBill_SPCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherInBill_SPCLD");
+                        sRemark = sRemark + " 锛涘叕鏈変簯妯″紡-浠撲綅鏈湴缁存姢";
+                    }
+                    else
+                    {
+                        Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherInBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherInBill_CLD");
+                        sRemark = sRemark + " 锛涚鏈変簯妯″紡";
+                    }
                 }
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {

--
Gitblit v1.9.1