diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
index 9b73922..70bd42d 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
+++ b/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))
{
diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
index 5c7d189..e968c86 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
+++ b/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,
diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.Entity/ICSSoft.Entity.csproj b/ICSSoft.WMS.WebAPI/ICSSoft.Entity/ICSSoft.Entity.csproj
index 9708e69..53e2711 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.Entity/ICSSoft.Entity.csproj
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.Entity/ICSSoft.Entity.csproj
@@ -57,7 +57,6 @@
-
diff --git a/WMS-BS/NFine.Web/Configs/system.config b/WMS-BS/NFine.Web/Configs/system.config
index a74becd..89dfd46 100644
--- a/WMS-BS/NFine.Web/Configs/system.config
+++ b/WMS-BS/NFine.Web/Configs/system.config
@@ -33,5 +33,7 @@
-
+
+
+
\ No newline at end of file