From 6cf9e18963e88e03dd2f4bf41f5e73131cae81cd Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Mon, 12 Aug 2024 17:48:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E5=A4=84=E6=96=B9=E6=97=B6?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=B4=A6=E5=86=8C=E4=BF=A1=E6=81=AF=E4=B8=BA?=
 =?UTF-8?q?DM3=E7=9A=84=E8=B4=A6=E5=86=8C=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/CheckOrderNewWindowViewModel.cs     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
index 0775921..5d7545f 100644
--- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
@@ -249,7 +249,7 @@ namespace DM_Weight.ViewModels
                             });
                         }
 
-                        Expression<Func<ChannelStock, bool>> updateExp = it => it.ManuNo == oi._OrderDetail.SetManuNo && it.EffDate == oi._OrderDetail.SetEffDate;
+                        //Expression<Func<ChannelStock, bool>> updateExp = it => it.ManuNo == oi._OrderDetail.SetManuNo && it.EffDate == oi._OrderDetail.SetEffDate;
 
                         ChannelStock cs = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrugId == oi._OrderDetail.DrugId && cs.ManuNo == oi._OrderDetail.SetManuNo && cs.EffDate == oi._OrderDetail.SetEffDate && cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5")&&cs.DrawerNo==DrawerNo).First();
                         if (cs == null)
@@ -266,7 +266,7 @@ namespace DM_Weight.ViewModels
 
                             SqlSugarHelper.Db.Insertable(new MachineRecord()
                             {
-                                MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
+                                MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(),
                                 DrawerNo = cs.DrawerNo,
                                 ColNo = cs.ColNo,
                                 DrugId = cs.DrugId,
@@ -293,7 +293,7 @@ namespace DM_Weight.ViewModels
                             OutQuantity = oi._OrderDetail.Quantity,
                             UserId1 = HomeWindowViewModel.Operator?.Id,
                             UserId2 = HomeWindowViewModel.Reviewer?.Id,
-                            MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
+                            MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(),
                             CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
                             CreateTime = DateTime.Now,
                             InvoiceNo = oi.OrderNo
@@ -301,7 +301,7 @@ namespace DM_Weight.ViewModels
                         }).ExecuteCommand();
                         //修改凌晨生成的日结存与总结存数据
                         AccountBookG2 accountBookG2Day = SqlSugarHelper.Db.Queryable<AccountBookG2>()
-                        .Where(ab => ab.MachineId.Equals(ConfigurationManager.AppSettings["machineId"].ToString()))
+                        .Where(ab => ab.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"].ToString()))
                         .Where(ab => ab.Type == 3)
                         .Where(ab => ab.DrugId == oi._OrderDetail.DrugId)
                         .Where(ab => ab.ManuNo == cs.ManuNo)
@@ -325,7 +325,7 @@ namespace DM_Weight.ViewModels
                                 TotalStock = oi._OrderDetail.Quantity,
                                 UserId1 = HomeWindowViewModel.Operator?.Id,
                                 UserId2 = HomeWindowViewModel.Reviewer?.Id,
-                                MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
+                                MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(),
                                 CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
                                 InvoiceNo = "日结存"
                             }).ExecuteCommand();
@@ -336,7 +336,7 @@ namespace DM_Weight.ViewModels
                         }
                         //修改凌晨生成的日结存与总结存数据
                         AccountBookG2 accountBookG2Total = SqlSugarHelper.Db.Queryable<AccountBookG2>()
-                        .Where(ab => ab.MachineId.Equals(ConfigurationManager.AppSettings["machineId"].ToString()))
+                        .Where(ab => ab.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"].ToString()))
                         .Where(ab => ab.Type == 4)
                         .Where(ab => ab.DrugId == oi._OrderDetail.DrugId)
                         .Where(ab => ab.CreateDate == DateTime.Now.ToString("yyyy-MM-dd")).First();
@@ -357,7 +357,7 @@ namespace DM_Weight.ViewModels
                                 TotalStock = oi._OrderDetail.Quantity,
                                 UserId1 = HomeWindowViewModel.Operator?.Id,
                                 UserId2 = HomeWindowViewModel.Reviewer?.Id,
-                                MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
+                                MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(),
                                 CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
                                 InvoiceNo = "总结存"
                             }).ExecuteCommand();