no message

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

@@ -1099,7 +1099,7 @@ namespace ICSSoft.DataProject
             {
                 #region 根据单据获得占料信息
                 string docsql = @"select TransSequence,LotNo,Quantity,InvCode from ICSWareHouseLotInfoLog
-                                  where TransCode='{0}' and TransType='15' and WorkPoint='{2}'";
+                                  where TransCode='{0}' and TransType='15' and WorkPoint='{1}'";
                 docsql = string.Format(docsql, TransCode, WorkPoint);
                 DataTable docdt = DBHelper.SQlReturnData(docsql, cmd);
                 #endregion
@@ -1107,7 +1107,7 @@ namespace ICSSoft.DataProject
                 {
                     string INVCode = dr["InvCode"].ToString();
                     decimal lotQuantity = Convert.ToDecimal(dr["Quantity"]);
-                    string DocLineNO = dr["Sequence"].ToString();
+                    string DocLineNO = dr["TransSequence"].ToString();
                     string LotNO = dr["LotNo"].ToString();
                     ///更新库存
                     string sql = @"UPDATE ICSWareHouseLotInfo SET Quantity=ISNULL(Quantity,0)-'{2}' WHERE LotNo='{0}' AND WorkPoint='{1}'";

WMS-BS/NFine.Application/WMS/PickMaterialApp.cs

@@ -1911,6 +1911,8 @@ c.Sequence,
                     table.Rows.RemoveAt(item);
                 }
             }
+            try
+            {
                 #region 拣料时增加条码出入库记录,修改库存锁定数量,以作占料处理
                 string BusinessCode = string.Empty;
                 string TransType = "";
@@ -2009,7 +2011,9 @@ c.Sequence,
                 #endregion
                 foreach (DataRow PickLog in table.Rows)
                 {
-                pikTbLogsql += @"INSERT INTO ICSWareHouseLotInfoLog(ID,Identification,TransCode,TransSequence,LotNo,InvCode,
+                    pikTbLogsql += @" IF NOT EXISTS(SELECT TransCode FROM ICSWareHouseLotInfoLog WHERE TransCode='{1}' AND TransSequence='{2}' AND LotNo='{9}' AND WorkPoint='{8}' AND TransType='15')
+                            BEGIN
+	                            INSERT INTO ICSWareHouseLotInfoLog(ID,Identification,TransCode,TransSequence,LotNo,InvCode,
 							    FromWarehouseCode,FromLocationCode,ToWarehouseCode,ToLocationCode,Quantity,
 							    Memo,Lock,TransType,BusinessCode,ERPUpload,ERPID,
 							    ERPDetailID,ERPCode,ERPSequence,MUSER,MUSERName,
@@ -2020,9 +2024,12 @@ c.Sequence,
 							    '','','','{5}' ,'{6}' ,
 							    '{7}' ,'{8}' ,''
 							    FROM ICSWareHouseLotInfo a
-                        WHERE a.LotNo='{9}' AND a.WorkPoint='{8}' ";
-                pikTbLogsql += @"update ICSWareHouseLotInfo set LockQuantity=LockQuantity+'{3}' where LotNo='{9}' ";
-                pikTbLogsql = string.Format(pikTbLogsql, Identification, PickLog["Code"].ToString(), PickLog["Sequence"].ToString(), PickLog["SendQTY"].ToString(), BusinessCode, MUSER, MUSERNAME, pikTbLogTime, WorkPoint, PickLog["LotNO"].ToString());
+							    WHERE a.LotNo='{9}' AND a.WorkPoint='{8}'
+                        
+							    update ICSWareHouseLotInfo set LockQuantity=LockQuantity+'{3}' where LotNo='{9}' AND WorkPoint='{8}'
+						    END ";
+                    pikTbLogsql = string.Format(pikTbLogsql, Identification, PickLog["Code"].ToString(), PickLog["Sequence"].ToString(), PickLog["SendQTY"].ToString()
+                        , BusinessCode, MUSER, MUSERNAME, pikTbLogTime, WorkPoint, PickLog["LotNO"].ToString());
                 }
                 SqlHelper.CmdExecuteNonQueryLi(pikTbLogsql);
 
@@ -2057,6 +2064,11 @@ c.Sequence,
                 }
                 return result;
             }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message);
+            }
+        }
 
         /// <summary>
         /// 工单领料推荐

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

@@ -5,9 +5,9 @@
 	<!--108-->
 	<!--<add name="connstr" connectionString="JZjXxiMt8L2hkBlLUD8PBo2VxWR5j1mbj0xyJuwPqY46ywhO56rsfUcuYrySELpMcIISP9ZsoeoRM35Azqruwa16sHbPpvUnLjcXO9dQBsCb0fkixsVZhA==" providerName="System.Data.SqlClient" />-->
 	<!--本地-->
-	<add name="connstr" connectionString="terx6nSzhBu3PkkAnpCSyozL3WzAB9fHjBxO0NVXmpe6eOA9kowv/TJOuTy7IT8nOsne+r4F4sCVTYdtU25qsA==" providerName="System.Data.SqlClient" />
+	<!--<add name="connstr" connectionString="terx6nSzhBu3PkkAnpCSyozL3WzAB9fHjBxO0NVXmpe6eOA9kowv/TJOuTy7IT8nOsne+r4F4sCVTYdtU25qsA==" providerName="System.Data.SqlClient" />-->
   <!--正式-->
-  <!--<add name="connstr" connectionString="rtGBmI26IovLyEon0NvnkIdIGtERsck4MvG2wvfMHc6XnoqSx8xp4zCTtW6J8SL4+zTBRPXBbFQ4AEnn281E5TY7A1IZOMIr" providerName="System.Data.SqlClient" />-->
+  <add name="connstr" connectionString="rtGBmI26IovLyEon0NvnkIdIGtERsck4MvG2wvfMHc6XnoqSx8xp4zCTtW6J8SL4+zTBRPXBbFQ4AEnn281E5TY7A1IZOMIr" providerName="System.Data.SqlClient" />
   <add name="ERPconnstr" connectionString="Server=192.168.1.218;Initial Catalog=ICS_WMS_NW;User ID=sa;Password=aA123456" providerName="System.Data.SqlClient" />
   <add name="ATVERPconnstr" connectionString="Server=10.29.2.71;Initial Catalog=ATW-0717;User ID=sa;Password=atw.erp" providerName="System.Data.SqlClient" />
   <add name="MailOpen" connectionString="true" />