From 61079319ea1a50b4b3b59c92e731c1b9a28d9038 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Mon, 12 Aug 2024 18:06:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=86=8C=E6=9F=A5=E8=AF=A2=E7=9A=84ac?=
 =?UTF-8?q?count=5Fbook=5Fg2=E8=A1=A8=E6=97=A0=E8=80=8C=E6=9F=A5DM5?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/Report/GridReportUtil.cs             | 4 ++--
 DM_Weight/ViewModels/AccountWindowViewModel.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs
index df4a166..d4eb460 100644
--- a/DM_Weight/Report/GridReportUtil.cs
+++ b/DM_Weight/Report/GridReportUtil.cs
@@ -93,13 +93,13 @@ namespace DM_Weight.Report
             DateTime? p_startDate = startDate ?? Convert.ToDateTime("2010-1-1");
             DateTime? p_endDate = endDate ?? DateTime.Now.AddDays(1);
             string p_machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM3");
-            string jj_machine_id = (ConfigurationManager.AppSettings["jj_machineId"] ?? "DM5");
+            //string jj_machine_id = (ConfigurationManager.AppSettings["jj_machineId"] ?? "DM5");
             string SQL = $@" SELECT ac.create_date as operationTime, ac.TYPE,
 	                     if(ac.type in(1,2),0,ac.yesterday_quantity) as YQuantity,if(ac.type in(3,4),0,ac.add_quantity) as inQuantity,if(ac.type in(3,4),0,ac.out_quantity) as outQuantity,
 	                     if(ac.type in(1,2),0,ac.manu_stock) as ManuStock,ac.total_stock AS stockQuantity, -- if(ac.type in(1,2),0,ac.total_stock) as TotalStock,
 	                     ac.invoice_no as invoiceId, ac.manu_no as manuNo,ac.eff_date as effDate,di.drug_id,di.drug_name as DrugName,di.drug_spec as DrugSpec,di.manufactory as manufactory,di.pack_unit AS packUnit,di.dosage,u1.user_name as operatorName,u2.user_name as reviewerName
 	                     FROM account_book_g2 ac left join drug_info di on ac.drug_id=di.drug_id left join user_list u1 on ac.user_id1=u1.id left join user_list u2 on ac.user_id2=u2.id
- 		                    WHERE ac.machine_id in('{p_machine_id}','{jj_machine_id}') and create_time>'{p_startDate}' AND create_time<'{p_endDate}' ";
+ 		                    WHERE ac.machine_id ='{p_machine_id}' and create_time>'{p_startDate}' AND create_time<'{p_endDate}' ";
             if (!string.IsNullOrEmpty(drug_id))
             {
                 SQL += " AND ac.drug_id='" + drug_id + "' ";
diff --git a/DM_Weight/ViewModels/AccountWindowViewModel.cs b/DM_Weight/ViewModels/AccountWindowViewModel.cs
index 5875ed5..7ab9813 100644
--- a/DM_Weight/ViewModels/AccountWindowViewModel.cs
+++ b/DM_Weight/ViewModels/AccountWindowViewModel.cs
@@ -323,13 +323,13 @@ namespace DM_Weight.ViewModels
             DateTime? p_startDate = startDate ?? Convert.ToDateTime("2010-1-1");
             DateTime? p_endDate = endDate ?? DateTime.Now.AddDays(1);
             string p_machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM3");
-            string jj_machine_id = (ConfigurationManager.AppSettings["jj_machineId"] ?? "DM5");
+            //string jj_machine_id = (ConfigurationManager.AppSettings["jj_machineId"] ?? "DM5");
             string SQL = $@" SELECT ac.create_date as CreateDate, ac.TYPE,
 	                     if(ac.type in(1,2),0,ac.yesterday_quantity) as YQuantity,if(ac.type in(3,4),0,ac.add_quantity) as AddQuantity,if(ac.type in(3,4),0,ac.out_quantity) as OutQuantity,
 	                     if(ac.type in(1,2),0,ac.manu_stock) as ManuStock,ac.total_stock, -- if(ac.type in(1,2),0,ac.total_stock) as TotalStock,
 	                     ac.invoice_no as InvoiceNo, ac.manu_no as ManuNo,ac.eff_date as EffDate,di.drug_id,di.drug_name as DrugName,di.drug_spec as DrugSpec,di.manufactory as Manufactory,di.pack_unit,di.dosage,u1.user_name as OperatorName,u2.user_name as ReviewerName
 	                     FROM account_book_g2 ac left join drug_info di on ac.drug_id=di.drug_id left join user_list u1 on ac.user_id1=u1.id left join user_list u2 on ac.user_id2=u2.id
- 		                    WHERE ac.machine_id in('{p_machine_id}','{jj_machine_id}') and create_time>'{p_startDate}' AND create_time<'{p_endDate}' ";
+ 		                    WHERE ac.machine_id ='{p_machine_id}' and create_time>'{p_startDate}' AND create_time<'{p_endDate}' ";
             //if (!string.IsNullOrEmpty(drug_id))
             //{
             //    SQL += " AND ac.drug_id='" + drug_id + "' ";