1

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

@@ -3461,9 +3461,10 @@ namespace ICSSoft.DataProject
 							END
                             
                             UPDATE ICSWareHouseLotInfo SET Quantity=ISNULL(Quantity,0)+'{2}' WHERE LotNo='{0}' AND WorkPoint='{1}'
-                            UPDATE ICSInventoryLot SET Amount=(ISNULL(Amount,0)+(select Amount from
-                            ICSInventoryLot where LotNo='{3}' AND WorkPoint='{1}')) WHERE LotNo='{0}' AND WorkPoint='{1}'
                             ";
+
+                //UPDATE ICSInventoryLot SET Amount=(ISNULL(Amount,0)+(select Amount from
+                //ICSInventoryLot where LotNo='{3}' AND WorkPoint='{1}')) WHERE LotNo='{0}' AND WorkPoint='{1}'
                 sql = string.Format(sql, LotNo, WorkPoint, Quantity, CurrentLotNo);
 
                 if (!DBHelper.ExecuteNonQuery(sql, cmd))
@@ -3473,14 +3474,15 @@ namespace ICSSoft.DataProject
                 
                 ///更新原条码库存
                 sql = @"UPDATE ICSWareHouseLotInfo SET Quantity=ISNULL(Quantity,0)-'{2}' WHERE LotNo='{0}' AND WorkPoint='{1}'
-                        UPDATE ICSInventoryLot SET Amount=(ISNULL(Amount,0)-(select Amount from
-                        ICSInventoryLot where LotNo='{0}' AND WorkPoint='{1}')) WHERE LotNo='{0}' AND WorkPoint='{1}'
+                        
 
                         IF EXISTS(SELECT a.LotNo FROM ICSWareHouseLotInfo a WHERE a.LotNo='{0}' AND a.WorkPoint='{1}' AND Quantity<0)
                         BEGIN
 	                        RAISERROR('" + language.GetNameByCode("WMSAPIInfo167") + @"',16,1);
                             RETURN
                         END";
+                //UPDATE ICSInventoryLot SET Amount=(ISNULL(Amount,0)-(select Amount from
+                //ICSInventoryLot where LotNo='{0}' AND WorkPoint='{1}')) WHERE LotNo='{0}' AND WorkPoint='{1}'
                 sql = string.Format(sql, CurrentLotNo, WorkPoint, Quantity);
 
                 if (!DBHelper.ExecuteNonQuery(sql, cmd))

ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/WMSBarCoreController.cs

@@ -23,6 +23,7 @@ namespace ICSSoft.WebAPI.Controllers
         HttpResponseMessage result = new HttpResponseMessage();
         Result res = new Result();
         string str = string.Empty;
+        private static object key = new object();
         /// <summary>
         /// 多语言
         /// </summary>
@@ -678,7 +679,8 @@ namespace ICSSoft.WebAPI.Controllers
             {
                 if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]")
                 {
-
+                    lock (key)
+                    {
                         List<LOTStockUpCreateIModel> model = new List<LOTStockUpCreateIModel>();
                         model = JsonConvert.DeserializeObject<List<LOTStockUpCreateIModel>>(JsonData.ToString());
                         //WMSBarCoreService action = new WMSBarCoreService();
@@ -691,6 +693,8 @@ namespace ICSSoft.WebAPI.Controllers
                             res.Data = resultStr;
                         }
                     }
+                    
+                }
             }
             catch (Exception ex)
             {
@@ -721,7 +725,8 @@ namespace ICSSoft.WebAPI.Controllers
             {
                 if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]")
                 {
-
+                    lock (key)
+                    {
                         List<LOTStockUpCreateIModel> model = new List<LOTStockUpCreateIModel>();
                         model = JsonConvert.DeserializeObject<List<LOTStockUpCreateIModel>>(JsonData.ToString());
                         //WMSBarCoreService action = new WMSBarCoreService();
@@ -734,6 +739,9 @@ namespace ICSSoft.WebAPI.Controllers
                             res.Data = resultStr;
                         }
                     }
+
+                    
+                }
             }
             catch (Exception ex)
             {
@@ -888,6 +896,8 @@ namespace ICSSoft.WebAPI.Controllers
             try
             {
                 if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]")
+                {
+                    lock (key)
                     {
                         List<LOTStockModel> model = new List<LOTStockModel>();
                         model = JsonConvert.DeserializeObject<List<LOTStockModel>>(JsonData.ToString());
@@ -909,6 +919,9 @@ namespace ICSSoft.WebAPI.Controllers
                             res.Data = resultStr;
                         }
                     }
+
+                    
+                }
             }
             catch (Exception ex)
             {
@@ -938,6 +951,8 @@ namespace ICSSoft.WebAPI.Controllers
             try
             {
                 if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]")
+                {
+                    lock (key)
                     {
                         List<LOTStockModel> model = new List<LOTStockModel>();
                         model = JsonConvert.DeserializeObject<List<LOTStockModel>>(JsonData.ToString());
@@ -959,6 +974,9 @@ namespace ICSSoft.WebAPI.Controllers
                             res.Data = resultStr;
                         }
                     }
+
+                    
+                }
             }
             catch (Exception ex)
             {