From d823cedd3c33b5abbe750219035a821f69ddabcb Mon Sep 17 00:00:00 2001 From: minom Date: Mon, 27 Jul 2026 06:28:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/App_Code/Model/Model.cs | 2 + web/App_Code/Model/Model.edmx | 8 +- web/App_Code/Model/ViewModel/receipt.cs | 2 + web/App_Code/api/receiptController.cs | 25 +-- web/admin/receipt/index.aspx | 41 ++++- web/admin/receipt/receipt.vue | 192 ++++++++++++++++++------ web/packages.config | 22 +++ 7 files changed, 226 insertions(+), 66 deletions(-) diff --git a/web/App_Code/Model/Model.cs b/web/App_Code/Model/Model.cs index e9ae360..b180468 100644 --- a/web/App_Code/Model/Model.cs +++ b/web/App_Code/Model/Model.cs @@ -1554,6 +1554,8 @@ namespace Model public string u_date { get; set; } public string u_time { get; set; } public string addr { get; set; } + public string receipt_date { get; set; } + public string receipt_item { get; set; } } } namespace Model diff --git a/web/App_Code/Model/Model.edmx b/web/App_Code/Model/Model.edmx index 5d5431a..be0c0bc 100644 --- a/web/App_Code/Model/Model.edmx +++ b/web/App_Code/Model/Model.edmx @@ -812,6 +812,8 @@ + + @@ -5464,6 +5466,8 @@ + + @@ -6584,7 +6588,9 @@ - + + + diff --git a/web/App_Code/Model/ViewModel/receipt.cs b/web/App_Code/Model/ViewModel/receipt.cs index c3925d0..c96b8fd 100644 --- a/web/App_Code/Model/ViewModel/receipt.cs +++ b/web/App_Code/Model/ViewModel/receipt.cs @@ -38,5 +38,7 @@ namespace Model.ViewModel public int? amt { get; set; } public string caseofficer { get; set; } public string addr { get; set; } + public string receipt_date { get; set; } + public string receipt_item { get; set; } } } \ No newline at end of file diff --git a/web/App_Code/api/receiptController.cs b/web/App_Code/api/receiptController.cs index 7c51570..7f98fe7 100644 --- a/web/App_Code/api/receiptController.cs +++ b/web/App_Code/api/receiptController.cs @@ -37,20 +37,20 @@ public class receiptController: ApiController // } - public string generend_receiptNo(string source) + public string generend_receiptNo(string source,string receipt_date) { - string start = source + "A"; - string no = start + DateTime.Now.ToString("yyyyMMdd"); + string start ="1"+ (source=="1"?"A":"B"); + string no = start + receipt_date; //DateTime.Now.ToString("yyyyMMdd"); var qry = _db.receipt_detail.Where(x => x.receipt_no.StartsWith(no)); var receipt_no=qry.Select(x => x.receipt_no).Max(); if (!string.IsNullOrEmpty(receipt_no)) { - receipt_no= receipt_no.Remove(0,(start + DateTime.Now.ToString("yyyyMMdd")).Length); - return start + DateTime.Now.ToString("yyyyMMdd")+string.Format("{0:D4}", Int32.Parse(receipt_no)+1); + receipt_no= receipt_no.Remove(0,(start + receipt_date.Replace("-","")).Length); + return start + receipt_date.Replace("-", "") + string.Format("{0:D4}", Int32.Parse(receipt_no)+1); } else { - return start + DateTime.Now.ToString("yyyyMMdd") + "0001"; + return start + receipt_date.Replace("-", "") + "0001"; } } @@ -94,17 +94,19 @@ public class receiptController: ApiController receipt_detail dd = new receipt_detail(); if (string.IsNullOrEmpty(pre_no)) { - dd.receipt_no = generend_receiptNo(master.source); + dd.receipt_no = generend_receiptNo(master.source,d.receipt_date.Replace("-","")); } else { string new_no = pre_no.Remove(0, 10); - dd.receipt_no = master.source + "A" + DateTime.Now.ToString("yyyyMMdd") + string.Format("{0:D4}", Int32.Parse(new_no) + 1); + dd.receipt_no = "1"+(master.source=="1"?"A":"B" )+d.receipt_date.Replace("-","") + string.Format("{0:D4}", Int32.Parse(new_no) + 1); } dd.addr = d.addr; dd.title = d.title; dd.amt = d.amt; dd.caseofficer = d.caseofficer; + dd.receipt_date= d.receipt_date; + dd.receipt_item = d.receipt_item; dd.receipt_num = master.num; dd.c_date = DateTime.Now.ToString("yyyyMMdd"); dd.c_time = DateTime.Now.ToString("HHmmss"); @@ -119,6 +121,7 @@ public class receiptController: ApiController dd.title=d.title; dd.amt=d.amt; dd.caseofficer=d.caseofficer; + dd.receipt_item=d.receipt_item; dd.u_time = DateTime.Now.ToString("HHmmss"); dd.u_date = DateTime.Now.ToString("yyyyMMdd"); } @@ -170,17 +173,19 @@ public class receiptController: ApiController receipt_detail dd = new receipt_detail(); if (string.IsNullOrEmpty(pre_no)) { - dd.receipt_no = generend_receiptNo(m.source); + dd.receipt_no = generend_receiptNo(m.source, d.receipt_date.Replace("-", "")); } else { string new_no = pre_no.Remove(0,10); - dd.receipt_no = m.source + "A" + DateTime.Now.ToString("yyyyMMdd") + string.Format("{0:D4}", Int32.Parse(new_no)+1); + dd.receipt_no ="1"+ (m.source=="1"?"A":"B") + d.receipt_date.Replace("-", "") + string.Format("{0:D4}", Int32.Parse(new_no)+1); } dd.addr = d.addr; dd.title = d.title; dd.amt = d.amt; dd.caseofficer = d.caseofficer; + dd.receipt_date=d.receipt_date; + dd.receipt_item = d.receipt_item; dd.receipt_num = m.num; dd.c_date = DateTime.Now.ToString("yyyyMMdd"); dd.c_time = DateTime.Now.ToString("HHmmss"); diff --git a/web/admin/receipt/index.aspx b/web/admin/receipt/index.aspx index 4f1002d..908ef68 100644 --- a/web/admin/receipt/index.aspx +++ b/web/admin/receipt/index.aspx @@ -106,7 +106,7 @@