From e953c8bb4f6a67129f18bf42b6568e14d4c43720 Mon Sep 17 00:00:00 2001
From: ray <newkyonew@hotmail.com>
Date: Wed, 22 Mar 2023 00:03:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E7=B5=84=E4=BB=B6=E4=BB=A3=E7=A2=BC?=
 =?UTF-8?q?=E7=B6=AD=E8=AD=B7=20=E5=8A=A0=E5=85=A5=E7=8B=80=E6=85=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=9B=B8=E9=97=9C=E7=B5=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=A2=BC=E4=B8=8B=E6=8B=89=E9=81=B8=E5=96=AE=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=8F=AA=E6=8A=93=E5=95=9F=E7=94=A8=E7=8B=80=E6=85=8B?=
 =?UTF-8?q?=202.=20=E8=A8=AD=E5=82=99=E9=80=81=E4=BF=AE/=E5=A0=B1=E5=BB=A2?=
 =?UTF-8?q?=20=E6=9F=A5=E8=A9=A2=E7=95=AB=E9=9D=A2=E6=AC=84=E4=BD=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PCSController.cs              |  9 +++++++++
 AMESCoreStudio.Web/Views/JIG/JIG006.cshtml    |  2 +-
 AMESCoreStudio.Web/Views/KCS/KCS006.cshtml    | 13 ++++++++++++
 AMESCoreStudio.Web/Views/KCS/KCS006U.cshtml   | 20 +++++++++++++++++--
 AMESCoreStudio.WebApi/Models/AMES/Items.cs    |  9 +++++++++
 5 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index e646815d..3d4d33ef 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -382,6 +382,9 @@ namespace AMESCoreStudio.Web.Controllers
         {
             var result = await _pcsApi.GetItems();
 
+            // 只有狀態是啟用的
+            result = result.Where(w => w.StatusNo == "A").ToList();
+
             var ItemsList = new List<SelectListItem>();
             ItemsList.Add(new SelectListItem("請選擇", ""));
             for (int i = 0; i < result.Count; i++)
@@ -890,6 +893,9 @@ namespace AMESCoreStudio.Web.Controllers
         {
             var result = await _kcsApi.GetItems();
 
+            // 只有狀態是啟用的
+            result = result.Where(w => w.StatusNo == "A").ToList();
+
             var Items = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
             {
@@ -1208,6 +1214,9 @@ namespace AMESCoreStudio.Web.Controllers
         {
             var result = await _kcsApi.GetItems();
 
+            // 只有狀態是啟用的
+            result = result.Where(w => w.StatusNo == "A").ToList();
+
             var KpItems = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
             {
diff --git a/AMESCoreStudio.Web/Views/JIG/JIG006.cshtml b/AMESCoreStudio.Web/Views/JIG/JIG006.cshtml
index efccbf44..356a185c 100644
--- a/AMESCoreStudio.Web/Views/JIG/JIG006.cshtml
+++ b/AMESCoreStudio.Web/Views/JIG/JIG006.cshtml
@@ -86,7 +86,7 @@
             },
             {
                 field: 'statusNo',
-                title: '狀態',
+                title: '是否有效',
                 templet: function (d) {
                     var btn ;
                     if (d.statusNo == "A")
diff --git a/AMESCoreStudio.Web/Views/KCS/KCS006.cshtml b/AMESCoreStudio.Web/Views/KCS/KCS006.cshtml
index 7de03713..ade610e1 100644
--- a/AMESCoreStudio.Web/Views/KCS/KCS006.cshtml
+++ b/AMESCoreStudio.Web/Views/KCS/KCS006.cshtml
@@ -46,6 +46,19 @@
                 width: 200,
                 title: '組件區間管控'
             },
+            {
+                field: 'statusNo',
+                width: 100,
+                title: '狀態',
+                templet: function (d) {
+                    var str;
+                    if (d.statusNo == "A")
+                        str = '啟用';
+                    else if (d.statusNo == "S")
+                        str = '停用';
+                    return str
+                }
+            },
             {
                 field: 'right',
                 width: 200,
diff --git a/AMESCoreStudio.Web/Views/KCS/KCS006U.cshtml b/AMESCoreStudio.Web/Views/KCS/KCS006U.cshtml
index 5d68757c..6b0e4e28 100644
--- a/AMESCoreStudio.Web/Views/KCS/KCS006U.cshtml
+++ b/AMESCoreStudio.Web/Views/KCS/KCS006U.cshtml
@@ -41,6 +41,22 @@
                 <select asp-for="SNInterval" asp-items="@ViewBag.SNIntervalList" class="custom-select col-sm-9"></select>
                 <span asp-validation-for="SNInterval" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
+            <div class="form-group form-inline my-sm-1">
+                <label class="control-label col-sm-3">狀態</label>
+                <div class="col-sm-9">
+                    <div class="radio icheck-primary form-check-inline">
+                        <input type="radio" asp-for="StatusNo" value="A" />
+                        <label for="1">&nbsp;啟用&nbsp;</label>
+                    </div>
+                    <div class="radio icheck-primary form-check-inline">
+                        <input type="radio" asp-for="StatusNo" value="S" />
+                        <label for="0">&nbsp;停用&nbsp;</label>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <span style="color:red">*當組件設定停用時，料號組件對應及工單組件對應會刪除有設定該筆組件代碼</span>
+            </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" />
@@ -54,14 +70,14 @@
     @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
         await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
 
-<script type="text/javascript">
+    <script type="text/javascript">
     $(document).ready(function () {
         var error = '@Html.ValidationMessage("error")';
         if ($(error).text() != '') {
             parent.hg.msg(error);
         }
     });
-</script>
+    </script>
 
 
 }
diff --git a/AMESCoreStudio.WebApi/Models/AMES/Items.cs b/AMESCoreStudio.WebApi/Models/AMES/Items.cs
index 6b69e4ce..3e774015 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/Items.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/Items.cs
@@ -64,5 +64,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "組件總類")]
         [StringLength(50, ErrorMessage = "{0},不能大于{1}")]
         public string Item { get; set; }
+
+
+        /// <summary>
+        /// 狀態(A=ACTIVE ; S=停用)
+        /// </summary>
+        [Column("STATUS_NO")]
+        [DataMember]
+        [Display(Name = "狀態")]
+        public string StatusNo { get; set; } = "A";
     }
 }