添加报表功能

MasaBlazorApp3/DataAccess/Dao/IReportDataDao.cs.cs

@@ -0,0 +1,15 @@
+using MasaBlazorApp3.Pojo;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MasaBlazorApp3.DataAccess.Dao
+{
+    public interface IReportDataDao
+    {
+        //专用账册导出数据
+        Task<List<ChannelStock>> AccountBookExport(DateTime? startDate, DateTime? endDate, string drugId);
+    }
+}

MasaBlazorApp3/DataAccess/Impl/ReportDataDao.cs

@@ -0,0 +1,18 @@
+using MasaBlazorApp3.DataAccess.Dao;
+using MasaBlazorApp3.Pojo;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MasaBlazorApp3.DataAccess.Impl
+{
+    public class ReportDataDao : IReportDataDao
+    {
+        public Task<List<ChannelStock>> AccountBookExport(DateTime? startDate, DateTime? endDate,string drugId)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

MasaBlazorApp3/Pages/StockList.razor

@@ -157,6 +157,7 @@
 @code {
     @inject IDrugInfoDao drugInfoDao;
     @inject DialogService dialogService;
+    @inject IChannelListDao channelStockDao;
     RadzenDataGrid<DrugInfo> grid;
     bool isLoading;
     int count;
@@ -199,15 +200,17 @@
 
 
     //库存导出
-    void StockExport()
+    async Task StockExport()
     {
-
+        string drugId = drugName != null ? drugName.Split('/').Last().Trim() : "";
+        // await GridReportUtil.PrintReportAccountBook(null, null, 0, drugId);
     }
     //专用账册导出
-    void AccountBookExport()
+    async Task AccountBookExport()
     {
         // string drugId = drugName != null ? drugName.Split('/').Last().Trim():"";
         // GridReportUtil gridReportUtil = new GridReportUtil();
+        PageData<ChannelStock> pageData = await channelStockDao.GetAllChannelList(1,"",0,0);
         GridReportUtil.PrintReport("stock_template.grf", null);
     }
 

MasaBlazorApp3/Pojo/ReportDateInfo.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MasaBlazorApp3.Pojo
+{
+    public class ReportDateInfo
+    {
+    }
+}

MasaBlazorApp3/Report/GridReportUtil.cs

@@ -2,11 +2,12 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Configuration;
 
 namespace MasaBlazorApp3.Report
 {
@@ -33,6 +34,5 @@ namespace MasaBlazorApp3.Report
 
 
        
-
     }
 }

MasaBlazorApp3/ReportTemp/account_book_temp.grf

@@ -1,5 +1,5 @@
 {
-	"Version":"6.8.1.1",
+	"Version":"6.3.0.1",
 	"Font":{
 		"Name":"宋体",
 		"Size":105000,
@@ -15,7 +15,6 @@
 	},
 	"DetailGrid":{
 		"CenterView":true,
-		"AppendBlankRow":true,
 		"Recordset":{
 			"Field":[
 				{
@@ -32,6 +31,11 @@
 					"Name":"批号",
 					"DBFieldName":"manuNo"
 				},
+				{
+					"Name":"上次批次结存",
+					"Type":"Integer",
+					"DBFieldName":"beforeManuQuan"
+				},
 				{
 					"Name":"入库数量",
 					"Type":"Integer",
@@ -42,6 +46,11 @@
 					"Type":"Integer",
 					"DBFieldName":"outQuantity"
 				},
+				{
+					"Name":"批号结存",
+					"Type":"Integer",
+					"DBFieldName":"manuQuantity"
+				},
 				{
 					"Name":"总结存",
 					"Type":"Integer",
@@ -65,7 +74,7 @@
 				},
 				{
 					"Name":"单位",
-					"DBFieldName":"packUnit"
+					"DBFieldName":"bigUnit"
 				},
 				{
 					"Name":"剂型",
@@ -82,12 +91,27 @@
 					"DBFieldName":"effDate"
 				},
 				{
-					"Name":"drugId",
+					"Name":"sign1",
-					"DBFieldName":"drug_Id"
+					"Type":"Binary"
+				},
+				{
+					"Name":"sign2",
+					"Type":"Binary"
+				},
+				{
+					"Name":"drugId"
 				},
 				{
 					"Name":"凭证号",
 					"DBFieldName":"invoiceId"
+				},
+				{
+					"Name":"供应单位",
+					"DBFieldName":"supplierDept"
+				},
+				{
+					"Name":"领用部门",
+					"DBFieldName":"receiveDept"
 				}
 			]
 		},
@@ -106,7 +130,7 @@
 			},
 			{
 				"Name":"有效期",
-				"Width":2.40771
+				"Width":2.43417
 			},
 			{
 				"Name":"入库数量",
@@ -210,7 +234,8 @@
 							"Type":"FieldBox",
 							"Name":"FieldBox14",
 							"Dock":"Fill",
-							"TextAlign":"MiddleCenter"
+							"TextAlign":"MiddleCenter",
+							"DataField":"供应单位"
 						}
 					]
 				},
@@ -222,7 +247,8 @@
 							"Type":"FieldBox",
 							"Name":"FieldBox15",
 							"Dock":"Fill",
-							"TextAlign":"MiddleCenter"
+							"TextAlign":"MiddleCenter",
+							"DataField":"领用部门"
 						}
 					]
 				}
@@ -371,7 +397,6 @@
 				"Name":"Group1",
 				"ByFields":"drugId",
 				"GroupHeader":{
-					"NewPage":"Before",
 					"PrintGridBorder":false,
 					"RepeatOnPage":true,
 					"Control":[