diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
index 70bd42d..f32e77f 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
@@ -8436,7 +8436,7 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer
strInvCode += ",'" + INVCode + "'";
}
}
- sql += $@" AND A.InvCode IN '{strInvCode}'";
+ sql += $@" AND A.InvCode IN ({strInvCode})";
}
if (!string.IsNullOrEmpty(JsonData.WHCode))
{
@@ -8545,7 +8545,7 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer
strInvCode += ",'" + INVCode + "'";
}
}
- sql += $@" AND A.InvCode IN '{strInvCode}'";
+ sql += $@" AND A.InvCode IN ({strInvCode})";
}
if (!string.IsNullOrEmpty(JsonData.WHCode))
{
diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
index c4a3434..612eb02 100644
--- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
+++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
@@ -2162,20 +2162,6 @@ c.Sequence,
}
#endregion
}
- // sql += string.Format(@" update b set b.LockQuantity=convert(decimal(18,6),b.LockQuantity)-convert(decimal(18,6),c.Quantity )
- // from dbo.ICSWareHouseLotInfo b
- //inner join (select sum(Quantity) as Quantity, LotNo from ICSWareHouseLotInfolog where TransCode in ({0})and TransType='15' and WorkPoint='{1}' group by LotNo) c
- //on c.LotNo =b.LotNo ", objCode.TrimEnd(','), WorkPoint);
-
- //sql += string.Format(@" delete dbo.ICSWareHouseLotInfoLog where TransCode in({0}) and TransType='15' and WorkPoint='{1}'", objCode.TrimEnd(','), WorkPoint);
- pikTbLogsql = @"update b set b.LockQuantity=convert(decimal(18,6),b.LockQuantity)-convert(decimal(18,6),c.Quantity )
- from dbo.ICSWareHouseLotInfo b
- inner join (select sum(Quantity) as Quantity, LotNo from ICSWareHouseLotInfolog
- where TransCode in ({0})and TransType='15' and WorkPoint='{1}' group by LotNo) c
- on c.LotNo =b.LotNo
-
- delete dbo.ICSWareHouseLotInfoLog where TransCode in({0}) and TransType='15' and WorkPoint='{1}'";
- pikTbLogsql = string.Format(pikTbLogsql, ID, WorkPoint);
foreach (DataRow PickLog in table.Rows)
{
pikTbLogsql += @" IF NOT EXISTS(SELECT TransCode FROM ICSWareHouseLotInfoLog WHERE TransCode='{1}' AND TransSequence='{2}' AND LotNo='{9}' AND WorkPoint='{8}' AND TransType='15')
@@ -2200,52 +2186,6 @@ c.Sequence,
, BusinessCode, MUSER, MUSERNAME, pikTbLogTime, WorkPoint, PickLog["LotNO"].ToString());
}
SqlHelper.CmdExecuteNonQueryLi(pikTbLogsql);
- #region 重复性检查，如出现一个条码存在同一单据同一行重复占料的情况，删除重复行(插入时有验证，暂时注释)
- //foreach (string DocCode in ID.Split(','))
- //{
- // string chklotno = "";
- // string chktranscode = "";
- // string chktranssequence = "";
- // string rechksql = @"select TransCode,TransSequence,LotNo,Quantity from ICSWareHouseLotInfoLog
- // where TransType='15' and TransCode={0}
- // and WorkPoint='{1}'
- // ORDER BY TransCode,TransSequence,LotNo";
- // rechksql = string.Format(rechksql, DocCode, WorkPoint);
- // var rechkds = Repository().FindDataSetBySql(rechksql);
- // DataTable rechkdt = rechkds.Tables[0];
- // foreach (DataRow dr in rechkdt.Rows)
- // {
- // if (chklotno == "")
- // {
- // chklotno = dr["LotNo"].ToString();
- // chktranscode = dr["TransCode"].ToString();
- // chktranssequence = dr["TransSequence"].ToString();
- // }
- // else
- // {
- // if (chklotno == dr["LotNo"].ToString() && chktranscode == dr["TransCode"].ToString()
- // && chktranssequence == dr["TransSequence"].ToString())
- // {
- // string delsql = @"update ICSWareHouseLotInfo set LockQuantity-={5}
- // where LotNo='{0}' and WorkPoint='{3}'
-
- // delete from ICSWareHouseLotInfoLog
- // where LotNo='{0}' and TransCode='{1}' and TransSequence='{2}'
- // and WorkPoint='{3}' and Identification!='{4}'";
- // delsql = string.Format(delsql, chklotno, chktranscode, chktranssequence, WorkPoint, Identification, dr["Quantity"].ToString());
- // SqlHelper.CmdExecuteNonQueryLi(delsql);
- // }
- // else
- // {
- // chklotno = dr["LotNo"].ToString();
- // chktranscode = dr["TransCode"].ToString();
- // chktranssequence = dr["TransSequence"].ToString();
- // }
-
- // }
- // }
- //}
- #endregion
#endregion
}
diff --git a/WMS-BS/NFine.Web/Configs/database.config b/WMS-BS/NFine.Web/Configs/database.config
index 85bc1dc..623fc11 100644
--- a/WMS-BS/NFine.Web/Configs/database.config
+++ b/WMS-BS/NFine.Web/Configs/database.config
@@ -5,10 +5,10 @@
-
+
-
+