添加账册报表

DM_Weight/Report/GridReportUtil.cs

@@ -400,10 +400,28 @@ namespace DM_Weight.Report
             string p_machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
             string SQL = string.Empty;
 
-            Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + "Account_Book_New.grf");
+            Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + "Account_Book_New.grf"); 
-            SQL = $@" SELECT opertiontype,VOUCHER,department,Drug_type,FACTURE,DRUG_NAME,Drug_Spec,drug_base,DRUG_ID,
+
-                    INQUANTITY,OUTQUANTITY,STOCKQUANTITY,MANUNO,EFF_DATE,SENDUSER,SENDCHECKUSER,RECEIVEUSER,RECEIVECHECKUSER FROM TEST 
+            //SQL = $@"
-                    ORDER BY  opertiontype desc,voucher desc,department desc,Drug_type desc,FACTURE";
+            //        SELECT IF(mr.TYPE=1,'入库',IF(mr.TYPE=2,'出库',''))  as operationtype,
+            //        IF(mr.TYPE=1,'麻醉科小药箱交接与使用记录本','住院药房发药清单') as VOUCHER,
+            //        IF(mr.TYPE=1,'麻醉科','住院药房') as department,
+            //        di.Drug_type as Drug_type,
+            //        di.Manufactory AS FACTURE,di.Drug_Name,di.Drug_Spec,db.baseQuantity AS drug_base,mr.drug_id,0 INQUANTITY,0 OUTQUANTITY,0 STOCKQUANTITY,mr.manu_no AS MANUNO, mr.EFF_DATE,
+
+            //        'admin' AS SENDUSER,'admin' AS SENDCHECKUSER,'admin' AS RECEIVEUSER,'admin' AS RECEIVECHECKUSER
+            //         from dm_machine_record mr inner join drug_info di on mr.drug_id=di.drug_id LEFT JOIN drug_base db on di.drug_id=db.drugid 
+            //         INNER join user_list ul on mr.operator=ul.id
+            //         WHERE mr.machine_id='DM3' and type in(1,2)  ORDER BY  mr.TYPE ,voucher desc,department desc,Drug_type desc,di.Manufactory";
+
+            SQL = $@"SELECT YEAR(create_date) AS DMYear, IF(ab.type=1,'入库','出库') as operationtype,if(ab.type=1,'住院药房发药清单','麻醉科小药箱交接与使用记录本') as VOUCHER,IF(ab.TYPE=1,'住院药房','麻醉科') as department,ab.Manu_No AS MANUNO,ab.eff_date AS EFF_DATE,
+                    di.Drug_type as Drug_type,di.Manufactory AS FACTURE,di.Drug_Name,di.Drug_Spec,db.baseQuantity AS drug_base,ab.drug_id,if(ab.Type=1,sum(ab.add_quantity),0) as INQUANTITY,if(ab.type=2,sum(ab.out_quantity),0) as OUTQUANTITY,
+                    (SELECT manu_stock from account_book_g2 as  stb where stb.drug_id=ab.drug_id and stb.manu_no=ab.manu_no and stb.eff_date=ab.eff_date and stb.type=3  and stb.create_date=ab.create_date ORDER BY create_time desc LIMIT 1) as STOCKQUANTITY,
+                    IF(ab.type=1,CONCAT(u1.user_name,u2.user_name),'') as SENDUSER,IF(ab.type=2,CONCAT(u1.user_name,u2.user_name),'') as RECEIVEUSER
+                    from account_book_g2 ab inner join drug_info di on ab.drug_id=di.drug_id left join drug_base db on  di.drug_id=db.drugid 
+                    LEFT JOIN user_list u1 on ab.user_id1=u1.id LEFT JOIN user_list u2 on ab.user_id2=u2.id 
+                    where type in(1,2) and ab.machine_id='DM3' and di.dosage='注射剂'   GROUP BY ab.drug_id,ab.Manu_No,ab.eff_date 
+                    ORDER BY  ab.TYPE desc ,voucher desc,department desc,Drug_type desc,di.Manufactory";
 
             Dictionary<string, List<Dictionary<string, object>>> records = new Dictionary<string, List<Dictionary<string, object>>>();
             List<Dictionary<string, object>> tableList = SqlSugarHelper.Db.SqlQueryable<dynamic>(SQL).ToDictionaryList();

DM_Weight/ReportTemp/Account_Book_New.grf

@@ -75,6 +75,10 @@
 				{
 					"Name":"凭证号",
 					"DBFieldName":"VOUCHER"
+				},
+				{
+					"Name":"年份",
+					"DBFieldName":"DMYear"
 				}
 			]
 		},
@@ -98,7 +102,8 @@
 				"Name":"Column6"
 			},
 			{
-				"Name":"Column7"
+				"Name":"Column7",
+				"Width":3.04271
 			},
 			{
 				"Name":"Column8"
@@ -136,84 +141,83 @@
 				},
 				{
 					"Column":"Column2",
+					"WordWrap":true,
 					"TextAlign":"TopLeft",
-					"ShrinkFontToFit":true,
 					"DataField":"凭证号"
 				},
 				{
 					"Column":"Column3",
+					"WordWrap":true,
 					"TextAlign":"TopLeft",
-					"ShrinkFontToFit":true,
 					"DataField":"部门"
 				},
 				{
 					"Column":"Column4",
+					"WordWrap":true,
 					"TextAlign":"MiddleCenter",
 					"ShrinkFontToFit":true,
 					"DataField":"药品类型"
 				},
 				{
 					"Column":"Column5",
-					"TextAlign":"MiddleCenter",
+					"WordWrap":true,
-					"ShrinkFontToFit":true,
+					"TextAlign":"BottomCenter",
 					"DataField":"生产厂家"
 				},
 				{
 					"Column":"Column6",
+					"WordWrap":true,
 					"TextAlign":"BottomCenter",
-					"ShrinkFontToFit":true,
 					"DataField":"品名"
 				},
 				{
 					"Column":"Column7",
+					"WordWrap":true,
 					"TextAlign":"BottomCenter",
-					"ShrinkFontToFit":true,
 					"DataField":"规格"
 				},
 				{
 					"Column":"Column8",
+					"WordWrap":true,
 					"TextAlign":"BottomCenter",
-					"ShrinkFontToFit":true,
 					"DataField":"基数"
 				},
 				{
 					"Column":"Column9",
 					"TextAlign":"BottomCenter",
-					"ShrinkFontToFit":true,
 					"DataField":"入库数量"
 				},
 				{
 					"Column":"Column10",
 					"TextAlign":"BottomCenter",
-					"ShrinkFontToFit":true,
 					"DataField":"出库数量"
 				},
 				{
 					"Column":"Column11",
 					"TextAlign":"BottomCenter",
-					"ShrinkFontToFit":true,
 					"DataField":"结余数量"
 				},
 				{
 					"Column":"Column12",
+					"WordWrap":true,
 					"TextAlign":"BottomCenter",
-					"ShrinkFontToFit":true,
 					"DataField":"批号"
 				},
 				{
 					"Column":"Column13",
+					"WordWrap":true,
 					"TextAlign":"BottomCenter",
-					"ShrinkFontToFit":true,
 					"DataField":"有效期"
 				},
 				{
 					"Column":"Column14",
+					"EndEllipsis":true,
 					"TextAlign":"BottomCenter",
-					"ShrinkFontToFit":true,
 					"DataField":"发药/核对者1"
 				},
 				{
 					"Column":"Column15",
+					"EndEllipsis":true,
 					"TextAlign":"BottomCenter",
 					"DataField":"领药/核对者2"
 				}
@@ -307,13 +311,13 @@
 							"GroupTitle":false,
 							"Column":"Column14",
 							"TextAlign":"BottomCenter",
-							"Text":"发药/核对者1"
+							"Text":"发药/\r\n核对者1"
 						},
 						{
 							"GroupTitle":false,
 							"Column":"Column15",
 							"TextAlign":"BottomCenter",
-							"Text":"领药/核对者2"
+							"Text":"领药/\r\n核对者2"
 						}
 					],
 					"Text":"使用部门：麻醉科    品名：见下表   规格：见下表   剂型：注射剂   单位：支   生产厂家：见下表"
@@ -326,8 +330,7 @@
 				"ByFields":"操作类型",
 				"GroupHeader":{
 					"OccupyColumn":true,
-					"OccupiedColumns":"Column1;Column2;Column3;Column14;Column15",
+					"OccupiedColumns":"Column1;Column2;Column3;Column14;Column15"
-					"VAlign":"Middle"
 				},
 				"GroupFooter":{
 					"Visible":false,
@@ -340,8 +343,7 @@
 				"ByFields":"药品类型",
 				"GroupHeader":{
 					"OccupyColumn":true,
-					"OccupiedColumns":"Column4",
+					"OccupiedColumns":"Column4"
-					"VAlign":"Middle"
 				},
 				"GroupFooter":{
 					"Visible":false,
@@ -354,7 +356,8 @@
 				"ByFields":"生产厂家",
 				"GroupHeader":{
 					"OccupyColumn":true,
-					"OccupiedColumns":"Column5"
+					"OccupiedColumns":"Column5",
+					"VAlign":"Middle"
 				},
 				"GroupFooter":{
 					"Height":0
@@ -368,8 +371,8 @@
 			"Height":2,
 			"Control":[
 				{
-					"Type":"StaticBox",
+					"Type":"MemoBox",
-					"Name":"StaticBox1",
+					"Name":"MemoBox1",
 					"Dock":"Fill",
 					"Font":{
 						"Name":"宋体",
@@ -378,7 +381,7 @@
 						"Charset":134
 					},
 					"TextAlign":"MiddleCenter",
-					"Text":"湘乡市人民医院麻醉科麻醉、精神药品专用账册（2024）年"
+					"Text":"湘乡市人民医院麻醉科麻醉、精神药品专用账册（[#年份#]）年"
 				}
 			]
 		}