diff --git a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs index a5d3427..2a7e9a0 100644 --- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs +++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs @@ -376,23 +376,6 @@ namespace DM_Weight.ViewModels // } //} - //更新交接柜状态为 已取药未入库(等在交接柜入库后再更新交接柜库存) - List jiaojie= Jiaojie_ChannelStocks.GroupBy(cs=>cs.DrawerNo).Select(cs=>cs.FirstOrDefault()).ToList(); - if(jiaojie!=null&&jiaojie.Count>0) - { - for (int j = 0; j < jiaojie.Count; j++) - { - ChannelStock jiaojie_it = jiaojie[j]; - //更新交接柜状态为 已取药未入库 - SqlSugarHelper.Db.Updateable(new ChannelList() - { - State = 1, - Id = jiaojie_it.ChannelLst.Id - }).UpdateColumns(it => it.State).ExecuteCommand(); - } - } - - // 保存数据 出库记录 SqlSugarHelper.Db.Insertable(new MachineRecord() { @@ -437,6 +420,23 @@ namespace DM_Weight.ViewModels }).ExecuteCommand(); } } + + //更新交接柜状态为 已取药未入库(等在交接柜入库后再更新交接柜库存) + List jiaojie = Jiaojie_ChannelStocks.GroupBy(cs => cs.DrawerNo).Select(cs => cs.FirstOrDefault()).ToList(); + if (jiaojie != null && jiaojie.Count > 0) + { + for (int j = 0; j < jiaojie.Count; j++) + { + ChannelStock jiaojie_it = jiaojie[j]; + //更新交接柜状态为 已取药未入库 + SqlSugarHelper.Db.Updateable(new ChannelList() + { + State = 1, + Id = jiaojie_it.ChannelLst.Id + }).UpdateColumns(it => it.State).ExecuteCommand(); + } + } + return true; }); if (f.Data)