From f15b26fcc5728502897b360e1cf1d81c0b9b8692 Mon Sep 17 00:00:00 2001 From: zgf Date: Thu, 4 Jan 2024 10:54:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ReceiptDetail2Controller.cs | 5 + .../XWMS/Controllers/XWMSMFMController.cs | 3 +- .../XWMS/Controllers/XWMSPOHController.cs | 3 +- .../XWMS/Controllers/XWMSPTHController.cs | 3 +- .../XWMS/Controllers/XWMSSHIPController.cs | 3 +- .../XWMS/Controllers/XWMSSOHController.cs | 3 +- .../ReceiptDetail2VMs/ReceiptDetail2ListVM.cs | 2 + .../XWMS/Views/ReceiptHeader2/Index.cshtml | 154 ++++++++++++++++++ 8 files changed, 171 insertions(+), 5 deletions(-) diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs index b824fac..4207b81 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs @@ -256,5 +256,10 @@ namespace HHWMS.Web.Controllers } #endregion + [ActionDescription("Sys.Print")] + public ActionResult Print() + { + return Ok(); + } } } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs index 4044c84..f669ad2 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs @@ -99,7 +99,8 @@ public class XWMSMFMController : BaseController { var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; var _unitwork = new UnitWork(Wtm); - using (var tran = _unitwork.BeginTransaction()) + var dc = Wtm.CreateDC(cskey: "hangyong"); + using (var tran = dc.BeginTransaction()) { try { diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs index dd895eb..11b14d6 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs @@ -93,7 +93,8 @@ public class XWMSPOHController : BaseController { var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; var _unitwork = new UnitWork(Wtm); - using (var tran = _unitwork.BeginTransaction()) + var dc = Wtm.CreateDC(cskey: "hangyong"); + using (var tran = dc.BeginTransaction()) { try { diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs index 0dcc1e0..f68ded3 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs @@ -99,7 +99,8 @@ public class XWMSPTHController : BaseController { var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; var _unitwork = new UnitWork(Wtm); - using (var tran = _unitwork.BeginTransaction()) + var dc = Wtm.CreateDC(cskey: "hangyong"); + using (var tran = dc.BeginTransaction()) { try { diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs index abb489a..1a593be 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs @@ -87,7 +87,8 @@ public class XWMSSHIPController : BaseController { var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; var _unitwork = new UnitWork(Wtm); - using (var tran = _unitwork.BeginTransaction()) + var dc = Wtm.CreateDC(cskey: "hangyong"); + using (var tran = dc.BeginTransaction()) { try { diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs index 40451c0..3e3981c 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs @@ -87,7 +87,8 @@ public class XWMSSOHController : BaseController { var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; var _unitwork = new UnitWork(Wtm); - using (var tran = _unitwork.BeginTransaction()) + var dc = Wtm.CreateDC(cskey: "hangyong"); + using (var tran = dc.BeginTransaction()) { try { diff --git a/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptDetail2VMs/ReceiptDetail2ListVM.cs b/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptDetail2VMs/ReceiptDetail2ListVM.cs index 42121f2..3340379 100644 --- a/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptDetail2VMs/ReceiptDetail2ListVM.cs +++ b/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptDetail2VMs/ReceiptDetail2ListVM.cs @@ -32,6 +32,8 @@ namespace HHWMS.Web this.MakeStandardAction("ReceiptDetail2", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "xwms", dialogWidth: 800), this.MakeStandardAction("ReceiptDetail2", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "xwms", dialogWidth: 800), this.MakeStandardAction("ReceiptDetail2", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "xwms"), + this.MakeAction("ReceiptDetail2","Print",Localizer["Sys.Print"],Localizer["Sys.Print"],GridActionParameterTypesEnum.SingleId,"xwms") + .SetShowDialog(false).SetOnClickScript("print"), }; } diff --git a/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml index 24338fd..933b2e8 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml @@ -28,5 +28,159 @@ ff.OpenDialog('/xwms/ReceiptDetail2/Create/' + headerId, '@Guid.NewGuid()', '添加明细', 600); } } + let template = { + "panels": [{ + "index": 0, + "height": 50, + "width": 80, + "paperHeader": 43.5, + "paperFooter": 141.73228346456693, + "printElements": [{ + "options": { + "left": 3, + "top": 3, + "height": 40, + "width": 220, + "field": "lot", + "testData": "123123124412412544534214354432255424213412341324123", + "textAlign": "center", + "textContentVerticalAlign": "middle" + }, + "printElementType": { + "type": "text" + } + }, { + "options": { + "left": 3, + "top": 3, + "height": 130, + "width": 220, + "borderWidth": "1.5", + "borderStyle": "solid" + }, + "printElementType": { + "type": "rect" + } + }, { + "options": { + "left": 3, + "top": 42, + "height": 9, + "width": 219 + }, + "printElementType": { + "type": "hline" + } + }, { + "options": { + "left": 135, + "top": 42, + "height": 90, + "width": 9 + }, + "printElementType": { + "type": "vline" + } + }, { + "options": { + "left": 3, + "top": 43.5, + "height": 28.5, + "width": 132, + "field": "code", + "testData": "1324123412341234123", + "textAlign": "center", + "textContentVerticalAlign": "middle" + }, + "printElementType": { + "type": "text" + } + }, { + "options": { + "left": 150, + "top": 49.5, + "height": 48, + "width": 51, + "textType": "qrcode", + "field": "qrcode", + "testData": "1234123413234132" + }, + "printElementType": { + "type": "text" + } + }, { + "options": { + "left": 3, + "top": 72, + "height": 9, + "width": 132 + }, + "printElementType": { + "type": "hline" + } + }, { + "options": { + "left": 3, + "top": 72, + "height": 30, + "width": 132, + "field": "qty", + "testData": "5555", + "textAlign": "center", + "textContentVerticalAlign": "middle" + }, + "printElementType": { + "type": "text" + } + }, { + "options": { + "left": 4.5, + "top": 102, + "height": 9, + "width": 217.5 + }, + "printElementType": { + "type": "hline" + } + }, { + "options": { + "left": 4.5, + "top": 102, + "height": 28.5, + "width": 132, + "field": "batch", + "testData": "HYB2202030003", + "textAlign": "center", + "textContentVerticalAlign": "middle" + }, + "printElementType": { + "type": "text" + } + }], + "paperNumberLeft": 196.5, + "paperNumberTop": 118.5, + "paperNumberDisabled": true + }] + }; + let printData = []; + + function print(ids, datas) { + datas.forEach(function (value, index, arr) { + printData.push({ + lot:value.MaterialName + '|' + value.Lot, + code: value.MaterialCode, + batch: value.Batch, + qty: value.Qty, + qrcode: 'MT.' + value.MaterialCode + '@@@@LT.' + value.Batch + }) + }); + + hiprint.init(); + var hiprintTemplate = new hiprint.PrintTemplate({ + template: template + }); + hiprintTemplate.print(printData); + printData = []; + }