From 3ad2a9ea53d9b647ec10c9ece51f40d7f078653a Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 27 十二月 2023 13:36:53 +0800
Subject: [PATCH] 生产入库、委外入库、其他入库、生产领料、委外领料、其他出库、直接调拨扫码上传方法增加递入保管人、验收人、金蝶WISE制单人等
---
WebAPI/Controllers/MateOutController.cs | 3 +++
WebAPI/Controllers/OtherOutBillController.cs | 3 +++
WebAPI/Controllers/MoveStockBillController.cs | 2 +-
WebAPI/Web.config | 7 ++++---
WebAPI/Controllers/EntrustOutController.cs | 3 +++
WebAPI/Controllers/Kf_EntrustInBillController.cs | 2 +-
WebAPI/Controllers/OtherInStockController.cs | 2 ++
WebAPI/Controllers/ProductInController.cs | 18 ++++++++++++++++++
8 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/EntrustOutController.cs b/WebAPI/Controllers/EntrustOutController.cs
index 0e724ec..c427c0f 100644
--- a/WebAPI/Controllers/EntrustOutController.cs
+++ b/WebAPI/Controllers/EntrustOutController.cs
@@ -460,8 +460,11 @@
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HDeptID = lsmain[0].HDeptID;
//websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HKeeperID = lsmain[0].HKeeperID;
+ websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HBillerID = lsmain[0].HBillerID;
websLsmain.HWHID = lsmain[0].HWHID;
websLsmain.HMainSourceBillType = "濮斿璁㈠崟-鎶曟枡";
websLsmain.HSupID = lsmain[0].HSupID;
diff --git a/WebAPI/Controllers/Kf_EntrustInBillController.cs b/WebAPI/Controllers/Kf_EntrustInBillController.cs
index 36be5ed..caf6c18 100644
--- a/WebAPI/Controllers/Kf_EntrustInBillController.cs
+++ b/WebAPI/Controllers/Kf_EntrustInBillController.cs
@@ -269,7 +269,7 @@
websLsmain.HDate = lsmain[0].HDate;
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HBillType = lsmain[0].HBillType;
- websLsmain.HBillerID = DBUtility.ClsPub.isLong(DBUtility.ClsPub.CurUserID);
+ websLsmain.HBillerID = lsmain[0].HBillerID;
websLsmain.HDeptID = lsmain[0].HDeptID;
websLsmain.HEmpID = lsmain[0].HEmpID;
websLsmain.HRemark = "";
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index e0da45a..0ed1c45 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -547,6 +547,9 @@
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HDeptID = lsmain[0].HDeptID;
websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HKeeperID = lsmain[0].HKeeperID;
+ websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
+ websLsmain.HBillerID = lsmain[0].HBillerID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HBillType = "1204";//鍥哄畾鍊�
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index 75a5bf1..8b45d3b 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -612,7 +612,7 @@
websLsmain.HKeeperID = lsmain[0].HKeeperID;
websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
websLsmain.HManagerID = 0;
- websLsmain.HBillerID = 0;
+ websLsmain.HBillerID = lsmain[0].HBillerID;
websLsmain.HExplanation = "";
websLsmain.HInnerBillNo = "";
websLsmain.HRedBlueFlag = false;
diff --git a/WebAPI/Controllers/OtherInStockController.cs b/WebAPI/Controllers/OtherInStockController.cs
index 697bc26..5b9d435 100644
--- a/WebAPI/Controllers/OtherInStockController.cs
+++ b/WebAPI/Controllers/OtherInStockController.cs
@@ -354,6 +354,8 @@
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
websLsmain.HKeeperID = lsmain[0].HKeeperID;
+ websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
+ websLsmain.HBillerID = lsmain[0].HBillerID;
websLsmain.HBillType = "1203";//鍥哄畾鍊�
websLsmain.HBillSubType = lsmain[0].HBillSubType;
diff --git a/WebAPI/Controllers/OtherOutBillController.cs b/WebAPI/Controllers/OtherOutBillController.cs
index d192e9c..22f4781 100644
--- a/WebAPI/Controllers/OtherOutBillController.cs
+++ b/WebAPI/Controllers/OtherOutBillController.cs
@@ -483,8 +483,11 @@
websLsmain.HSupID = lsmain[0].HSupID;
websLsmain.HDeptID = lsmain[0].HDeptID;
websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HKeeperID = lsmain[0].HKeeperID;
+ websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HBillerID = lsmain[0].HBillerID;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
websLsmain.HOWNERID = lsmain[0].HOWNERID;
websLsmain.HBillType = "1206";//鍥哄畾鍊�
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index d7b2890..d134bff 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -1249,12 +1249,30 @@
clsKf_ProductInBillMain.HDeptID = list[0].HDeptID;
clsKf_ProductInBillMain.HEmpID = list[0].HEmpID;
clsKf_ProductInBillMain.HKeeperID = list[0].HKeeperID;
+ clsKf_ProductInBillMain.HSecManagerID = list[0].HSecManagerID;
clsKf_ProductInBillMain.HRemark = list[0].HRemark;
clsKf_ProductInBillMain.HMaker = list[0].HMaker;
+ clsKf_ProductInBillMain.HBillerID = list[0].HBillerID;
clsKf_ProductInBillMain.HWHID = list[0].HWHID;
clsKf_ProductInBillMain.HSupID = list[0].HSupID;
clsKf_ProductInBillMain.HExplanation = list[0].HExplanation;
clsKf_ProductInBillMain.HBillType = "1202";
+ if (list[0].HBillType == "3714")
+ {
+ clsKf_ProductInBillMain.HMainSourceBillType = "宸ュ簭姹囨姤鍗�";
+ }
+ else if (list[0].HBillType == "3711")
+ {
+ clsKf_ProductInBillMain.HMainSourceBillType = "鐢熶骇姹囨姤鍗�";
+ }
+ else if (list[0].HBillType == "3710")
+ {
+ clsKf_ProductInBillMain.HMainSourceBillType = "鐢熶骇璁㈠崟";
+ }
+ else
+ {
+ clsKf_ProductInBillMain.HMainSourceBillType = "鎵嬪伐褰曞叆";
+ }
bool flag = this.webserver.set_SaveProductInBill_New(clsKf_ProductInBillMain, hbillType, ref ClsPub.sErrInfo);
if (flag)
{
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 3b1c9e8..4d2250e 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<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.20/WEBS-WMS/WebService1.asmx"/><!--棰滃彴寮忔満-->
+ <add key="sUrl" value="http://192.168.63.53/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://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -36,6 +36,7 @@
<!--<add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx"/> 鏈湴-->
<!--<add key="sUrl" value="http://192.168.56.1:81/web/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>--> <!--涔濊彵-->
+ <!--<add key="sUrl" value="http://192.168.60.12/WEBS-WMS/WebService1.asmx"/>--> <!--涓帶-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
@@ -104,7 +105,7 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.63.20/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
+ <endpoint address="http://192.168.63.53/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
name="WebService1Soap" />
</client>
@@ -113,7 +114,7 @@
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://192.168.63.20/WEBS-WMS/WebService1.asmx</value>
+ <value>http://192.168.63.53/WEBS-WMS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
--
Gitblit v1.9.1