From 76e25b979d957d6622987ab6d6ee12ffd14a99c5 Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Tue, 18 Mar 2025 17:20:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E6=96=B9=E7=99=BB=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=95=B0=E9=87=8F=E5=8F=96dm=5Fmachine=5Frec?= =?UTF-8?q?ord=E8=A1=A8=E4=B8=AD=E7=9A=84=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/Report/GridReportUtil.cs | 2 +- DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs | 2 +- DM_Weight/ViewModels/OrderTakeDialogViewModel.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs index 72b239f..a143637 100644 --- a/DM_Weight/Report/GridReportUtil.cs +++ b/DM_Weight/Report/GridReportUtil.cs @@ -302,7 +302,7 @@ namespace DM_Weight.Report }); Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//account_book_order.grf"); - SQL = $@"SELECT DISTINCT oi.recv_date,oi.p_name,oi.sex,oi.age,oi.id_number,oi.patient_no,oi.patient_id,oi.disease,dm.manu_no,od.Quantity,oi.doctor_name,oi.order_no,dm.reviewer,dm.operator,ul.user_name operatorName,ul2.user_name reviewerName + SQL = $@"SELECT DISTINCT oi.recv_date,oi.p_name,oi.sex,oi.age,oi.id_number,oi.patient_no,oi.patient_id,oi.disease,dm.manu_no,dm.Quantity,oi.doctor_name,oi.order_no,dm.reviewer,dm.operator,ul.user_name operatorName,ul2.user_name reviewerName ,di.Drug_name,di.Drug_spec,di.big_unit,di.small_unit as smallUnit,di.drug_id,di.manuFactory,dm.receivePerson,dm.ordinalNum as ordinalNum,CONCAT(DATE_FORMAT(operation_time,'%Y%m%d'),ordinalnum) as OrderOrdinal from order_info oi inner join order_detail od on oi.order_no=od.Order_No LEFT JOIN dm_machine_record dm on oi.order_no=dm.invoice_id diff --git a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs index 2433f81..abe6c40 100644 --- a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs +++ b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs @@ -431,7 +431,7 @@ namespace DM_Weight.ViewModels SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(), ReceiveDept = OrderInfo[0].DeptName, ReceivePerson = ReceivePerson, - OrdinalNum = ordinalNum + 1 + OrdinalNum = ordinalNum<=0?1:ordinalNum+ 1 //,StockQuantity = nowChannels.Sum(it => it.Quantity) }).ExecuteCommand(); diff --git a/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs index f513962..c887ec6 100644 --- a/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs +++ b/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs @@ -405,7 +405,7 @@ namespace DM_Weight.ViewModels SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(), ReceiveDept = OrderInfo.DeptName, ReceivePerson = ReceivePerson, - OrdinalNum = ordinalNum + 1, + OrdinalNum = ordinalNum<=0?1:ordinalNum+ 1, }).ExecuteCommand(); } return true;