maqiao
/
XiangTan_DM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

交接柜补药完成更新标签数量修改

This commit is contained in:
maqiao 2025-05-14 16:05:34 +08:00
parent 1436ad66b4
commit a9f937508a
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DM_Weight/App.config
View File

@ -3,7 +3,7 @@
<connectionStrings>
<!-- 数据库连接字符串 -->
<!--<add name="database" connectionString="server=127.0.0.1;database=wpf_dm_program;userid=root;password=qq1223" />-->
<add name="database" connectionString="server=127.0.0.1;port=3306;database=xiangtan_mazuike_xx;userid=root;password=root" />
<add name="database" connectionString="server=192.168.50.252;port=3306;database=xiangtan_mazuike_xx;userid=root;password=qq1223" />
</connectionStrings>
<!--<runtime>
--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
@ -56,7 +56,7 @@
<!-- 抽屉串口的串口号 -->
<add key="DrawerPortPath" value="COM1" />
<!-- can总线串口的串口号 -->
<add key="CanBusPortPath" value="COM3" />
<add key="CanBusPortPath" value="COM31" />
<!-- 条码枪串口的串口号 -->
<add key="ScanCodePortPath" value="COM7" />

32
DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
View File

@ -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<ChannelStock> 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<ChannelStock> 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<ChannelStock> 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 = "抽屉取药完成，库存已更新",