1. 新增工單類型 無序號工單

2. FQC抽驗判斷加入 無序號廠驗

AMESCoreStudio.Web/Controllers/FQCController.cs

@@ -1231,8 +1231,22 @@ namespace AMESCoreStudio.Web.Controllers
             var result = await _fqcApi.GetFqcQuery(model.InhouseNo, model.SeqID);
             var fqcItem = result.Data.FirstOrDefault();
 
-            // Fail數量 小於0 才要判斷抽樣數量 && 不等於免驗
+            // 判斷工單類型為無序號工單
-            if (fqcItem.FailQty <= 0 && fqcItem.InspectionStatus != "C")
+            if (fqcItem.InspectionStatus == "D")
+            {
+                var wipinfo = await _pcsApi.GetWipInfoByWipNO(fqcItem.WipNo);
+                if (wipinfo.Count != 0)
+                {
+                    if (wipinfo.FirstOrDefault().WipType != "N")
+                    {
+                        var _msg = "工單類型不是無序號工單，檢驗類型不能選擇無序號廠驗";
+                        return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                    }
+            }
+            }
+
+            // Fail數量 小於0 才要判斷抽樣數量 && 不等於免驗||無序號廠驗 
+            if (fqcItem.FailQty <= 0 && (fqcItem.InspectionStatus != "C" || fqcItem.InspectionStatus != "D"))
             {
                 // 抽驗數量 大於 本批次送驗量
                 if (fqcItem.QcQty > fqcItem.InhouseQty)
@@ -1290,8 +1304,8 @@ namespace AMESCoreStudio.Web.Controllers
             var FqcQuery = await _fqcApi.GetFqcQuery(model.InhouseNo, model.SeqID);
             var fqcItem = FqcQuery.Data.FirstOrDefault();
 
-            // 免驗排除
+            // 免驗||無序號廠驗排除
-            if (fqcItem.InspectionStatus != "C")
+            if (fqcItem.InspectionStatus != "C" || fqcItem.InspectionStatus != "D")
             {
                 // 判斷狀態選擇
                 if (fqcItem.FailQty >= fqcItem.ReQty)

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -589,6 +589,10 @@ namespace AMESCoreStudio.Web.Controllers
                 {
                     Text = "R:重工工單",
                     Value = "R",
+                },
+                  new SelectListItem() {
+                    Text = "N:無序號工單",
+                    Value = "N",
                 }
             };
 

AMESCoreStudio.Web/Views/FQC/FQC007.cshtml

@@ -15,7 +15,7 @@
         color: #009688;
     }
     .aa input {
-        font-size: 18px;
+        font-size: 14px;
         color: #0600f0;
     }
 </style>
@@ -116,13 +116,13 @@
                     <input @(Model.CustomerMedical == "Y" ? "checked" : "") id="CustomerMedical" type="checkbox" title="醫療" />
                     <input @(Model.CustomerVIP == "Y" ? "checked" : "") id="CustomerVIP" type="checkbox" title="VIP" />
                 </div>
-                <div class="layui-col-xs1">
+                <div class="layui-col-xs2">
                     <div class="layui-input-inline aa">
                         <select asp-for="InspectionStatus" asp-items="@ViewBag.GetInspectionStatusSelect" class=""></select>
                     </div>
                     @*<label class="layui-form-label-col" style="text-align:right;">客戶名稱：</label>*@
                 </div>
-                <div class="layui-col-xs2">
+                <div class="layui-col-xs1">
                     <div class="layui-form-item">
                         @*<div class="layui-input-block" style="margin-left:auto;">
                         <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.CustomerNo</label>

AMESCoreStudio.Web/Views/PCS/PCS003.cshtml

@@ -26,7 +26,7 @@
             <input asp-for="wipInfo.UnitNO" type="hidden" value="@Model.wipInfo.UnitNO" />
             <input asp-for="wipInfo.WipNO" type="hidden" value="@Model.wipInfo.WipNO" />
             <input asp-for="wipAtt.ItemNO" type="hidden" value="@Model.wipAtt.ItemNO" />
-            <input asp-for="wipInfo.FlowRuleID" type="hidden" value="@Model.wipInfo.FlowRuleID" />
+            @*<input asp-for="wipInfo.FlowRuleID" type="hidden" value="@Model.wipInfo.FlowRuleID" />*@
             <input asp-for="wipBarcodeOther.OtherID" type="hidden" value="@if(Model.wipBarcodeOther != null){ @Model.wipBarcodeOther.OtherID }" />
             <input asp-for="wipMAC.WipNO" type="hidden" value="@if(Model.wipMAC != null){ @Model.wipMAC.WipNO }" />
             <div class="layui-form-item " style="padding-left:30px">

AMESCoreStudio.WebApi/Enums/EnumFQC.cs

@@ -91,6 +91,12 @@ namespace AMESCoreStudio.WebApi.Enum
             /// </summary>
             [Display(Name = "免驗")]
             C = 3,
+
+            /// <summary>
+            /// 無序號廠驗
+            /// </summary>
+            [Display(Name = "無序號廠驗")]
+            D = 4,
         }
 
         /// <summary>

AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs

@@ -268,7 +268,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public string Werks { get; set; }
 
         /// <summary>
-        /// 工單類型(S-標準工單;R-重工工單)
+        /// 工單類型(S-標準工單;R-重工工單;N-無序號工單)
         /// </summary>
         [Column("WIP_TYPE")]
         [DataMember]