SAP获取库存接口修改

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

@@ -8423,7 +8423,20 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer
                                     where A.Quantity>0 AND 1=1 ";
                     if (!string.IsNullOrEmpty(JsonData.INVCode))
                     {
-                        sql += $@" AND A.InvCode='{JsonData.INVCode}'";
+                        string strInvCode = "";
+                        string[] InvCodeList= JsonData.INVCode.Split(',');
+                        foreach (string INVCode in InvCodeList)
+                        {
+                            if (strInvCode == "")
+                            {
+                                strInvCode += "'" + INVCode + "'";
+                            }
+                            else
+                            {
+                                strInvCode += ",'" + INVCode + "'";
+                            }
+                        }
+                        sql += $@" AND A.InvCode IN '{strInvCode}'";
                     }
                     if (!string.IsNullOrEmpty(JsonData.WHCode))
                     {
@@ -8519,7 +8532,20 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer
                                     and TransType=3 AND BusinessCode IN ('6','19','24','14','21') ";
                     if (!string.IsNullOrEmpty(JsonData.INVCode))
                     {
-                        sql += $@" AND A.InvCode='{JsonData.INVCode}'";
+                        string strInvCode = "";
+                        string[] InvCodeList = JsonData.INVCode.Split(',');
+                        foreach (string INVCode in InvCodeList)
+                        {
+                            if (strInvCode == "")
+                            {
+                                strInvCode += "'" + INVCode + "'";
+                            }
+                            else
+                            {
+                                strInvCode += ",'" + INVCode + "'";
+                            }
+                        }
+                        sql += $@" AND A.InvCode IN '{strInvCode}'";
                     }
                     if (!string.IsNullOrEmpty(JsonData.WHCode))
                     {

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs

@@ -1302,6 +1302,11 @@ namespace ICSSoft.DataProject
 	                        RAISERROR('" + string.Format(language.GetNameByCode("WMSAPIInfo060"), "{2}") + @"',16,1);
                             RETURN
                         END
+                        IF EXISTS(SELECT LotNo FROM ICSWareHouseLotInfoLog WHERE LotNo='{0}' AND WorkPoint='{1}' AND TransType=15)
+                        BEGIN
+                            RAISERROR('条码:{0}存在占料信息，请取消占料后再修改库存!',16,1);
+                            RETURN
+                        END
 
                         INSERT INTO ICSWareHouseLotInfoLog(ID,Identification,TransCode,TransSequence,LotNo,InvCode,
                         FromWarehouseCode,FromLocationCode,ToWarehouseCode,ToLocationCode,Quantity,

ICSSoft.WMS.WebAPI/ICSSoft.Entity/ICSSoft.Entity.csproj

@@ -57,7 +57,6 @@
     <Compile Include="BarCodeCheckModel.cs" />
     <Compile Include="ForkLiftCallBackModel.cs" />
     <Compile Include="ForkLiftResult.cs" />
-    <Compile Include="ForkLiftStartTaskModel.cs" />
     <Compile Include="AGVStartTaskModel.cs" />
     <Compile Include="BarCodeModel.cs" />
     <Compile Include="ControlMode.cs" />

WMS-BS/NFine.Web/Configs/system.config

@@ -33,5 +33,7 @@
   <add key="HGDocpostUrlStr" value="http://192.168.21.109:8382/api/jobs/CFG-IMP-ORDINI"/>
   <!--<add key="HGDocpostUrlStr" value="http://192.168.0.229:3001/api/jobs/CFG-IMP-ORDINI"/>-->
   <!--WMS货柜用API接口地址-->
-  <add key="WMSpostUrlStr" value="http://192.168.21.108:8085/api/LOTStockDownHG/Create"/>
+  <add key="WMSpostUrlStr" value="http://192.168.0.191:8085/api/LOTStockDownHG/Create"/>
+  <!--WMS拣料调用叉车API接口地址-->
+  <add key="ForkLiftOutUrl" value="http://192.168.1.240:9002/VnaService?wsdl"/>
 </appSettings>