From a07091ea8376dccd1cc8b78c1995160900145754 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Fri, 20 Sep 2024 14:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=B8=AD=E5=8F=91=E8=8D=AF?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=B2=BE=E7=A1=AE=E5=88=B0=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
index beba1c6..e2e505e 100644
--- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
+++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
@@ -393,19 +393,19 @@ namespace DM_Weight.ViewModels
                             {
                                 ChannelStock jStock = Jiaojie_ChannelStocks[j];
                                 int totalBaseNum = SqlSugarHelper.Db.Queryable<DrugBase>().
-                                                    Where(db => db.DrugId == jStock.DrugId && db.MachineId == jStock.MachineId).Select(db => db.BaseQuantity).First();
+                                                    Where(db => db.DrugId == jStock.DrugId && db.MachineId == (ConfigurationManager.AppSettings["machineId"] ?? "DM3")).Select(db => db.BaseQuantity).First();
 
                                 string belognUser = SqlSugarHelper.Db.Queryable<ChannelList>().
                                                     Where(cl => cl.DrawerNo == jStock.DrawerNo && cl.MachineId == jStock.MachineId).Select(cl => cl.BelongUser).First();
 
                                 SqlSugarHelper.Db.Insertable(new RejectionReport()
                                 {
-                                    SendDate = System.DateTime.Now,
+                                    SendDate =DateTime.Parse(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm")),
                                     SendUser = HomeWindowViewModel.Operator?.Nickname,
                                     ReceiveUser = belognUser,//Jiaojie_ChannelStocks
                                     DrugId = jStock.DrugId,
                                     BaseNum = totalBaseNum + "支",//总基数
-                                    DrawerNo = jStock.DrawerNo,
+                                    DrawerNo = jStock.DrawerNo
                                 }).ExecuteCommand();
                             }
                             return true;