From 054d3085516644c58f429d18094d595fd85dc951 Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Sun, 22 May 2022 23:02:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=89=8D=E5=88=A4=E7=B6=AD?=
 =?UTF-8?q?=E4=BF=AE=E8=BC=B8=E5=85=A5=202.=E4=BF=AE=E6=94=B9=E5=BE=8C?=
 =?UTF-8?q?=E5=88=A4=E7=B6=AD=E4=BF=AE=E8=BC=B8=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Views/REP/REP001R.cshtml   | 40 +++++++++----------
 AMESCoreStudio.Web/Views/REP/REP002R.cshtml   | 38 +++++++++---------
 .../Models/AMES/NgComponent.cs                |  4 +-
 AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs |  4 +-
 .../Models/AMES/RepairRecord.cs               |  1 -
 5 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/AMESCoreStudio.Web/Views/REP/REP001R.cshtml b/AMESCoreStudio.Web/Views/REP/REP001R.cshtml
index 209d5e18..eab107ef 100644
--- a/AMESCoreStudio.Web/Views/REP/REP001R.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP001R.cshtml
@@ -229,6 +229,25 @@
                     </div>
                 </div>
             </div>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="color:red">維修記錄過程</label>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="repairRecord.RepairDesc" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="repairRecord.RepairDesc" class="layui-input" autocomplete="off" style="width:810px;" />
+                        <span asp-validation-for="repairRecord.RepairDesc" class="layui-bg-red"></span>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="color:red">維修資料輸入</label>
+                </div>
+            </div>
             <div class="layui-form-item">
                 <div class="layui-inline">
                     <label asp-for="ngComponent.KeyNo" class="layui-form-label"></label>
@@ -249,25 +268,6 @@
 
                 </div>
             </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label" style="color:red">維修記錄過程</label>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label asp-for="repairRecord.RepairDesc" class="layui-form-label"></label>
-                    <div class="layui-input-inline">
-                        <input asp-for="repairRecord.RepairDesc" class="layui-input" autocomplete="off" style="width:810px;" />
-                        <span asp-validation-for="repairRecord.RepairDesc" class="layui-bg-red"></span>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label" style="color:red">維修資料輸入</label>
-                </div>
-            </div>
             <div class="layui-form-item">
                 <div class="layui-inline">
                     <label asp-for="ngRepair.Missing" class="layui-form-label"></label>
@@ -348,7 +348,7 @@
             <div style="text-align:center">
                 <div class="layui-inline">
                     <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
-                    
+
                     <button id="btnOK" type="button" class="layui-btn" lay-submit lay-filter="*">確認</button>
                 </div>
             </div>
diff --git a/AMESCoreStudio.Web/Views/REP/REP002R.cshtml b/AMESCoreStudio.Web/Views/REP/REP002R.cshtml
index ca83b9d4..9fe516b5 100644
--- a/AMESCoreStudio.Web/Views/REP/REP002R.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP002R.cshtml
@@ -229,6 +229,25 @@
                     </div>
                 </div>
             </div>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="color:red">維修記錄過程</label>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="repairRecord.RepairDesc" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="repairRecord.RepairDesc" class="layui-input" autocomplete="off" style="width:810px;" />
+                        <span asp-validation-for="repairRecord.RepairDesc" class="layui-bg-red"></span>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label" style="color:red">維修資料輸入</label>
+                </div>
+            </div>
             <div class="layui-form-item">
                 <div class="layui-inline">
                     <label asp-for="ngComponent.KeyNo" class="layui-form-label"></label>
@@ -249,25 +268,6 @@
 
                 </div>
             </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label" style="color:red">維修記錄過程</label>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label asp-for="repairRecord.RepairDesc" class="layui-form-label"></label>
-                    <div class="layui-input-inline">
-                        <input asp-for="repairRecord.RepairDesc" class="layui-input" autocomplete="off" style="width:810px;" />
-                        <span asp-validation-for="repairRecord.RepairDesc" class="layui-bg-red"></span>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label" style="color:red">維修資料輸入</label>
-                </div>
-            </div>
             <div class="layui-form-item">
                 <div class="layui-inline">
                     <label asp-for="ngRepair.Missing" class="layui-form-label"></label>
diff --git a/AMESCoreStudio.WebApi/Models/AMES/NgComponent.cs b/AMESCoreStudio.WebApi/Models/AMES/NgComponent.cs
index 54c93cd8..a30271ba 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/NgComponent.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/NgComponent.cs
@@ -61,12 +61,12 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public string NgNo { get; set; }
 
         /// <summary>
-        /// 異常描述
+        /// 不良原因描述
         /// </summary>
         [Column("ERROR_DESC")]
         [StringLength(300)]
         [DataMember]
-        [Display(Name = "異常描述")]
+        [Display(Name = "不良原因描述")]
         public string ErrorDesc { get; set; }
 
         /// <summary>
diff --git a/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs b/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs
index 468c226d..347a5e40 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs
@@ -107,13 +107,13 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public string RmaNo { get; set; }
 
         /// <summary>
-        /// 維修方式
+        /// 維修方式代碼
         /// </summary>
         [Required]
         [Column("REPAIR_TYPE_NO")]
         [StringLength(6)]
         [DataMember]
-        [Display(Name = "維修方式")]
+        [Display(Name = "維修方式代碼")]
         public string RepairTypeNo { get; set; }
 
         /// <summary>
diff --git a/AMESCoreStudio.WebApi/Models/AMES/RepairRecord.cs b/AMESCoreStudio.WebApi/Models/AMES/RepairRecord.cs
index c902e52d..9e579308 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/RepairRecord.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/RepairRecord.cs
@@ -33,7 +33,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 維修過程敘述
         /// </summary>
-        [Required]
         [Column("REPAIR_DESC")]
         [StringLength(100)]
         [Display(Name = "維修過程敘述")]