新增組件料號序號上傳(KCS005)及調整部分BUG

AMESCoreStudio.Web/AMESCoreStudio.Web.csproj

@@ -31,6 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="ClosedXML" Version="0.95.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.20" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.8" />

AMESCoreStudio.Web/Controllers/KCSController.cs

@@ -7,7 +7,6 @@ using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.CommonTools.Result;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using AMESCoreStudio.CommonTools.Result;
 using System.IO;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Hosting;
@@ -697,9 +696,17 @@ namespace AMESCoreStudio.Web.Controllers
         #endregion
 
 
-        public async Task<IActionResult> SPC005RSaveAsync(InspectionResultBlob model, IFormFile formFile)
+
+        public IActionResult KCS005()
+        {
+            return View();
+        }
+        [HttpPost]
+        public async Task<IActionResult> KCS005SaveAsync(InspectionResultBlob model, IFormFile formFile)
         {
             IResultModel result;
+            var tt = await _kcsApi.GetKPLink("");
+
             var userID = "";
             HttpContext.Request.Cookies.TryGetValue("UserID", out userID);
             int user_id = 0;
@@ -711,11 +718,24 @@ namespace AMESCoreStudio.Web.Controllers
                 }
             }
             var msg = "";
-            var count = 0;
-            if (formFile == null ) msg="未選取檔案或檔案上傳失敗";
-    
             var file = formFile;
-            if (Path.GetExtension(file.FileName) != ".xlsx") msg="請使用Excel 2007(.xlsx)格式";
+
+            if (formFile == null ) {
+
+
+                msg+="未選取檔案或檔案上傳失敗";    
+                ModelState.AddModelError("error", msg);
+                return View("KCS005");
+            }
+                
+            if (Path.GetExtension(file.FileName) != ".xlsx")
+            {
+
+                msg = "請使用Excel 2007(.xlsx)格式";
+                ModelState.AddModelError("error", msg);
+                return View("KCS005");
+            }
+
 
             if (file.Length > 0)
             {
@@ -724,23 +744,130 @@ namespace AMESCoreStudio.Web.Controllers
                     file.CopyTo(ms);
                     var fileBytes = ms.ToArray();
                     string s = System.Convert.ToBase64String(fileBytes);                    
-                    //ClosedXML.Excel.XLWorkbook wb = new ClosedXML.Excel.XLWorkbook(ms);
+                    ClosedXML.Excel.XLWorkbook wb = new ClosedXML.Excel.XLWorkbook(ms);
-                    // act on the Base64 data
+
+                    if (wb.Worksheets.Count > 1)
+                    {
+
+                        msg = "工作表大於一頁";
+                        ModelState.AddModelError("error", msg);
+                        return View("KCS005");
+
+
+                    }
+                    else {
+
+
+
+                        // 讀取第一個 Sheet
+                        ClosedXML.Excel.IXLWorksheet worksheet = wb.Worksheet(1);
+
+                        // 定義資料起始/結束 Cell
+                        var firstCell = worksheet.FirstCellUsed();
+                        var lastCell = worksheet.LastCellUsed();
+                        var firstCol1 = worksheet.Cell(1,1).Value.ToString().ToUpper();
+                        var firstCol2 = worksheet.Cell(1,2).Value.ToString().ToUpper();
+                        var firstCol3 = worksheet.Cell(1,3).Value.ToString().ToUpper();
+                        var erroCol = "";
+
+
+                        if (lastCell.Address.ColumnNumber != 3)
+                            erroCol += "請確認欄位是否正確,總數應為3欄\r\n";
+
+                        if (firstCol1 != "KEY_PART_NO")
+                            erroCol += "第一個欄位標題應該為KEY_PART_NO\r\n";
 
-                    //ClosedXML.Excel.IXLWorksheet = wb.Worksheet;
+                        if (firstCol2 != "KEY_PART_SN")
+                            erroCol += "第二個欄位標題應該為KEY_PART_SN\r\n";
 
+                        if (firstCol3 != "PO_NO")
+                            erroCol += "第三個欄位標題應該為PO_NO\r\n";
 
+                        List<KPLink> kpLinks = new List<KPLink>();
+                        kpLinks.Add(new KPLink());
+                        kpLinks.Add(new KPLink());
 
+                        for (int i = 2; i<= lastCell.Address.RowNumber; i++)
+                        {
+                            var Cell1 = worksheet.Cell(i, 1).Value.ToString().ToUpper();
+                            var Cell2 = worksheet.Cell(i, 2).Value.ToString().ToUpper();
+                            var Cell3 = worksheet.Cell(i, 3).Value.ToString().ToUpper();
+                            KPLink kpLink = new KPLink();
+                            kpLink.KeyPartNo = Cell1;
+                            kpLink.KeyPartSn = Cell2;
+                            kpLink.PoNo = Cell3;
+                            kpLink.CreateUserID = user_id;
+                            kpLink.UpdateUserID = user_id;
+                            kpLink.CreateDate = System.DateTime.Now;
+                            kpLink.UpdateDate = System.DateTime.Now;
+
+                            if (string.IsNullOrEmpty(Cell1) || string.IsNullOrEmpty(Cell1))// || string.IsNullOrEmpty(Cell1))
+                            {
+                                erroCol += "第" + i + "列有缺少資料!!\r\n";
+                            }
+                            else { 
+                                if(Cell1.Length > 20)
+                                    erroCol += "第" + i + "列KEY_PART_NO資料過長!!\r\n";
+                                if (Cell2.Length > 150)
+                                    erroCol += "第" + i + "列KEY_PART_SN資料過長!!\r\n";
+                                if (Cell3.Length > 20)
+                                    erroCol += "第" + i + "列PO_NO資料過長!!\r\n";
+                            }
+
+                            //kpLinks[i]= kpLink;
+
+                            kpLinks.Add(kpLink);
 
                         }
+
+
+                        if (!string.IsNullOrEmpty(erroCol))
+                        {
+                            ModelState.AddModelError("error", erroCol);
+                            return View("KCS005");
                         }
+                        else {
+                            var resultMsg = "";
+                            var count = 0;
+                            for (int i = 2; i <= lastCell.Address.RowNumber; i++) {
+                                var kpLinkModel = kpLinks[i];
 
+                                result = await _kcsApi.PostKPLink(JsonConvert.SerializeObject(kpLinkModel));
 
+                                if (!result.Success)
+                                {
+                                    resultMsg += "第" + i + "列:資料寫入失敗!!!原因:" + result.Msg + "\r\n";
+                                }
+                                else
+                                    count++;
 
-            ViewBag.ItemID = model.InspectionItemID;
+                            }
-            ViewBag.MasterID = model.InspectionID;
+                            if (resultMsg != "")
+                            {
+
+                                ModelState.AddModelError("error", resultMsg);
+                                return View("KCS005");
+
+                            }
+                            else {
+
+                                ModelState.AddModelError("error", "資料寫入成功!!");
+                                return View("KCS005");
+                                //var _msg = "資料寫入成功!!!";
+                                //return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                            }
+
+
+                        }
+
+                    }
+
+                }
+
+
+            }
 
-            return View("SPC005R");
+            return View("KCS005");
         }
 
 

AMESCoreStudio.Web/Views/BAS/BAS001.cshtml

@@ -44,11 +44,6 @@
                 title: '英文名稱',
                 width: 160
             },
-            {
-                field: 'telNo',
-                title: '電話',
-                width: 160
-            },
             {
                 field: 'center',
                 width: 160,

AMESCoreStudio.Web/Views/BAS/BAS012C.cshtml

@@ -39,6 +39,11 @@
                 <input id="ItemNo" class="form-control col-sm-9" placeholder="請輸入料號" />
                 <span asp-validation-for="ItemID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="MaterialFlowRemark" class="control-label col-sm-3"></label>
+                <input asp-for="MaterialFlowRemark" class="form-control col-sm-9" />
+                <span asp-validation-for="MaterialFlowRemark" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="FlowSEQ" class="control-label col-sm-3"></label>
                 <input id="FlowSEQ" asp-for="FlowSEQ" class="form-control col-sm-9" placeholder="請輸入0-9數字" />

AMESCoreStudio.Web/Views/BAS/BAS012U.cshtml

@@ -39,6 +39,11 @@
                 <input id="ItemNo" class="form-control col-sm-9" value="@ViewBag.item" placeholder="請輸入料號" />
                 <span asp-validation-for="ItemID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="MaterialFlowRemark" class="control-label col-sm-3"></label>
+                <input asp-for="MaterialFlowRemark" class="form-control col-sm-9"/>
+                <span asp-validation-for="MaterialFlowRemark" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="FlowSEQ" class="control-label col-sm-3"></label>
                 <input id="FlowSEQ" asp-for="FlowSEQ" class="form-control col-sm-9" placeholder="請輸入0-9數字" />

AMESCoreStudio.Web/Views/BAS/BAS014.cshtml

@@ -55,7 +55,6 @@
 
         //通过行tool删除，lay-event="del"
         function del(obj) {
-            alert(obj);
             if (obj.data.rrid) {
                 hg.confirm("系統：" + obj.data.rrDesc + "，确定要删除吗？", function () {
                     $.ajax({

AMESCoreStudio.Web/Views/KCS/KCS005.cshtml

@@ -0,0 +1,148 @@
+
+@{ ViewData["Title"] = "組件料號序號上傳";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+
+    .text-error {
+        color: #dc3545 !important;
+    }
+
+    .my-read-only-class {
+        cursor: not-allowed;
+    }
+</style>
+
+<div class="layui-card">
+    <div class="layui-card-body">
+        <form enctype="multipart/form-data" class="layui-form" method="post" asp-action="KCS005Save">
+            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+            <div class="layui-form-item" style="text-align:center">
+                <div class="layui-inline">
+                    <label class="layui-btn">
+                        <input type="file" name="formFile">
+                    </label>
+                    <input type="submit" id="asubmit" value="上傳" class="layui-btn layui-icon " />
+                </div>
+            </div>
+            <div style="text-align:center">
+                <div class="layui-inline">
+                    <pre  style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</pre>                   
+                </div>
+            </div>
+        </form>
+        <table class="layui-hide" id="sop" lay-filter="sop"></table>
+
+    </div>
+</div>
+
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+
+<script type="text/javascript">
+        //layui.use(['form', 'layer', 'laydate'], function () {
+        //    form = layui.form;
+        //
+        //    form.on('select(Type)', function (data) {
+        //        var data = $("#Type").val();
+        //        getInspectionForms(data);
+        //    });
+        //
+        //});
+        hg.form.onsubmit('asubmit', function (data) {
+            tt();
+            //table && table.reload(data);
+        });
+        //通过行tool编辑，lay-event="show"
+        function show(obj) {
+            layui.use('layer', function () {
+                var layer = layui.layer;
+                layer.open({
+                type: 2,
+                title: '預覽文件',
+                shadeClose: true,//点击遮罩关闭层
+                shade: 0.8,
+                area: ['90%', '90%'],
+                content: obj.data.filePath + obj.data.newName, //iframe的url
+                zIndex: 19891014,
+                //iframe: {
+                //    src:obj.data.filePath + obj.data.newName
+                //
+                //}
+                });
+            });
+
+        };
+        //通过行tool删除，lay-event="del"
+        function del(obj) {
+        if (obj.data.imageName) {
+            hg.confirm("圖片資料：" + obj.data.imageName + "，确定要删除吗？", function () {
+                $.ajax({
+                    url: '/REP/REP001D',
+                    data: { id: obj.data.imageName },
+                    type: 'POST',
+                    success: function (data) {
+                        if (data.success) {
+                            obj.del(); //只删本地数据
+                            hg.msghide("删除成功！");
+                        }
+                        else {
+                            hg.msg(data.msg);
+                        }
+                    },
+                    error: function () {
+                        hg.msg("网络请求失败！");
+                    }
+                });
+            });
+        }
+    }
+
+        @* SOP文件 sheet *@
+        var tableCols = [[
+            {
+                field: 'imageName',
+                title: '檔案名稱',
+                sort: true
+            },
+            {
+                field: 'createDate',
+                templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'right',
+                width: 80,
+                title: '操作',
+                align: 'center',
+                fixed: 'right',
+                templet: function (d) {
+                    return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" lay-event="show">預覽</a>'
+                }
+            }]
+        ];
+        //基本数据表格
+        var table;
+        $(function () {
+          //  tt();
+        });
+        function tt() {
+            //基本数据表格
+            table = hg.table.datatable('sop', '巡檢上傳文件', '/SPC/GetInspectionResultBlobsByQuery?id=' + @ViewBag.MasterID +'&itemID=' + @ViewBag.ItemID, {}, tableCols, false, 'full-100');
+        };
+
+        $(document).ready(function () {
+            var error = '@Html.ValidationMessage("error")';
+            if ($(error).text() != '') {
+                parent.hg.msg(error);
+            }
+        });
+
+</script>
+
+
+}
+

AMESCoreStudio.Web/Views/PCS/PCS024C.cshtml

@@ -23,7 +23,7 @@
             <input type="hidden" asp-for="SysType" value="I" />
 
             <div class="form-group form-inline my-sm-1">
-                <label class="control-label col-sm-3">製成單位</label>
+                <label class="control-label col-sm-3">製程單位</label>
                 <select name="aa" id="aa" asp-items="@ViewBag.FactoryUnitList" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>

AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json

@@ -32,6 +32,7 @@
       "AMESCoreStudio.Web/1.0.0": {
         "dependencies": {
           "AMESCoreStudio.WebApi": "1.0.0",
+          "ClosedXML": "0.95.4",
           "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "3.1.20",
           "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation": "3.1.3",
           "Microsoft.EntityFrameworkCore.Proxies": "5.0.8",
@@ -337,6 +338,49 @@
           "lib/netstandard1.5/Castle.Core.dll": {}
         }
       },
+      "ClosedXML/0.95.4": {
+        "dependencies": {
+          "DocumentFormat.OpenXml": "2.7.2",
+          "ExcelNumberFormat": "1.0.10",
+          "Microsoft.CSharp": "4.7.0",
+          "System.Drawing.Common": "4.7.0"
+        },
+        "runtime": {
+          "lib/netstandard2.0/ClosedXML.dll": {
+            "assemblyVersion": "0.95.4.0",
+            "fileVersion": "0.95.4.0"
+          }
+        },
+        "compile": {
+          "lib/netstandard2.0/ClosedXML.dll": {}
+        }
+      },
+      "DocumentFormat.OpenXml/2.7.2": {
+        "dependencies": {
+          "NETStandard.Library": "1.6.1",
+          "System.IO.Packaging": "4.0.0"
+        },
+        "runtime": {
+          "lib/netstandard1.3/DocumentFormat.OpenXml.dll": {
+            "assemblyVersion": "2.7.2.0",
+            "fileVersion": "2.7.2.0"
+          }
+        },
+        "compile": {
+          "lib/netstandard1.3/DocumentFormat.OpenXml.dll": {}
+        }
+      },
+      "ExcelNumberFormat/1.0.10": {
+        "runtime": {
+          "lib/netstandard2.0/ExcelNumberFormat.dll": {
+            "assemblyVersion": "1.0.10.0",
+            "fileVersion": "1.0.10.0"
+          }
+        },
+        "compile": {
+          "lib/netstandard2.0/ExcelNumberFormat.dll": {}
+        }
+      },
       "Microsoft.AspNetCore.Html.Abstractions/2.2.0": {
         "dependencies": {
           "System.Text.Encodings.Web": "4.5.0"
@@ -1821,6 +1865,9 @@
         "dependencies": {
           "Microsoft.NETCore.Platforms": "3.1.0",
           "Microsoft.Win32.SystemEvents": "4.7.0"
+        },
+        "compile": {
+          "ref/netcoreapp3.0/System.Drawing.Common.dll": {}
         }
       },
       "System.Dynamic.Runtime/4.3.0": {
@@ -1949,6 +1996,31 @@
           "System.Runtime": "4.3.0"
         }
       },
+      "System.IO.Packaging/4.0.0": {
+        "dependencies": {
+          "System.Collections": "4.3.0",
+          "System.Diagnostics.Debug": "4.3.0",
+          "System.Globalization": "4.3.0",
+          "System.IO": "4.3.0",
+          "System.IO.Compression": "4.3.0",
+          "System.IO.FileSystem": "4.3.0",
+          "System.IO.FileSystem.Primitives": "4.3.0",
+          "System.Resources.ResourceManager": "4.3.0",
+          "System.Runtime": "4.3.0",
+          "System.Runtime.Extensions": "4.3.0",
+          "System.Text.Encoding": "4.3.0",
+          "System.Xml.ReaderWriter": "4.3.0"
+        },
+        "runtime": {
+          "lib/netstandard1.3/System.IO.Packaging.dll": {
+            "assemblyVersion": "4.0.0.0",
+            "fileVersion": "1.0.24212.1"
+          }
+        },
+        "compile": {
+          "ref/netstandard1.3/System.IO.Packaging.dll": {}
+        }
+      },
       "System.Linq/4.3.0": {
         "dependencies": {
           "System.Collections": "4.3.0",
@@ -4202,6 +4274,27 @@
       "path": "castle.core/4.4.1",
       "hashPath": "castle.core.4.4.1.nupkg.sha512"
     },
+    "ClosedXML/0.95.4": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-YixFPzUJ4Ni2AaW/FbPgzFvdtjIzE/4NKROwI1RqIQHWka7QN9Spt4sHuXaSk9PLmXBkk8newHGW0UWLcLs5GA==",
+      "path": "closedxml/0.95.4",
+      "hashPath": "closedxml.0.95.4.nupkg.sha512"
+    },
+    "DocumentFormat.OpenXml/2.7.2": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-tWT7iu0ab9PNoMTWjv24rt+qnyqvcnPOYs167vPnk4aegAYSAxoUjwNW+VxY8xoLtJntQ/JlWTi7Vt+8TghLlQ==",
+      "path": "documentformat.openxml/2.7.2",
+      "hashPath": "documentformat.openxml.2.7.2.nupkg.sha512"
+    },
+    "ExcelNumberFormat/1.0.10": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-dRx817M5t0sv4GCJyAXU8qmhFXcqRpCHzLpxNmkMWTvzlfE0/KM7BNk6qEble0ffAr4xT7RyU7s/HpovVlA/9g==",
+      "path": "excelnumberformat/1.0.10",
+      "hashPath": "excelnumberformat.1.0.10.nupkg.sha512"
+    },
     "Microsoft.AspNetCore.Html.Abstractions/2.2.0": {
       "type": "package",
       "serviceable": true,
@@ -5084,6 +5177,13 @@
       "path": "system.io.filesystem.primitives/4.3.0",
       "hashPath": "system.io.filesystem.primitives.4.3.0.nupkg.sha512"
     },
+    "System.IO.Packaging/4.0.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-taPqPWcAj/h6e/c+zIWIVe1ddJtpV6acC6g9GpolxUcIwUaH6zc0ZbFS8kkVzBkuWv76pMalKeTzfmHtfT1pXA==",
+      "path": "system.io.packaging/4.0.0",
+      "hashPath": "system.io.packaging.4.0.0.nupkg.sha512"
+    },
     "System.Linq/4.3.0": {
       "type": "package",
       "serviceable": true,

AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml

@@ -14254,6 +14254,11 @@
             狀態
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.BAS.MaterialFlow.MaterialFlowRemark">
+            <summary>
+            狀態
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.BAS.MaterialFlow.CreateUserID">
             <summary>
             創建者ID

AMESCoreStudio.WebApi/Models/BAS/MaterialFlow.cs

@@ -67,6 +67,13 @@ namespace AMESCoreStudio.WebApi.Models.BAS
         [DataMember]
         public string MaterialFlowStatus { get; set; }
 
+        /// <summary>
+        /// 狀態
+        /// </summary>
+        [Column("MATERIAL_FLOW_REMARK")]
+        [Display(Name = "流程備註")]
+        [DataMember]
+        public string MaterialFlowRemark { get; set; }
 
         /// <summary>
         /// 料號作業流程

AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml

@@ -14254,6 +14254,11 @@
             狀態
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.BAS.MaterialFlow.MaterialFlowRemark">
+            <summary>
+            狀態
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.BAS.MaterialFlow.CreateUserID">
             <summary>
             創建者ID