1. 修正工單查詢畫面

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -985,6 +985,18 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(new Table() { count = 0, data = null });
         }
 
+        [HttpPost]
+        public async Task<JsonResult> getPLMMeterial(string value)
+        {
+            var result = await _pcsApi.GetPlmMeterialInfo(value);
+            //将数据Json化并传到前台视图
+            if (result == null)
+                return Json(new { data = "" });
+            else
+
+                return Json(new { data = result.MeterialDesc });
+        }
+
         #region PCS001 工單資料維護
         public async Task<IActionResult> PCS001(WipDataViewModel model = null)
         {

AMESCoreStudio.Web/Controllers/SYSController.cs

@@ -220,43 +220,6 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(new Table() { count = 0, data = null });
         }
 
-        #region Ray 維修測試
-        //新增頁面
-        public IActionResult SYS001T()
-        {
-            return View();
-        }
-
-        [HttpPost]
-        public async Task<IActionResult> SYS001TAsync(SystemInfo model)
-        {
-            var x = new BarCodeCheckDto
-            {
-                wipNo = "WO0002A1",
-                barcode = "WO0002A10006",
-                barcodeType = "S",
-                station = 1017,
-                line = 1001,
-                unitNo = "B",
-                inputItems = new List<BarCodeCheckDto.inputItem> {
-                    new BarCodeCheckDto.inputItem
-                    {
-                        inputType = "KP",
-                        inputData = "CPUSN199",
-                        oldInputData = "CPUSN103"
-                    },
-                    new BarCodeCheckDto.inputItem
-                    {
-                        inputType = "KP",
-                        inputData = "RAMSN293",
-                        oldInputData = "RAMSN203"
-                    } }
-            };
-
-            var aa = await _pcsApi.PassIngByCheck(JsonConvert.SerializeObject(x));
-            return Ok(aa);
-        }
-        #endregion 
         #endregion
 
         #region SYS002模组资料维护相关

AMESCoreStudio.Web/Views/PCS/PCS003.cshtml

@@ -632,10 +632,10 @@
                                     <select asp-for="wipSystem.BiosType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Bios" autocomplete="off" />
+                                    <input class="layui-input" style="text-transform:uppercase;" asp-for="wipSystem.Bios" onchange="getPLMMeterial(this)" autocomplete="off" />
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Bios" autocomplete="off" />
+                                    <input class="layui-input" asp-for="wipSystem.Bios_Desc" readonly="readonly" />
                                 </div>
                                 <label class="layui-form-label">Ver.</label>
                                 <div class="layui-input-inline" style="width:80px;">
@@ -655,10 +655,10 @@
                                     <select asp-for="wipSystem.ECType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Ec" autocomplete="off" />
+                                    <input class="layui-input" style="text-transform:uppercase;" asp-for="wipSystem.Ec" onchange="getPLMMeterial(this)" autocomplete="off" />
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Ec" autocomplete="off" />
+                                    <input class="layui-input" asp-for="wipSystem.Ec_Desc" readonly="readonly" />
                                 </div>
                             </div>
                         </div>
@@ -670,10 +670,10 @@
                                     <select asp-for="wipSystem.FWType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Fw" autocomplete="off" />
+                                    <input class="layui-input" style="text-transform:uppercase;" asp-for="wipSystem.Fw" onchange="getPLMMeterial(this)" autocomplete="off" />
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Fw" autocomplete="off" />
+                                    <input class="layui-input" asp-for="wipSystem.Fw_Desc" readonly="readonly" />
                                 </div>
                             </div>
                         </div>
@@ -685,10 +685,10 @@
                                     <select asp-for="wipSystem.FW1Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Fw1" autocomplete="off" />
+                                    <input class="layui-input" asp-for="wipSystem.Fw1" onchange="getPLMMeterial(this)" style="text-transform:uppercase;" autocomplete="off" />
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Fw1" autocomplete="off" />
+                                    <input class="layui-input" asp-for="wipSystem.Fw1_Desc" readonly="readonly" />
                                 </div>
                             </div>
                         </div>
@@ -700,10 +700,10 @@
                                     <select asp-for="wipSystem.FW2Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Fw2" autocomplete="off" />
+                                    <input class="layui-input" asp-for="wipSystem.Fw2" onchange="getPLMMeterial(this)" style="text-transform:uppercase;" autocomplete="off" />
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Fw2" autocomplete="off" />
+                                    <input class="layui-input" asp-for="wipSystem.Fw2_Desc" readonly="readonly" />
                                 </div>
                             </div>
                         </div>
@@ -715,7 +715,10 @@
                                     <select asp-for="wipSystem.OsType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.OsVer" autocomplete="off" />
+                                    <input class="layui-input" asp-for="wipSystem.OsVer" onchange="getPLMMeterial(this)" style="text-transform:uppercase;" autocomplete="off" />
+                                </div>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" asp-for="wipSystem.Os_Desc" readonly="readonly" />
                                 </div>
                             </div>
                         </div>
@@ -848,7 +851,6 @@
 @section Scripts {
 
     <script type="text/javascript">
-
         $(document).ready(function () {
             if ($("#unitNo").val() == "B" || $("#unitNo").val() == "P" || $("#unitNo").val() == "T") {
                  $("#system").show();
@@ -960,6 +962,24 @@
                 });
         };
 
+        //
+        function getPLMMeterial(val) {
+               $.ajax(
+                {
+                    url: "@Url.Action("getPLMMeterial", "PCS")",
+                    dataType: 'json',
+                       data: { "value": val.value},
+                    type: 'post',
+                    success: function (result)
+                    {
+                        $(val).closest('div.layui-inline').find('input[id*=' + val.id + '_Desc]').val(result.data);
+                    },
+                    error: function (result)
+                    {
+                        alert(result);
+                    }
+                });
+        };
 
         var tableCols = [[
             {

AMESCoreStudio.Web/Views/PCS/PCS005.cshtml

@@ -51,7 +51,7 @@
                 </div>
             </div>
         </div>
-        <table class="layui-hide" id="test" lay-filter="test"></table>
+        <table class="layui-hide" id="Query" lay-filter="Query"></table>
     </div>
 </div>
 
@@ -64,35 +64,64 @@
         var tableCols = [[
             {
                 field: 'wipNO',
-                width: 200,
+                width: 100,
                 title: '工單號碼',
                 sort: true
             },
             {
                 field: 'itemNO',
                 title: '料號',
-                width: 200,
+                width: 150,
                 sort: true
             },
+            {
+                field: 'description',
+                title: '品名',
+                width: 100,
+            },
+            {
+                field: 'planQTY',
+                title: '數量'
+            },
             {
                 field: 'lineDesc',
                 title: '線別',
-                width: 200,
                 sort: true
             },
             {
                 field: 'unitName',
                 title: '生產單位',
-                width: 200,
+                width: 100,
                 sort: true
             },
             {
-                field: 'planQTY',
+                field: 'factoryNameCh',
-                title: '工單數'
+                title: '委外廠名稱',
+                sort: true
+            },
+            {
+                field: 'wipScheduleDate',
+                title: '預計開工日',
+                sort: true,
+                templet: '<div>{{ layui.util.toDateString(d.wipScheduleDate, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'a',
+                title: '開工日'
+            },
+            {
+                field: 'wipDueDate',
+                title: '預計完成日',
+                sort: true,
+                templet: '<div>{{ layui.util.toDateString(d.wipDueDate, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'a',
+                title: '檢驗完成日'
             },
             {
                 field: 'right',
-                width: 200,
+                width: 120,
                 title: '操作',
                 fixed: 'right',
                 templet: function (d) {
@@ -128,6 +157,6 @@
         }
         ];
         //基本数据表格
-        var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/PCS005Query', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        var table = hg.table.datatable('Query', '工單資料查詢', '/PCS/PCS005Query', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
     </script>
 }

AMESCoreStudio.Web/Views/PCS/PCS006.cshtml

@@ -204,7 +204,8 @@
             },
             {
                 field: 'createDate',
-                title: '開工日期'
+                title: '開工日期',
+                templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>'
             }
             , { field: 'onOff', title: 'OFF/ON', width: 120, templet: '#switchTpl', unresize: true }
             , { field: 'activeStop', title: 'Active/Stop', width: 120, templet: '#checkboxTpl', unresize: true }

AMESCoreStudio.Web/Views/SYS/SYS001C.cshtml

@@ -12,7 +12,7 @@
 
 <div class="row">
     <div class="col-sm-12">
-        <form enctype="multipart/form-data" method="post" asp-action="SYS001T">
+        <form enctype="multipart/form-data" method="post" asp-action="SYS001Save">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="SystemNo" class="control-label col-sm-3"></label>

AMESCoreStudio.Web/Views/SYS/SYS001T.cshtml

@@ -1,40 +0,0 @@
-@model AMESCoreStudio.WebApi.Models.SYS.SystemInfo
-
-
-@{ ViewData["Title"] = "SYS001C";
-    Layout = "~/Views/Shared/_FormLayout.cshtml"; }
-
-<style>
-    .control-label {
-        justify-content: flex-end !important;
-    }
-</style>
-
-<div class="row">
-    <div class="col-sm-12">
-        <form enctype="multipart/form-data" method="post" asp-action="SYS001T">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
-        <div class="form-group">
-            <input type="submit" value="保存" class="btn btn-primary offset-sm-3" />
-        </div>
-
-        </form>
-</div>
-</div>
-
-@section Scripts {
-    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
-        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
-
-    <script type="text/javascript">
-        $(document).ready(function () {
-            var error = '@Html.ValidationMessage("error")';
-            if ($(error).text() != '') {
-                parent.hg.msg(error);
-            }
-        });
-    </script>
-
-
-}

AMESCoreStudio.Web/Views/Shared/_AMESLayout.cshtml

@@ -16,6 +16,7 @@
     <link rel="stylesheet" href="~/lib/Scrollbar/jquery.scrollbar.css">
     <link rel='stylesheet' href='~/lib/nprogress/nprogress.css' />
     <link rel="stylesheet" href="~/css/style.css" asp-append-version="true">
+    <link href="~/css/layuiAutocomplete.css" rel="stylesheet" />
 
     <!-- 让IE8/9支持媒体查询，从而兼容栅格 -->
     <!--[if lt IE 9]>
@@ -35,6 +36,13 @@
 
     <!-- 业务公共方法 -->
     <script src="~/js/site.js" asp-append-version="true"></script>
+    <script>
+        layui.config({
+            base: '~/js/layAutoComplete.js' //假设这是test.js所在的目录
+        }).extend({ //设定模块别名
+            autocomplete: 'layAutoComplete'
+        });
+    </script>
     @RenderSection("Scripts", required: false)
 </body>
 </html>

AMESCoreStudio.Web/wwwroot/css/layuiAutocomplete.css

@@ -0,0 +1,15 @@
+.layui-autocomplete-item {
+    padding: 5px;
+    cursor: pointer;
+}
+
+    .layui-autocomplete-item:hover,
+    .layui-autocomplete-active {
+        background-color: #5FB878;
+        color: white
+    }
+
+.layui-input:disabled {
+    background: #eee;
+    cursor: not-allowed;
+}

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -112,6 +112,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     join q2 in _context.WipAtts on q1.WipNO equals q2.WipNO
                     join q3 in _context.LineInfoes on q1.LineID equals q3.LineID
                     join q4 in _context.FactoryUnits on q1.UnitNO equals q4.UnitNo
+                    join q5 in _context.FactoryInfos on  q1.Werks equals q5.FactoryID.ToString()
+                    //join q6 in _context.MaterialItems on q2.ItemNO equals q6.ItemNo
                     select new
                     {
                         q1.WipID,
@@ -120,6 +122,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         q1.UnitNO,
                         q1.LineID,
                         q1.StatusNO,
+                        q1.WipScheduleDate,
+                        q1.WipDueDate,
+                        q5.FactoryNameCh,
+                        q1.Description,
                         q1.CreateDate,
                         q2.ItemNO,
                         q3.LineDesc,

AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs

@@ -288,6 +288,53 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         public DateTime UpdateDate { get; set; } = System.DateTime.Now;
 
+        /// <summary>
+        /// PowerMode_Desc
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        public string PowerMode_Desc { get; set; }
+
+        /// <summary>
+        /// BIOS_Desc
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        public string Bios_Desc { get; set; }
+
+        /// <summary>
+        /// EC_Desc
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        public string Ec_Desc { get; set; }
+
+        /// <summary>
+        /// FW_Desc
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        public string Fw_Desc { get; set; }
 
+        /// <summary>
+        /// FW1_Desc
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        public string Fw1_Desc { get; set; }
+
+        /// <summary>
+        /// FW2_Desc
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        public string Fw2_Desc { get; set; }
+
+        /// <summary>
+        /// OS_Desc
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        public string Os_Desc { get; set; }
     }
 }