From 4ebdcc4ac729a3bc81cb72cef045e6e75e134df8 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Mon, 24 Mar 2025 11:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=8A=A5=E8=A1=A8=E4=B8=ADpack=5Funit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/Report/GridReportUtil.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs
index 5925d92..82f82ff 100644
--- a/DM_Weight/Report/GridReportUtil.cs
+++ b/DM_Weight/Report/GridReportUtil.cs
@@ -83,7 +83,7 @@ namespace DM_Weight.Report
             //});
             string machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
             string SQL = $@"SELECT cl.`row_no` AS drawerNo,cl.`col_no` AS colNo,cl.`quantity` AS quantity,cl.`manu_no` AS manuNo,cl.`eff_date` AS effDate,
-                          `drug_name` AS drugName,`drug_spec` AS drugSpec,`pack_unit` AS smallUnit,`manufactory` AS manuFactory,`max_stock` AS baseQuantity,
+                          `drug_name` AS drugName,`drug_spec` AS drugSpec,`pack_unit` AS  packUnit,pack_unit  AS smallUnit,`manufactory` AS manuFactory,`max_stock` AS baseQuantity,
                           cl.`drug_id` AS drugId,cl.manuquantity, cl.`optdate` FROM check_stock cl WHERE cl.`machine_id` =  '{machine_id}' AND cl.`optdate` > '{p_startDate}' AND cl.`optdate` < '{p_endDate}' ORDER BY cl.`optdate` desc, cl.`drug_id`";
             // 加载模板文件
             Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + "machine_log_check_new2.grf");