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

开抽屉状态禁止切换菜单；交接柜加药更新标签数量不对修改

This commit is contained in:
maqiao 2024-12-24 10:19:30 +08:00
parent f4b859520d
commit 00637067d3
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
View File

@ -565,7 +565,7 @@ namespace DM_Weight.ViewModels
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
// 更新屏显库存 // 更新屏显库存
List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 5); List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType == 5);
if (singleChannels.Count > 0) if (singleChannels.Count > 0)
{ {
singleChannels.ForEach(it => singleChannels.ForEach(it =>
@ -577,7 +577,7 @@ namespace DM_Weight.ViewModels
List<ChannelStock> singleChannelsBoxSmart = record.FindAll(it => it.BoardType == 35); List<ChannelStock> singleChannelsBoxSmart = record.FindAll(it => it.BoardType == 35);
if ((singleChannelsBoxSmart.Count > 0 ? singleChannelsBoxSmart[0].BoardType : 1) == 35) if ((singleChannelsBoxSmart.Count > 0 ? singleChannelsBoxSmart[0].BoardType : 1) == 35)
{ {
singleChannels.ForEach(it => singleChannelsBoxSmart.ForEach(it =>
{ {
_portUtil.WriteQuantityMethod((it.Quantity - it.TakeQuantity), it.DrawerNo, it.ColNo); _portUtil.WriteQuantityMethod((it.Quantity - it.TakeQuantity), it.DrawerNo, it.ColNo);
Thread.Sleep(150); Thread.Sleep(150);

3
DM_Weight/ViewModels/HomeWindowViewModel.cs
View File

@ -192,6 +192,7 @@ namespace DM_Weight.ViewModels
logger.Info($"未关闭抽屉切换菜单"); logger.Info($"未关闭抽屉切换菜单");
SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c")); SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
SnackbarMessageQueue.Enqueue("请关闭抽屉后再切换菜单"); SnackbarMessageQueue.Enqueue("请关闭抽屉后再切换菜单");
return;
} }
} }
} }
@ -224,7 +225,7 @@ namespace DM_Weight.ViewModels
else else
{ {
//SelectedMenu.Children = SelectedMenu.Children; //SelectedMenu.Children = SelectedMenu.Children;
SelectedChildMenu = SelectedMenu.Children[0]; //SelectedChildMenu = SelectedMenu.Children[0];
if (!_portUtil.Operate) if (!_portUtil.Operate)
{ {
_regionManager.RequestNavigate("ContentRegion", SelectedMenu.Children[0].PremissionPath); _regionManager.RequestNavigate("ContentRegion", SelectedMenu.Children[0].PremissionPath);

12
DM_Weight/ViewModels/InvoiceInWindowViewModel.cs
View File

@ -283,7 +283,17 @@ namespace DM_Weight.ViewModels
//} //}
if (flag) if (flag)
{ {
AddChannels = ChannelStocks.FindAll(it => it.AddQuantity != 0&&it.Location!="未绑定"); AddChannels = ChannelStocks.FindAll(it => it.AddQuantity != 0 && it.Location != "未绑定");
if (AddChannels == null|| AddChannels.Count<=0)
{
AlertMsg alertMsg = new AlertMsg
{
Message = "药品未绑定或未输入数量",
Type = MsgType.ERROR,
};
_eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
return;
}
AddChannels.Sort((a, b) => AddChannels.Sort((a, b) =>
{ {
if ((a.DrawerNo - b.DrawerNo) == 0) if ((a.DrawerNo - b.DrawerNo) == 0)