From 612f93dba4a45edea9d0300a1977e66fe7ce355f Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期五, 26 八月 2022 16:41:15 +0800
Subject: [PATCH] WEBAPI采购入库上传方法增加递入组织、制单人

---
 WebAPI/Web.config                             |    9 +++++----
 WebAPI/Controllers/POStockInBillController.cs |    7 +++++--
 Model/仓库管理/ClsKf_POStockInBillMain.cs         |    4 ++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_POStockInBillMain.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_POStockInBillMain.cs"
index b110741..6dd14b0 100644
--- "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_POStockInBillMain.cs"
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_POStockInBillMain.cs"
@@ -19,5 +19,9 @@
         public bool HRedBlueFlag;//  bit    		--红蓝单
 
         public Int64 HBillerID;//   int        		--制单人ID
+        public Int64 HSTOCKORGID;       //      int     --库存组织
+        public Int64 HOWNERID;          //      int     --货主
+        public DateTime HArrivalDate;   //              --到货时间
+        public Int64 HSPID;             //      int     --仓位
     }
 }
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index e0a4d2b..6ff55fd 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -709,6 +709,7 @@
                 websLsmain.HDeptID = lsmain[0].HDeptID;
                 websLsmain.HWHID = lsmain[0].HWHID;
                 websLsmain.HSCWHID = 0;
+                //websLsmain.HSPID = lsmain[0].HSPID;
                 websLsmain.HSupID = lsmain[0].HSupID;
                 websLsmain.HKeeperID = lsmain[0].HKeeperID;
                 websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
@@ -716,11 +717,13 @@
                 websLsmain.HManagerID = 0;
                 websLsmain.HBillerID = lsmain[0].HBillerID;
                 websLsmain.HRemark = "";
+                websLsmain.HExplanation = lsmain[0].HExplanation;
                 websLsmain.HInnerBillNo = "";
                 websLsmain.HRedBlueFlag = false;//false钃濆瓧 true绾㈠瓧
                 websLsmain.HMainSourceBillType = lsmain[0].HBillType;
-                websLsmain.HExplanation = lsmain[0].HExplanation;
-
+                websLsmain.HMaker = lsmain[0].HMaker;
+                websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+                websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
 
                 if (webserver.set_SavePOStockInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
                 {
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 14da35d..f933f29 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -20,12 +20,13 @@
 	<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
 	<add key="FileIP" value="http://localhost:8080/" />
 	  <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
-	  <!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
+	  <add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/>     <!--棰滃彴寮忔満-->
 	  <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
-	  <add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 
+	  <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
 	  <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    鍗氭棩绉戞妧-->
 	  <!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/>    鐟炰笌绁�-->
 	  <!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/>    妫シ-->
+	  <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>   鍏徃浜戞湇鍔″櫒-->
     <add key="webpages:Version" value="3.0.0.0" />
     <add key="webpages:Enabled" value="false" />
     <add key="ClientValidationEnabled" value="true" />
@@ -92,7 +93,7 @@
       </basicHttpBinding>
     </bindings>
     <client>
-      <endpoint address="http://60.190.4.42:9003/WebService/WebService1.asmx" binding="basicHttpBinding"
+      <endpoint address="http://192.168.63.195/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
         bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
         name="WebService1Soap" />
     </client>
@@ -100,7 +101,7 @@
   <applicationSettings>
     <WebAPI.Properties.Settings>
       <setting name="WebAPI_WebS_WebService1" serializeAs="String">
-        <value>http://60.190.4.42:9003/WebService/WebService1.asmx</value>
+        <value>http://192.168.63.195/WEBS-WMS/WebService1.asmx</value>
       </setting>
     </WebAPI.Properties.Settings>
   </applicationSettings>

--
Gitblit v1.9.1