From c38bfd09dc98ca51213587e4a00b07e88ee2f555 Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Mon, 23 Jun 2025 10:55:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=A5=E8=AF=8A=E6=B7=BB=E5=8A=A0=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/Report/GridReportUtil.cs | 5 +- DM_Weight/ReportTemp/account_book_temp1.grf | 186 ++++++++++-------- .../ReportTemp/account_book_temp_new.grf | 111 ++++++----- 3 files changed, 172 insertions(+), 130 deletions(-) diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs index 3ecc677..534b032 100644 --- a/DM_Weight/Report/GridReportUtil.cs +++ b/DM_Weight/Report/GridReportUtil.cs @@ -450,9 +450,10 @@ namespace DM_Weight.Report string p_machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM1"); string SQL = $@" SELECT ac.create_time as operationTime, ac.manu_no as manuNo, ac.eff_date as effDate,ac.department as dept,oi.p_name as pName,oi.sex as sex,oi.age as age,oi.id_number as idNumber, - oi.patient_no as zyh,'' mkh,oi.disease as disease,ac.out_quantity as outQuantity,'' ftph,oi.doctor_name as doctorName,oi.order_no as orderNo,'' kptjr, + oi.patient_no as zyh,'' mkh,oi.disease as disease,ac.out_quantity as outQuantity,od.empty_bottle_batch as ftph,oi.doctor_name as doctorName,oi.order_no as orderNo,od.empty_bottle_submitter kptjr, di.drug_id as drugId,di.drug_name as drugName,di.drug_spec as drugSpec,di.big_unit AS bigUnit,u1.user_name as operatorName,u2.user_name as reviewerName,db.baseQuantity - FROM account_book_g2 ac inner join order_info oi on ac.invoice_no=oi.order_no left join drug_info di on ac.drug_id=di.drug_id left join drug_base db on di.drug_id=db.DrugId and db.machine_id='DM1' + FROM account_book_g2 ac inner join order_info oi on ac.invoice_no=oi.order_no inner join order_detail od on oi.order_no=od.order_no + left join drug_info di on ac.drug_id=di.drug_id left join drug_base db on di.drug_id=db.DrugId and db.machine_id='DM1' 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='{p_machine_id}' and create_time>'{p_startDate}' AND create_time<'{p_endDate}' "; if (!string.IsNullOrEmpty(drug_id)) diff --git a/DM_Weight/ReportTemp/account_book_temp1.grf b/DM_Weight/ReportTemp/account_book_temp1.grf index 9f12e60..8e712a5 100644 --- a/DM_Weight/ReportTemp/account_book_temp1.grf +++ b/DM_Weight/ReportTemp/account_book_temp1.grf @@ -152,7 +152,7 @@ } ], "ColumnContent":{ - "Height":0.85, + "Height":0.79375, "ColumnContentCell":[ { "Column":"日期", @@ -452,71 +452,15 @@ "PrintGridBorder":false, "RepeatOnPage":true, "Control":[ - { - "Type":"StaticBox", - "Name":"StaticBox16", - "Top":0.0529167, - "Width":2.19604, - "Height":0.978958, - "Font":{ - "Name":"宋体", - "Size":105000, - "Bold":true, - "Charset":134 - }, - "Text":"药品名称：" - }, - { - "Type":"FieldBox", - "Name":"FieldBox7", - "Left":2.40771, - "Width":5.63563, - "Height":0.978958, - "Font":{ - "Name":"宋体", - "Size":105000, - "Bold":true, - "Charset":134 - }, - "DataField":"药品名称" - }, - { - "Type":"StaticBox", - "Name":"StaticBox17", - "Left":8.91646, - "Top":0.079375, - "Width":1.11125, - "Height":0.978958, - "Font":{ - "Name":"宋体", - "Size":105000, - "Bold":true, - "Charset":134 - }, - "Text":"规格：" - }, - { - "Type":"FieldBox", - "Name":"FieldBox8", - "Left":10.0013, - "Top":0.079375, - "Width":1.79917, - "Height":0.978958, - "Font":{ - "Name":"宋体", - "Size":105000, - "Bold":true, - "Charset":134 - }, - "DataField":"规格" - }, { "Type":"StaticBox", "Name":"StaticBox18", - "Left":12.6471, - "Top":0.079375, - "Width":1.21708, - "Height":0.978958, + "Left":11.27, + "Width":1.22, + "Height":1.19, + "Border":{ + "Styles":"[DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -528,10 +472,12 @@ { "Type":"FieldBox", "Name":"FieldBox9", - "Left":13.8377, - "Top":0.079375, - "Width":1.87854, - "Height":0.978958, + "Left":12.49, + "Width":3.28, + "Height":1.19, + "Border":{ + "Styles":"[DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -543,10 +489,12 @@ { "Type":"StaticBox", "Name":"StaticBox20", - "Left":16.3513, - "Top":0.079375, - "Width":2.01083, - "Height":0.978958, + "Left":15.77, + "Width":1.82563, + "Height":1.19, + "Border":{ + "Styles":"[DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -558,9 +506,12 @@ { "Type":"FieldBox", "Name":"FieldBox11", - "Left":18.3356, - "Width":1.905, - "Height":1.00542, + "Left":17.5948, + "Width":1.61396, + "Height":1.19, + "Border":{ + "Styles":"[DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -569,13 +520,82 @@ }, "DataField":"基数" }, + { + "Type":"StaticBox", + "Name":"StaticBox16", + "Dock":"Left", + "Width":2.2, + "Border":{ + "Styles":"[DrawLeft|DrawTop]" + }, + "Font":{ + "Name":"宋体", + "Size":105000, + "Bold":true, + "Charset":134 + }, + "Text":"药品名称：" + }, + { + "Type":"StaticBox", + "Name":"StaticBox17", + "Left":6.99, + "Width":1.11, + "Height":1.19, + "Border":{ + "Styles":"[DrawTop]" + }, + "Font":{ + "Name":"宋体", + "Size":105000, + "Bold":true, + "Charset":134 + }, + "Text":"规格：" + }, + { + "Type":"FieldBox", + "Name":"FieldBox7", + "Dock":"Left", + "Left":2.2, + "Width":4.79, + "Border":{ + "Styles":"[DrawTop]" + }, + "Font":{ + "Name":"宋体", + "Size":105000, + "Bold":true, + "Charset":134 + }, + "DataField":"药品名称" + }, + { + "Type":"FieldBox", + "Name":"FieldBox8", + "Left":8.1, + "Width":3.17, + "Height":1.19, + "Border":{ + "Styles":"[DrawTop]" + }, + "Font":{ + "Name":"宋体", + "Size":105000, + "Bold":true, + "Charset":134 + }, + "DataField":"规格" + }, { "Type":"StaticBox", "Name":"药品ID：", - "Left":20.7698, - "Top":0.238125, - "Width":1.79917, - "Height":0.608542, + "Left":19.2088, + "Width":1.98438, + "Height":1.19, + "Border":{ + "Styles":"[DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -587,10 +607,12 @@ { "Type":"FieldBox", "Name":"FieldBox14", - "Left":22.569, - "Top":0.238125, - "Width":1.79917, - "Height":0.608542, + "Dock":"Right", + "Left":21.1931, + "Width":3.41313, + "Border":{ + "Styles":"[DrawTop|DrawRight]" + }, "Font":{ "Name":"宋体", "Size":105000, diff --git a/DM_Weight/ReportTemp/account_book_temp_new.grf b/DM_Weight/ReportTemp/account_book_temp_new.grf index d3ce4aa..e2f3886 100644 --- a/DM_Weight/ReportTemp/account_book_temp_new.grf +++ b/DM_Weight/ReportTemp/account_book_temp_new.grf @@ -556,10 +556,11 @@ { "Type":"StaticBox", "Name":"StaticBox16", - "Left":1.08479, - "Top":0.079375, + "Dock":"Left", "Width":2.19604, - "Height":0.978958, + "Border":{ + "Styles":"[DrawLeft|DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -571,10 +572,12 @@ { "Type":"FieldBox", "Name":"FieldBox7", - "Left":3.4925, - "Top":0.079375, + "Dock":"Left", + "Left":2.19604, "Width":4.78896, - "Height":0.978958, + "Border":{ + "Styles":"[DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -586,10 +589,12 @@ { "Type":"StaticBox", "Name":"StaticBox17", - "Left":10.2658, - "Top":0.0794, + "Dock":"Left", + "Left":6.985, "Width":1.11125, - "Height":0.978958, + "Border":{ + "Styles":"[DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -601,10 +606,12 @@ { "Type":"FieldBox", "Name":"FieldBox8", - "Left":11.3506, - "Top":0.0794, + "Dock":"Left", + "Left":8.09625, "Width":3.175, - "Height":0.978958, + "Border":{ + "Styles":"[DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -616,10 +623,12 @@ { "Type":"StaticBox", "Name":"StaticBox18", - "Left":14.7902, - "Top":0.0794, + "Dock":"Left", + "Left":11.2713, "Width":1.21708, - "Height":0.978958, + "Border":{ + "Styles":"[DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -631,10 +640,12 @@ { "Type":"FieldBox", "Name":"FieldBox9", - "Left":15.9808, - "Top":0.0794, - "Width":1.87854, - "Height":0.978958, + "Dock":"Left", + "Left":12.4883, + "Width":3.28083, + "Border":{ + "Styles":"[DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -646,10 +657,12 @@ { "Type":"StaticBox", "Name":"StaticBox19", - "Left":19.1558, - "Top":0.0794, - "Width":1.16417, - "Height":0.978958, + "Left":15.7692, + "Width":3.43958, + "Height":1.19063, + "Border":{ + "Styles":"[DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -661,10 +674,12 @@ { "Type":"FieldBox", "Name":"FieldBox10", - "Left":20.2935, - "Top":0.0794, - "Width":1.74625, - "Height":0.978958, + "Left":18.9971, + "Width":5.00063, + "Height":1.19063, + "Border":{ + "Styles":"[DrawTop]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -673,28 +688,15 @@ }, "DataField":"基数" }, - { - "Type":"StaticBox", - "Name":"StaticBox20", - "Left":22.4102, - "Top":0.0794, - "Width":2.01083, - "Height":0.978958, - "Font":{ - "Name":"宋体", - "Size":105000, - "Bold":true, - "Charset":134 - }, - "Text":"药品ID：" - }, { "Type":"FieldBox", "Name":"FieldBox11", - "Left":24.3946, - "Top":0.0794, - "Width":3.01625, - "Height":0.978958, + "Dock":"Right", + "Left":36.4067, + "Width":2.19604, + "Border":{ + "Styles":"[DrawTop|DrawRight]" + }, "Font":{ "Name":"宋体", "Size":105000, @@ -702,6 +704,23 @@ "Charset":134 }, "DataField":"药品ID" + }, + { + "Type":"StaticBox", + "Name":"StaticBox20", + "Left":24, + "Width":5.0006, + "Height":1.1906, + "Border":{ + "Styles":"[DrawTop]" + }, + "Font":{ + "Name":"宋体", + "Size":105000, + "Bold":true, + "Charset":134 + }, + "Text":"药品ID：" } ], "NewPageColumn":"Before"