From 0e98f9879cceffb84a248bf960a8153324b02a62 Mon Sep 17 00:00:00 2001
From: ray <newkyonew@hotmail.com>
Date: Sun, 27 Mar 2022 23:01:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BE=9B=E5=96=AE=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E8=B3=87=E6=96=99=20=E5=AE=A2=E6=88=B6=E9=A1=9E=E5=9E=8B?=
 =?UTF-8?q?=E7=8D=A8=E7=AB=8B=E9=A1=AF=E7=A4=BA=202.=20=E5=B7=A5=E5=96=AE?=
 =?UTF-8?q?=E9=96=8B=E6=94=B6=E7=B7=9A=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Controllers/PCSController.cs    | 12 +++++++++++-
 AMESCoreStudio.Web/Views/PCS/PCS001.cshtml         |  5 +++--
 AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml        |  5 +++--
 AMESCoreStudio.Web/Views/PCS/PCS003.cshtml         |  5 +++--
 .../Controllers/BAS/LineInfoesController.cs        |  6 ------
 AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs       | 14 ++++++++++++++
 6 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 8c0bffa8..c436f769 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -1241,6 +1241,8 @@ namespace AMESCoreStudio.Web.Controllers
             model.wipInfo.ModelCheck = model.wipInfo.ModelCheck == "true" ? "Y" : "N";
             model.wipInfo.InputFlag = model.wipInfo.InputFlag == "true" ? "Y" : "N";
             model.wipInfo.Priority = model.wipInfo.Priority == "true" ? "Y" : "N";
+            model.wipInfo.CustomerMedical = model.wipInfo.CustomerMedical == "true" ? "Y" : "N";
+            model.wipInfo.CustomerVIP = model.wipInfo.CustomerVIP == "true" ? "Y" : "N";
             //板卡
             model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "true" ? "Y" : "N";
             model.wipBoard.DipTape = model.wipBoard.DipTape == "true" ? "Y" : "N";
@@ -1268,6 +1270,8 @@ namespace AMESCoreStudio.Web.Controllers
                 model.wipInfo.ModelCheck = model.wipInfo.ModelCheck == "Y" ? "true" : "false";
                 model.wipInfo.InputFlag = model.wipInfo.InputFlag == "Y" ? "true" : "false";
                 model.wipInfo.Priority = model.wipInfo.Priority == "Y" ? "true" : "false";
+                model.wipInfo.CustomerMedical = model.wipInfo.CustomerMedical == "Y" ? "true" : "false";
+                model.wipInfo.CustomerVIP = model.wipInfo.CustomerVIP == "Y" ? "true" : "false";
                 //板卡
                 model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "Y" ? "true" : "false";
                 model.wipBoard.DipTape = model.wipBoard.DipTape == "Y" ? "true" : "false";
@@ -1698,6 +1702,8 @@ namespace AMESCoreStudio.Web.Controllers
             model.wipInfo.ModelCheck = model.wipInfo.ModelCheck == "on" ? "Y" : "N";
             model.wipInfo.InputFlag = model.wipInfo.InputFlag == "on" ? "Y" : "N";
             model.wipInfo.Priority = model.wipInfo.Priority == "on" ? "Y" : "N";
+            model.wipInfo.CustomerMedical = model.wipInfo.CustomerMedical == "on" ? "Y" : "N";
+            model.wipInfo.CustomerVIP = model.wipInfo.CustomerVIP == "on" ? "Y" : "N";
             //板卡
             model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "on" ? "Y" : "N";
             model.wipBoard.DipTape = model.wipBoard.DipTape == "on" ? "Y" : "N";
@@ -2248,7 +2254,11 @@ namespace AMESCoreStudio.Web.Controllers
             // 當切換STOP時，強制收線
             if (statusNO == "S")
             {
-                await PCS006OnOffAsync(LineID, -1);
+                var LineInfoByWipID = await _pcsApi.GetLineInfoByWipID(wipID);
+                if (LineInfoByWipID.Count() != 0)
+                {
+                    await PCS006OnOffAsync(LineID, -1);
+                }
             }
 
             await _pcsApi.PostWipLog(JsonConvert.SerializeObject(wipLog));
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
index 197c0382..986247bc 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
@@ -77,9 +77,10 @@
 
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label asp-for="wipInfo.CustomerType" class="layui-form-label"></label>
+                    <label class="layui-form-label">客戶類別</label>
                     <div class="layui-input-inline">
-                        <select asp-for="wipInfo.CustomerType" asp-items="@ViewBag.GetCustomerTypeList" class=""></select>
+                        <input asp-for="wipInfo.CustomerMedical" type="checkbox" title="醫療" />
+                        <input asp-for="wipInfo.CustomerVIP" type="checkbox" title="VIP" />
                     </div>
                     <label asp-for="wipInfo.CustomerNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
index 8d63be60..0120be5a 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
@@ -75,9 +75,10 @@
 
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label asp-for="wipInfo.CustomerType" class="layui-form-label"></label>
+                    <label class="layui-form-label">客戶類別</label>
                     <div class="layui-input-inline">
-                        <select disabled asp-for="wipInfo.CustomerType" asp-items="@ViewBag.GetCustomerTypeList" class=""></select>
+                        <input @(Model.wipInfo.CustomerMedical == "Y" ? "checked" : "") type="checkbox" title="醫療" />
+                        <input @(Model.wipInfo.CustomerVIP == "Y" ? "checked" : "") type="checkbox" title="VIP" />
                     </div>
                     <label asp-for="wipInfo.CustomerNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index 5627f9b8..471c30b6 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -81,9 +81,10 @@
 
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label asp-for="wipInfo.CustomerType" class="layui-form-label"></label>
+                    <label class="layui-form-label">客戶類別</label>
                     <div class="layui-input-inline">
-                        <select asp-for="wipInfo.CustomerType" asp-items="@ViewBag.GetCustomerTypeList" class=""></select>
+                        <input @(Model.wipInfo.CustomerMedical == "Y" ? "checked" : "")  name="wipInfo.CustomerMedical" type="checkbox" title="醫療" />
+                        <input @(Model.wipInfo.CustomerVIP == "Y" ? "checked" : "")  name="wipInfo.CustomerVIP" type="checkbox" title="VIP" />
                     </div>
                     <label asp-for="wipInfo.CustomerNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs
index c165de76..a6a3fd80 100644
--- a/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs
@@ -126,12 +126,6 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
             IQueryable<LineInfo> q = _context.LineInfoes.Where(w => w.WipNo == id);
 
             var lineInfo = await q.ToListAsync();
-
-            if (lineInfo is null)
-            {
-                return NotFound();
-            }
-
             return lineInfo;
         }
 
diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs b/AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs
index 510dd9a1..48932c3a 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs
@@ -278,6 +278,20 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "客戶類別")]
         public int CustomerType { get; set; }
 
+        /// <summary>
+        /// 客戶類別醫療(Y-是;N-否)
+        /// </summary>
+        [Column("CUSTOMER_MEDICAL")]
+        [DataMember]
+        public string CustomerMedical { get; set; } = "N";
+
+        /// <summary>
+        /// 客戶類別VIP(Y-是;N-否)
+        /// </summary>
+        [Column("CUSTOMER_VIP")]
+        [DataMember]
+        public string CustomerVIP { get; set; } = "N";
+
         /// <summary>
         /// 關聯工單
         /// </summary>