From 27ee4df946b7ffc9899ad64d91fd42a5dd6d2106 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 19 Nov 2024 11:48:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E6=9F=9C=E5=8A=A0=E8=8D=AF?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=9B=B4=E6=96=B0=E4=BA=A4=E6=8E=A5=E6=9F=9C?=
 =?UTF-8?q?=E8=A1=A5=E8=8D=AF=E6=95=B0=E6=8D=AE=E7=8A=B6=E6=80=81=E4=B8=BA?=
 =?UTF-8?q?=E5=B7=B2=E5=8F=96=E8=8D=AF=E6=9C=AA=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/AddToJiaoJieDialogViewModel.cs | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

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<ChannelStock> 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<ChannelStock> 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)