From b337e470a646b7ab900953aa5ef9eb8e135fff0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=B7=A7?= <625215135@qq.com>
Date: Thu, 10 Jul 2025 10:50:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=A4=84=E6=96=B9=E5=8F=96=E8=8D=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E5=AD=98=E5=8F=96=E8=8D=AF=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                                  | 8 ++++----
 DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index c83a765..b64e7ac 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -3,7 +3,7 @@
   <connectionStrings>
 	<!-- 数据库连接字符串 -->
 	<!--<add name="database" connectionString="server=127.0.0.1;database=wpf_dm_program;userid=root;password=qq1223" />-->
-	<add name="database" connectionString="server=127.0.0.1;port=3306;database=sanya_xianchang2;userid=root;password=root" />
+	<add name="database" connectionString="server=192.168.50.84;port=3306;database=sanya_xianchang2;userid=root;password=root" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
@@ -28,7 +28,7 @@
 		<!-- 自动退出时间，单位秒，为0时不自动退出 -->
 		<add key="autoExit" value="0"/>
 		<!--报表数据库连接-->
-		<add key="gridConnectionString" value="MYSQL; Database=sanya_xianchang2; Password=root; Port=3306; Server=127.0.0.1; User=root;"/>
+		<add key="gridConnectionString" value="MYSQL; Database=sanya_xianchang2; Password=root; Port=3306; Server=192.168.50.84; User=root;"/>
 		<!-- 查询处方是orderNo还是orderGroupNo -->
 		<add key="OrderNoName" value="orderNo" />
 		<!-- 后门耗材板地址 没有则填写0-->
@@ -40,9 +40,9 @@
 		<!-- 抽屉串口使用的协议232或者485 -->
 		<add key="DrawerProtocol" value="485" />
 		<!-- 抽屉串口的串口号 -->
-		<add key="DrawerPortPath" value="COM1" />
+		<add key="DrawerPortPath" value="COM2" />
 		<!-- can总线串口的串口号 -->
-		<add key="CanBusPortPath" value="COM31" />
+		<add key="CanBusPortPath" value="COM5" />
 		<!-- 条码枪串口的串口号 -->
 		<add key="ScanCodePortPath" value="COM11" />
 		<!-- 抽屉串口的串口号 --><!--
diff --git a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
index cb0d367..99d0950 100644
--- a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
+++ b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
@@ -491,7 +491,8 @@ namespace DM_Weight.ViewModels
                             ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity),
                             SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(),
                             ReceiveDept = OrderInfo[j].DeptName,
-                            GetId = orderDetail.OrderId
+                            GetId = orderDetail.OrderId,
+                            ReceivePerson= ReceivePerson
                         }).ExecuteCommand();
 
                         logger.Info("Insertable MachineRecord");