From a9f937508a6cfe0d5b752ce9630916d973ece6d3 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Wed, 14 May 2025 16:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E6=9F=9C=E8=A1=A5=E8=8D=AF?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=E6=9B=B4=E6=96=B0=E6=A0=87=E7=AD=BE=E6=95=B0?=
=?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
DM_Weight/App.config | 4 +--
.../ViewModels/AddToJiaoJieDialogViewModel.cs | 32 +++++++++++--------
2 files changed, 20 insertions(+), 16 deletions(-)
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 = "抽屉取药完成，库存已更新",