From c4dd916353520f094abfc5d6be539d1ced8728f7 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 18 Mar 2025 17:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E6=96=B9=E7=99=BB=E5=BD=95=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=95=B0=E9=87=8F=E5=8F=96dm=5Fmachine=5Frec?=
 =?UTF-8?q?ord=E8=A1=A8=E4=B8=AD=E7=9A=84=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 9d3e91d..3ccf943 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_xx;userid=root;password=root" />
+	<add name="database" connectionString="server=127.0.0.1;port=3306;database=sanya_xianchang;userid=root;password=root" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
@@ -12,13 +12,13 @@
 	<appSettings>
 		
 		<!-- 设备id -->
-		<add key="machineId" value="DM1" />
+		<add key="machineId" value="DM2" />
 		<!-- 供应单位 -->
 		<add key="supplierDept" value="药库" />
 		<!-- 领用部门 -->
 		<add key="receiveDept" value="麻精药房" />
 		<!--2023/7/13 药房代码 有则写无则空 -->
-		<add key="storage" value="009904" />
+		<add key="storage" value="" />
 		<!-- 登录模式 1单人登录2双人登录 -->
 		<add key="loginMode" value="1" />
 		<!-- 登录顺序,指定先登录的人的名称有效值，只有在登录模式等于2时才会生效； 发药人：【operator】审核人：【reviewer】 -->
diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs
index dadaf52..25bb1fd 100644
--- a/DM_Weight/Report/GridReportUtil.cs
+++ b/DM_Weight/Report/GridReportUtil.cs
@@ -302,7 +302,7 @@ namespace DM_Weight.Report
             });
             Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//account_book_order.grf");
 
-            SQL = $@"SELECT DISTINCT oi.recv_date,oi.p_name,oi.sex,oi.age,oi.id_number,oi.patient_no,oi.disease,dm.manu_no,od.Quantity,oi.doctor_name,oi.order_no,dm.reviewer,dm.operator,ul.user_name operatorName,ul2.user_name reviewerName
+            SQL = $@"SELECT DISTINCT oi.recv_date,oi.p_name,oi.sex,oi.age,oi.id_number,oi.patient_no,oi.disease,dm.manu_no,dm.Quantity,oi.doctor_name,oi.order_no,dm.reviewer,dm.operator,ul.user_name operatorName,ul2.user_name reviewerName
 	                ,di.Drug_name,di.Drug_spec,di.big_unit,di.small_unit as smallUnit,di.drug_id,dm.receivePerson,di.manuFactory,patient_card,dm.ordinalNum as ordinalNum,CONCAT(DATE_FORMAT(operation_time,'%Y%m%d'),ordinalnum) as OrderOrdinal
 	                 from order_info oi inner join order_detail od on oi.order_no=od.Order_No  
 	                 LEFT JOIN dm_machine_record dm on oi.order_no=dm.invoice_id 
diff --git a/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
index 8e772bd..7ea7588 100644
--- a/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
+++ b/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
@@ -404,7 +404,7 @@ namespace DM_Weight.ViewModels
                                     SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(),
                                     ReceiveDept = OrderInfo.DeptName,
                                     ReceivePerson=ReceivePerson,
-                                    OrdinalNum = ordinalNum + 1
+                                    OrdinalNum = ordinalNum<=0?1:ordinalNum + 1,
                                 }).ExecuteCommand();
                             }
                             return true;