MES-WEB-API.git

parent: c5ee2456 | 补丁 | 提交 | ignore whitespace

生产入库、委外入库、其他入库、生产领料、委外领料、其他出库、直接调拨扫码上传方法增加递入保管人、验收人、金蝶WISE制单人等

yxj

2023-12-27 3ad2a9ea53d9b647ec10c9ece51f40d7f078653a

生产入库、委外入库、其他入库、生产领料、委外领料、其他出库、直接调拨扫码上传方法增加递入保管人、验收人、金蝶WISE制单人等

8个文件已修改

	WebAPI/Controllers/EntrustOutController.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/Kf_EntrustInBillController.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/MateOutController.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/MoveStockBillController.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/OtherInStockController.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/OtherOutBillController.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/ProductInController.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web.config	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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;

 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 = "";

 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";//固定值

 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;

 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;


 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";//固定值

 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)
                {

 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>

			@@ -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;

			@@ -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 = "";

			@@ -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";//固定值

			@@ -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;

			@@ -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;

			@@ -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";//固定值

			@@ -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)
			{

			@@ -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>