From c21b39a9f38675362c21bda759e56ab0652dccac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=B7=A7?= <625215135@qq.com> Date: Sat, 5 Jul 2025 17:27:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E8=A1=A8=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataAccess/Dao/IReportDataDao.cs.cs | 15 +++++++ .../DataAccess/Impl/ReportDataDao.cs | 18 ++++++++ MasaBlazorApp3/Pages/StockList.razor | 9 ++-- MasaBlazorApp3/Pojo/ReportDateInfo.cs | 12 ++++++ MasaBlazorApp3/Report/GridReportUtil.cs | 6 +-- .../ReportTemp/account_book_temp.grf | 43 +++++++++++++++---- 6 files changed, 88 insertions(+), 15 deletions(-) create mode 100644 MasaBlazorApp3/DataAccess/Dao/IReportDataDao.cs.cs create mode 100644 MasaBlazorApp3/DataAccess/Impl/ReportDataDao.cs create mode 100644 MasaBlazorApp3/Pojo/ReportDateInfo.cs diff --git a/MasaBlazorApp3/DataAccess/Dao/IReportDataDao.cs.cs b/MasaBlazorApp3/DataAccess/Dao/IReportDataDao.cs.cs new file mode 100644 index 0000000..da8b447 --- /dev/null +++ b/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> AccountBookExport(DateTime? startDate, DateTime? endDate, string drugId); + } +} diff --git a/MasaBlazorApp3/DataAccess/Impl/ReportDataDao.cs b/MasaBlazorApp3/DataAccess/Impl/ReportDataDao.cs new file mode 100644 index 0000000..27a7b04 --- /dev/null +++ b/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> AccountBookExport(DateTime? startDate, DateTime? endDate,string drugId) + { + throw new NotImplementedException(); + } + } +} diff --git a/MasaBlazorApp3/Pages/StockList.razor b/MasaBlazorApp3/Pages/StockList.razor index 5d06360..0c7058b 100644 --- a/MasaBlazorApp3/Pages/StockList.razor +++ b/MasaBlazorApp3/Pages/StockList.razor @@ -157,6 +157,7 @@ @code { @inject IDrugInfoDao drugInfoDao; @inject DialogService dialogService; + @inject IChannelListDao channelStockDao; RadzenDataGrid 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 pageData = await channelStockDao.GetAllChannelList(1,"",0,0); GridReportUtil.PrintReport("stock_template.grf", null); } diff --git a/MasaBlazorApp3/Pojo/ReportDateInfo.cs b/MasaBlazorApp3/Pojo/ReportDateInfo.cs new file mode 100644 index 0000000..1c672f3 --- /dev/null +++ b/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 + { + } +} diff --git a/MasaBlazorApp3/Report/GridReportUtil.cs b/MasaBlazorApp3/Report/GridReportUtil.cs index 023480b..44da72f 100644 --- a/MasaBlazorApp3/Report/GridReportUtil.cs +++ b/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 { @@ -32,7 +33,6 @@ namespace MasaBlazorApp3.Report } - - + } } diff --git a/MasaBlazorApp3/ReportTemp/account_book_temp.grf b/MasaBlazorApp3/ReportTemp/account_book_temp.grf index 12e3f4e..1af7efd 100644 --- a/MasaBlazorApp3/ReportTemp/account_book_temp.grf +++ b/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", - "DBFieldName":"drug_Id" + "Name":"sign1", + "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":[