diff --git a/DM_Weight/App.config b/DM_Weight/App.config index 371c0d3..756f704 100644 --- a/DM_Weight/App.config +++ b/DM_Weight/App.config @@ -3,7 +3,7 @@ - + - + diff --git a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs index 2b06a20..74934f4 100644 --- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs +++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs @@ -470,6 +470,7 @@ namespace DM_Weight.ViewModels //newStock.NeedNum = 0; //newStock.Quantity = jiaoStock.Quantity + csStock.TakeQuantity; UpdateJJStock.Add(newStock); + csStockList[j].CheckQuantity = csStockList[j].TakeQuantity; csStockList[j].TakeQuantity = 0; Jiaojie_ChannelStocks[i].NeedNum = Jiaojie_ChannelStocks[i].NeedNum - csStock.TakeQuantity; } @@ -495,6 +496,7 @@ namespace DM_Weight.ViewModels //newStock.NeedNum = 0; //newStock.Quantity = jiaoStock.Quantity + csStock.TakeQuantity; UpdateJJStock.Add(newStock); + csStockList[j].CheckQuantity = csStockList[j].TakeQuantity; csStockList[j].TakeQuantity = csStock.TakeQuantity - Jiaojie_ChannelStocks[i].NeedNum; Jiaojie_ChannelStocks[i].NeedNum = 0; break; @@ -519,6 +521,7 @@ namespace DM_Weight.ViewModels newStock.NeedNum = 0; AddJJStock.Add(newStock); Jiaojie_ChannelStocks[i].NeedNum = Jiaojie_ChannelStocks[i].NeedNum - csStock.TakeQuantity; + csStockList[j].CheckQuantity = csStockList[j].TakeQuantity; csStockList[j].TakeQuantity = 0; } else @@ -537,6 +540,7 @@ namespace DM_Weight.ViewModels newStock.MachineId = Jiaojie_ChannelStocks[i].MachineId; newStock.DrawerType = 1; AddJJStock.Add(newStock); + csStockList[j].CheckQuantity = csStockList[j].TakeQuantity; csStockList[j].TakeQuantity = csStock.TakeQuantity - newStock.AddToJJNum; break; } @@ -621,28 +625,28 @@ namespace DM_Weight.ViewModels }); if (f.Data) { - Task.Factory.StartNew(() => - { + //Task.Factory.StartNew(() => + //{ // 更新屏显库存 - List singleChannels = record.FindAll(it => it.BoardType == 5); - if (singleChannels.Count > 0) - { - singleChannels.ForEach(it => - { - _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity); - Thread.Sleep(150); - }); - } + //List singleChannels = record.FindAll(it => it.BoardType == 5); + //if (singleChannels.Count > 0) + //{ + // singleChannels.ForEach(it => + // { + // _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity); + // Thread.Sleep(150); + // }); + //} List singleChannelsBoxSmart = record.FindAll(it => it.BoardType == 35); if ((singleChannelsBoxSmart.Count > 0 ? singleChannelsBoxSmart[0].BoardType : 1) == 35) { singleChannelsBoxSmart.ForEach(async it => { - await _portUtil.WriteQuantityMethod((it.Quantity - it.TakeQuantity), it.DrawerNo, it.ColNo); - Thread.Sleep(200); + await _portUtil.WriteQuantityMethod((it.Quantity - it.CheckQuantity), it.DrawerNo, it.ColNo); + await Task.Delay(20); }); } - }); + //}); AlertMsg alertMsg = new AlertMsg { Message = "抽屉取药完成,库存已更新",