From 77a251319d1827415bf05579c2c693a9b0592b9a Mon Sep 17 00:00:00 2001 From: ray Date: Mon, 13 Feb 2023 23:53:26 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3=E9=81=8E=E7=AB=99?= =?UTF-8?q?=E5=88=B7KeyParts=E5=95=8F=E9=A1=8C=202.=20=E6=AA=94=E6=A1=88?= =?UTF-8?q?=E4=B8=8B=E8=BC=89=E5=8A=A0=E5=85=A5Msg=20ContentType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PCSController.cs | 30 +++++++++++-------- AMESCoreStudio.Web/Views/PCS/PCS021.cshtml | 11 ++++--- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs index 7f101340..e02ac3db 100644 --- a/AMESCoreStudio.Web/Controllers/PCSController.cs +++ b/AMESCoreStudio.Web/Controllers/PCSController.cs @@ -3027,6 +3027,10 @@ namespace AMESCoreStudio.Web.Controllers { string suffix = Path.GetExtension(fileName); var provider = new FileExtensionContentTypeProvider(); + if (suffix.ToUpper().Trim() == ".MSG") + { + return "application/octet-stream"; + } var contentType = provider.Mappings[suffix]; return contentType; }); @@ -7635,7 +7639,7 @@ namespace AMESCoreStudio.Web.Controllers //YIRU ADD ------------------------------------------------------------------------------------------------------------------------------- - #region PCS031 完工入庫 + #region PCS031 完工入庫 public IActionResult PCS031() { return View(); @@ -7661,7 +7665,7 @@ namespace AMESCoreStudio.Web.Controllers return Json(new Table() { code = 0, msg = "", data = Data, count = result.DataTotal }); } - return Json(new Table() { count = 0, data = null }); + return Json(new Table() { count = 0, data = null }); } public async Task PCS031sum(string[] ids) @@ -7674,9 +7678,9 @@ namespace AMESCoreStudio.Web.Controllers for (int i = 0; i < ids.Length; i++) { qty += Convert.ToInt32(ids[i]); - - + + } return Json(new Result() { success = true, msg = qty.ToString() }); @@ -7729,12 +7733,12 @@ namespace AMESCoreStudio.Web.Controllers private async Task PCS0311inhouse(string InhouseNo, string boxNo, int seq, string recordNumber, string locationNo) { - /* 1.先查詢是否已入庫過 - * 2.依barcodeinfo 查詢 該箱號所屬序號 - * 3.查詢所有序號查詢該流程 是否為最後一個流程(入庫)，即在可入庫狀態 - * 4.若有序號不可入庫 => 畫面顯示不可入之序號 - * 5.所有序號可入庫 = > - */ + /* 1.先查詢是否已入庫過 + * 2.依barcodeinfo 查詢 該箱號所屬序號 + * 3.查詢所有序號查詢該流程 是否為最後一個流程(入庫)，即在可入庫狀態 + * 4.若有序號不可入庫 => 畫面顯示不可入之序號 + * 5.所有序號可入庫 = > + */ var result1 = await _pcsApi.GetWareHouseing(inhouseNo: InhouseNo, seq: seq); if (result1.Count() > 0) @@ -7757,12 +7761,12 @@ namespace AMESCoreStudio.Web.Controllers else if (AppSetting.Setting.Location == "9000" || AppSetting.Setting.Location == "0S08") { - if (recordNumber.Length != 10 ) + if (recordNumber.Length != 10) { _msg = "箱號:" + boxNo + " recordNumber 必須為10碼且為50000開頭,RecordNumber format error
"; } - else if ( !recordNumber.StartsWith("50000")) + else if (!recordNumber.StartsWith("50000")) { _msg = "箱號:" + boxNo + " recordNumber 必須為10碼且為50000開頭,RecordNumber format error
"; @@ -7967,7 +7971,7 @@ namespace AMESCoreStudio.Web.Controllers } else { - return new Result() { success = false, msg = "箱號:"+ boxNo + "沒有序號資料" }; + return new Result() { success = false, msg = "箱號:" + boxNo + "沒有序號資料" }; } diff --git a/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml index e7dae79f..01f22dc7 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml @@ -54,6 +54,9 @@ color: blue; } + .td-Input { + white-space: pre; + } /* .layui-tab-brief>.layui-tab-title .layui-this{ color: #5672a7 } @@ -485,7 +488,6 @@ // 回傳有值 else if (result.data.length != 0) { // 新增資料 - TableAddRow(result.data); } else { @@ -538,15 +540,16 @@ // 新增trRow function TableAddRow(e) { + console.log(e); var strAry = e.split('＠'); - var InputNo = strAry[1]; + var InputNo = strAry[1];//異常代碼 if (InputNo == undefined) InputNo = ''; //var rowCount = $('.data-contact-person').length + 0; var contactdiv = '' + - '' + - '' + + '' + + `` + '刪除' + ''; $('#tblCustomers').append(contactdiv);