From 381381d65e72f8a09bad904c7c079c304f55818a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=B7=A7?= <625215135@qq.com>
Date: Thu, 24 Jul 2025 10:36:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                      |  2 +-
 DM_Weight/Report/GridReportUtil.cs        |  5 +++--
 DM_Weight/ReportTemp/account_book_new.grf | 24 +++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 1c0b203..abc5764 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=192.168.50.84;port=3306;database=xiangtanTest;userid=root;password=root" />
+	<add name="database" connectionString="server=127.0.0.1;port=3306;database=xtTest;userid=root;password=qq1223" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs
index 64bb274..785f179 100644
--- a/DM_Weight/Report/GridReportUtil.cs
+++ b/DM_Weight/Report/GridReportUtil.cs
@@ -383,8 +383,9 @@ namespace DM_Weight.Report
                               ,re.operator_name, ab.manu_stock AS Stock,ab.total_stock AS empty,ab.total_stock,UL.User_name  AS SendUser,
 							  IF(ab.type=1,UL.User_name,UL2.User_name) AS InCheckUser,
                                 re.supervisor_name AS CheckUser,ab.manu_stock,ab.total_stock,ab.user_id1,ab.user_id2,ab.out_Quantity 
-                              ,DB.BASEQUANTITY AS BaseQuantity,oi.Patient_id AS ZYH,oi.dept_name AS KS,re.anaesthetist_name AS YS,
-                              IF(ab.`type`=1,'',UL.User_name) AS emptyUser
+                              ,DB.BASEQUANTITY AS BaseQuantity,re.card_no AS ZYH,oi.dept_name AS KS,re.anaesthetist_name AS YS,
+                              IF(ab.`type`=1,'',UL.User_name) AS emptyUser,
+                              (SELECT sum(quantity) from channel_stock cs where cs.drug_id=ab.drug_id and cs.manu_no=ab.manu_no and cs.machine_id in('DM3','DM5'))  AS CurrentStock
 		                      from account_book_g2 ab inner join drug_info di on ab.drug_id=di.Drug_ID 
                               LEFT JOIN DRUG_BASE DB ON di.DRUG_ID=DB.DRUGID AND DB.MACHINE_ID='DM3'
                               LEFT JOIN order_info_sm oi on ab.invoice_no=oi.order_no
diff --git a/DM_Weight/ReportTemp/account_book_new.grf b/DM_Weight/ReportTemp/account_book_new.grf
index b9847a5..2723e51 100644
--- a/DM_Weight/ReportTemp/account_book_new.grf
+++ b/DM_Weight/ReportTemp/account_book_new.grf
@@ -121,6 +121,10 @@
 				{
 					"Name":"空瓶回收人",
 					"DBFieldName":"emptyUser"
+				},
+				{
+					"Name":"批次库存",
+					"DBFieldName":"CurrentStock"
 				}
 			]
 		},
@@ -208,6 +212,10 @@
 			{
 				"Name":"Column2",
 				"Width":1.79917
+			},
+			{
+				"Name":"Column8",
+				"Width":1.79917
 			}
 		],
 		"ColumnContent":{
@@ -302,6 +310,10 @@
 				{
 					"Column":"Column2",
 					"DataField":"领药复核人"
+				},
+				{
+					"Column":"Column8",
+					"DataField":"批次库存"
 				}
 			]
 		},
@@ -616,6 +628,18 @@
 					},
 					"TextAlign":"MiddleCenter",
 					"Text":"领药人"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column8",
+					"Font":{
+						"Name":"宋体",
+						"Size":120000,
+						"Bold":true,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"批次\r\n库存"
 				}
 			]
 		}