From 242735335ef1fbc7de8ba0c5298ff90b03c7bc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=B7=A7?= <625215135@qq.com>
Date: Fri, 29 Aug 2025 13:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=AF=E5=AE=A4=E6=9F=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8E=BB=E6=8E=89=E6=95=88=E6=9C=9F=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CreateAccountBookConsole/App.config | 2 +-
 CreateAccountBookConsole/Program.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CreateAccountBookConsole/App.config b/CreateAccountBookConsole/App.config
index 3fbea7f..7b400cd 100644
--- a/CreateAccountBookConsole/App.config
+++ b/CreateAccountBookConsole/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
 	<connectionStrings>
-		<add name="dbConnect" connectionString="server=127.0.0.1;user id=root;password=root;database=xiangtan_mazuike_xx;Convert Zero Datetime=True;Allow Zero Datetime=True;Charset=utf8" />
+		<add name="dbConnect" connectionString="server=127.0.0.1;user id=root;password=qq1223;database=xtTest;Convert Zero Datetime=True;Allow Zero Datetime=True;Charset=utf8" />
 	</connectionStrings>
 	<appSettings>
 		<!-- 设备id -->
diff --git a/CreateAccountBookConsole/Program.cs b/CreateAccountBookConsole/Program.cs
index 49d798a..a36290c 100644
--- a/CreateAccountBookConsole/Program.cs
+++ b/CreateAccountBookConsole/Program.cs
@@ -114,7 +114,7 @@ public class CreateClass
                         //1)查询库存，为每一个批次的药品生成日结存数据
                         string sql = $@"SELECT machine_id,drug_id,manu_no,eff_date,IF(sum(quantity) IS null,0,sum(quantity)) manuQuantity,(SELECT IF(sum(quantity)is NULL,0,sum(quantity)) from channel_stock tCS WHERE  MACHINE_ID in('DM3','DM5') and drawer_type=1 and   quantity>0 and tCS.drug_id=bCS.drug_id) totalQuantity
                                         FROM channel_stock bCS
-                                        WHERE MACHINE_ID in('DM3','DM5') and drawer_type=1 and   quantity>0 GROUP BY drug_id,manu_no,eff_date";
+                                        WHERE MACHINE_ID in('DM3','DM5') and drawer_type=1 and   quantity>0 GROUP BY drug_id,manu_no";
                         DataSet dsQuantity = SqlHelper.ExecuteQuery(sql);
                         if (dsQuantity != null && dsQuantity.Tables[0] != null && dsQuantity.Tables[0].Rows.Count > 0)
                         {