1. 修正過站刷KeyParts問題

2. 檔案下載加入Msg ContentType

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<IActionResult> 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<Result> 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<br>";
 
                         }
-                        else if ( !recordNumber.StartsWith("50000"))
+                        else if (!recordNumber.StartsWith("50000"))
                         {
                             _msg = "箱號:" + boxNo + " recordNumber 必須為10碼且為50000開頭,RecordNumber format error<br>";
 
@@ -7967,7 +7971,7 @@ namespace AMESCoreStudio.Web.Controllers
             }
             else
             {
-                return new Result() { success = false, msg = "箱號:"+ boxNo + "沒有序號資料" };
+                return new Result() { success = false, msg = "箱號:" + boxNo + "沒有序號資料" };
             }
 
 

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 = '<tr class="data-contact-person">' +
-                '<td><input readonly="readonly"  onkeypress="if( event.keyCode == 13 ) { return false; }" type="text" name="f-name" class="form-control td-InputNo" value=' + InputNo + '></td>' +
-                '<td><input readonly="readonly"  onkeypress="if( event.keyCode == 13 ) { return false; }" type="text" name="f-name" class="form-control td-Input" value=' + strAry[0] + ' /></td>' +
+                '<td style="width:10%;"><input style="width:80px" readonly="readonly" onkeypress="if( event.keyCode == 13 ) { return false; }" type="text" name="f-name" class="form-control td-InputNo" value=' + InputNo + '></td>' +
+                `<td style="width:90%;"><input readonly="readonly" style="width:100%;" onkeypress="if( event.keyCode == 13 ) { return false; }" type="text" name="f-name" class="td-Input" value="${strAry[0]}"/></td>` +
                 '<td><a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a></td>' +
                 '</tr>';
             $('#tblCustomers').append(contactdiv);