From b7e40daab4582ecb099b5940286486c0452f77f1 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Thu, 21 Aug 2025 18:05:12 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fb413c18f46e6b7ec1e69540148cb56e75538757.
---
 CreateAccountBookConsole/Program.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CreateAccountBookConsole/Program.cs b/CreateAccountBookConsole/Program.cs
index a36290c..71af24b 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";
+                                        WHERE MACHINE_ID in('DM1','DM5') and drawer_type=1 and   quantity>0 GROUP BY drug_id,manu_no,eff_date";
                         DataSet dsQuantity = SqlHelper.ExecuteQuery(sql);
                         if (dsQuantity != null && dsQuantity.Tables[0] != null && dsQuantity.Tables[0].Rows.Count > 0)
                         {