1.修改REP001調整維修介面UI

2.修改REP002調整維修介面UI
2 years ago · 740602f78a
9 changed files with 124 additions and 46 deletions
--- a/AMESCoreStudio.Web/Controllers/REPController.cs
+++ b/AMESCoreStudio.Web/Controllers/REPController.cs
@ -324,7 +324,7 @@ namespace AMESCoreStudio.Web.Controllers
                model.ngReason = ng_reason[0];
            }

-            if (result1[0].ErrorDesc == "")
+            if (result1[0].ErrorDesc == "" || result1[0].ErrorDesc == null)
            {
                result1[0].ErrorDesc = ng_reason[0].NGReasonDesc;
            }
@ -693,7 +693,7 @@ namespace AMESCoreStudio.Web.Controllers
                model.ngReason = ng_reason[0];
            }

-            if (result1[0].ErrorDesc == "")
+            if (result1[0].ErrorDesc == "" || result1[0].ErrorDesc == null)
            {
                result1[0].ErrorDesc = ng_reason[0].NGReasonDesc;
            }
--- a/AMESCoreStudio.Web/Views/REP/REP001.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP001.cshtml
@ -96,7 +96,15 @@
            {
                field: 'status',
                width: 120,
-                title: '處理狀態'
+                title: '處理狀態',
+                templet: function (d) {
+                    if (d.status == 0)
+                        return '未維修'
+                    if (d.status == 1)
+                        return '已維修'
+                    if (d.status == 2)
+                        return '誤判'
+                }
            },
            {
                field: 'right',
--- a/AMESCoreStudio.Web/Views/REP/REP001R.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP001R.cshtml
@ -231,7 +231,7 @@
            </div>
            <div class="layui-form-item">
                <div class="layui-inline">
-                    <label class="layui-form-label" style="color:red">維修記錄過程</label>
+                    <label class="layui-form-label" style="color:red">歷史維修記錄</label>
                </div>
            </div>
            <div class="layui-form-item">
@ -256,22 +256,32 @@
                        <label for="Yes">&nbsp;是&nbsp;</label>
                        <input type="radio" id="N" asp-for="ngRepair.Missing" value="N" class="layui-input" />
                        <label for="No">&nbsp;否&nbsp;</label>
+                        <span asp-validation-for="ngRepair.Missing" class="layui-bg-red"></span>
+                    </div>
+                    <label asp-for="ngComponent.LocationNo" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="ngComponent.LocationNo" class="layui-input" autocomplete="off" />
+                        <span asp-validation-for="ngComponent.LocationNo" class="layui-bg-red"></span>
+                    </div>
+                    <label asp-for="ngRepair.PartNo" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="ngRepair.PartNo" class="layui-input" autocomplete="off" />
+                        <span asp-validation-for="ngRepair.PartNo" class="layui-bg-red"></span>
                    </div>
-                    <span asp-validation-for="ngRepair.Missing" class="layui-bg-red"></span>
                </div>
            </div>
            <div class="layui-form-item">
                <div class="layui-inline">
-                    <label asp-for="ngComponent.KeyNo" class="layui-form-label"></label>
-                    <div class="layui-input-inline">
-                        <input asp-for="ngComponent.KeyNo" class="layui-input" autocomplete="off" />
-                        <span asp-validation-for="ngComponent.KeyNo" class="layui-bg-red"></span>
-                    </div>
                    <label asp-for="ngComponent.OldPartNo" class="layui-form-label"></label>
                    <div class="layui-input-inline">
                        <input asp-for="ngComponent.OldPartNo" class="layui-input" autocomplete="off" />
                        <span asp-validation-for="ngComponent.OldPartNo" class="layui-bg-red"></span>
                    </div>
+                    <label asp-for="ngComponent.KeyNo" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="ngComponent.KeyNo" class="layui-input" autocomplete="off" />
+                        <span asp-validation-for="ngComponent.KeyNo" class="layui-bg-red"></span>
+                    </div>
                    <label asp-for="ngComponent.NewPartNo" class="layui-form-label"></label>
                    <div class="layui-input-inline">
                        <input asp-for="ngComponent.NewPartNo" class="layui-input" autocomplete="off" />
@ -308,16 +318,13 @@
                        <select id="responsible" lay-filter="responsible" lay-verify="required" asp-for="ngRepair.RepairResponsibleID" asp-items="@ViewBag.RepairResponsibleUnitList" class=""></select>
                        <span asp-validation-for="ngRepair.RepairResponsibleID" class="layui-bg-red"></span>
                    </div>
-                    <label asp-for="ngRepair.RmaNo" class="layui-form-label"></label>
-                    <div class="layui-input-inline">
-                        <input asp-for="ngRepair.RmaNo" class="layui-input" autocomplete="off" />
-                        <span asp-validation-for="ngRepair.RmaNo" class="layui-bg-red"></span>
-                    </div>
-                    <label asp-for="ngRepair.PartNo" class="layui-form-label"></label>
-                    <div class="layui-input-inline">
-                        <input asp-for="ngRepair.PartNo" class="layui-input" autocomplete="off" />
-                        <span asp-validation-for="ngRepair.PartNo" class="layui-bg-red"></span>
-                    </div>
+                    <!--
+    <label asp-for="ngRepair.RmaNo" class="layui-form-label"></label>
+    <div class="layui-input-inline">
+        <input asp-for="ngRepair.RmaNo" class="layui-input" autocomplete="off" />
+        <span asp-validation-for="ngRepair.RmaNo" class="layui-bg-red"></span>
+    </div>
+    -->
                </div>
            </div>
            <div class="layui-form-item">
--- a/AMESCoreStudio.Web/Views/REP/REP001V.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP001V.cshtml
@ -95,31 +95,46 @@
        var tableCols = [[
            {
                field: 'componentID',
-                width: 150,
+                width: 120,
                title: '不良零件ID',
                sort: true
            },
            {
                field: 'locationNo',
                title: '零件位置代碼',
-                width: 200,
+                width: 120,
                sort: true
            },
            {
                field: 'pinQty',
                title: '不良腳位數量',
+                width: 120,
                sort: true
            },
            {
                field: 'ngNo',
                title: '不良原因代碼',
+                width: 120,
+                sort: true
+            },
+            {
+                field: 'errorDesc',
+                title: '不良原因描述',
                sort: true
            },
            {
                field: 'status',
                title: '狀態',
                width: 100,
-                sort: true
+                sort: true,
+                templet: function (d) {
+                    if (d.status == 0)
+                        return '未維修'
+                    if (d.status == 1)
+                        return '已維修'
+                    if (d.status == 2)
+                        return '誤判'
+                }
            },
            {
                field: 'createDate',
--- a/AMESCoreStudio.Web/Views/REP/REP002.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP002.cshtml
@ -96,7 +96,15 @@
            {
                field: 'status',
                width: 120,
-                title: '處理狀態'
+                title: '處理狀態',
+                templet: function (d) {
+                    if (d.status == 0)
+                        return '未維修'
+                    if (d.status == 1)
+                        return '已維修'
+                    if (d.status == 2)
+                        return '誤判'
+                }
            },
            {
                field: 'right',
--- a/AMESCoreStudio.Web/Views/REP/REP002R.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP002R.cshtml
@ -231,7 +231,7 @@
            </div>
            <div class="layui-form-item">
                <div class="layui-inline">
-                    <label class="layui-form-label" style="color:red">維修記錄過程</label>
+                    <label class="layui-form-label" style="color:red">歷史維修記錄</label>
                </div>
            </div>
            <div class="layui-form-item">
@ -256,22 +256,33 @@
                        <label for="Yes">&nbsp;是&nbsp;</label>
                        <input type="radio" id="N" asp-for="ngRepair.Missing" value="N" class="layui-input" />
                        <label for="No">&nbsp;否&nbsp;</label>
+                        <span asp-validation-for="ngRepair.Missing" class="layui-bg-red"></span>
+                    </div>
+                    <label asp-for="ngComponent.LocationNo" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="ngComponent.LocationNo" class="layui-input" autocomplete="off" />
+                        <span asp-validation-for="ngComponent.LocationNo" class="layui-bg-red"></span>
+                    </div>
+                    <label asp-for="ngRepair.PartNo" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="ngRepair.PartNo" class="layui-input" autocomplete="off" />
+                        <span asp-validation-for="ngRepair.PartNo" class="layui-bg-red"></span>
                    </div>
-                    <span asp-validation-for="ngRepair.Missing" class="layui-bg-red"></span>
                </div>
            </div>
            <div class="layui-form-item">
                <div class="layui-inline">
-                    <label asp-for="ngComponent.KeyNo" class="layui-form-label"></label>
-                    <div class="layui-input-inline">
-                        <input asp-for="ngComponent.KeyNo" class="layui-input" autocomplete="off" />
-                        <span asp-validation-for="ngComponent.KeyNo" class="layui-bg-red"></span>
-                    </div>
                    <label asp-for="ngComponent.OldPartNo" class="layui-form-label"></label>
                    <div class="layui-input-inline">
                        <input asp-for="ngComponent.OldPartNo" class="layui-input" autocomplete="off" />
                        <span asp-validation-for="ngComponent.OldPartNo" class="layui-bg-red"></span>
                    </div>
+                    <label asp-for="ngComponent.KeyNo" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="ngComponent.KeyNo" class="layui-input" autocomplete="off" />
+                        <span asp-validation-for="ngComponent.KeyNo" class="layui-bg-red"></span>
+                    </div>
+
                    <label asp-for="ngComponent.NewPartNo" class="layui-form-label"></label>
                    <div class="layui-input-inline">
                        <input asp-for="ngComponent.NewPartNo" class="layui-input" autocomplete="off" />
@ -308,16 +319,13 @@
                        <select id="responsible" lay-filter="responsible" lay-verify="required" asp-for="ngRepair.RepairResponsibleID" asp-items="@ViewBag.RepairResponsibleUnitList" class=""></select>
                        <span asp-validation-for="ngRepair.RepairResponsibleID" class="layui-bg-red"></span>
                    </div>
-                    <label asp-for="ngRepair.RmaNo" class="layui-form-label"></label>
-                    <div class="layui-input-inline">
-                        <input asp-for="ngRepair.RmaNo" class="layui-input" autocomplete="off" />
-                        <span asp-validation-for="ngRepair.RmaNo" class="layui-bg-red"></span>
-                    </div>
-                    <label asp-for="ngRepair.PartNo" class="layui-form-label"></label>
-                    <div class="layui-input-inline">
-                        <input asp-for="ngRepair.PartNo" class="layui-input" autocomplete="off" />
-                        <span asp-validation-for="ngRepair.PartNo" class="layui-bg-red"></span>
-                    </div>
+                    <!--
+    <label asp-for="ngRepair.RmaNo" class="layui-form-label"></label>
+    <div class="layui-input-inline">
+        <input asp-for="ngRepair.RmaNo" class="layui-input" autocomplete="off" />
+        <span asp-validation-for="ngRepair.RmaNo" class="layui-bg-red"></span>
+    </div>
+    -->
                </div>
            </div>
            <div class="layui-form-item">
--- a/AMESCoreStudio.Web/Views/REP/REP002V.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP002V.cshtml
@ -99,31 +99,46 @@
        var tableCols = [[
            {
                field: 'componentID',
-                width: 150,
+                width: 120,
                title: '不良零件ID',
                sort: true
            },
            {
                field: 'locationNo',
                title: '零件位置代碼',
-                width: 200,
+                width: 120,
                sort: true
            },
            {
                field: 'pinQty',
                title: '不良腳位數量',
+                width: 120,
                sort: true
            },
            {
                field: 'ngNo',
                title: '不良原因代碼',
+                width: 120,
+                sort: true
+            },
+            {
+                field: 'errorDesc',
+                title: '不良原因描述',
                sort: true
            },
            {
                field: 'status',
                title: '狀態',
                width: 100,
-                sort: true
+                sort: true,
+                templet: function (d) {
+                    if (d.status == 0)
+                        return '未維修'
+                    if (d.status == 1)
+                        return '已維修'
+                    if (d.status == 2)
+                        return '誤判'
+                }
            },
            {
                field: 'createDate',
--- a/AMESCoreStudio.WebApi/Controllers/AMES/NgComponentsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/NgComponentsController.cs
@ -86,6 +86,23 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
            {
                var ngComponent = await q.ToListAsync();

+                if (ngComponent.Count > 0)
+                {
+                    if (ngComponent[0].ErrorDesc == "" || ngComponent[0].ErrorDesc == null)
+                    {
+                        IQueryable<NGReason> q1 = _context.NGReasons;
+
+                        q1 = q1.Where(p => p.NGReasonNo.Equals(ngComponent[0].NgNo));
+
+                        var ng_reason = await q1.ToListAsync();
+
+                        if (ng_reason.Count > 0)
+                        {
+                            ngComponent[0].ErrorDesc = ng_reason[0].NGReasonDesc;
+                        }
+                    }
+                }
+
                if (ngComponent == null)
                {
                    return NotFound();
--- a/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs
@ -88,13 +88,13 @@ namespace AMESCoreStudio.WebApi.Models.AMES
        public string Memo { get; set; }

        /// <summary>
-        /// 組件料號
+        /// 維修料號
        /// </summary>
        [Required]
        [Column("PART_NO")]
        [StringLength(30)]
        [DataMember]
-        [Display(Name = "組件料號")]
+        [Display(Name = "維修料號")]
        public string PartNo { get; set; }

        /// <summary>