From ae663d897dff8ef29caad3a528702d4b45f1c172 Mon Sep 17 00:00:00 2001
From: ray <newkyonew@hotmail.com>
Date: Sun, 12 Feb 2023 20:56:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=20FQC=E6=9F=A5=E8=A9=A2=E5=8A=A0=E5=85=A5=20?=
 =?UTF-8?q?=E7=89=B9=E6=8E=A1=E5=85=81=E6=94=B6=E9=81=B8=E9=A0=85=202.=20?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B7=A5=E5=96=AE=E8=B3=87=E6=96=99=E7=9B=B8?=
 =?UTF-8?q?=E9=97=9CBug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/FQCController.cs              |   4 +-
 .../Controllers/PCSController.cs              | 105 ++++++++++--------
 AMESCoreStudio.Web/Views/FQC/FQC007B.cshtml   |  14 ++-
 AMESCoreStudio.Web/Views/FQC/FQC008.cshtml    |  15 +--
 AMESCoreStudio.Web/Views/PCS/PCS003.cshtml    |  12 ++
 AMESCoreStudio.Web/Views/PCS/PCS034.cshtml    |  11 ++
 .../AMES/FqcInhouseMasterController.cs        |  34 ++++--
 .../DTO/AMES/FqcInhouseMasterDto.cs           |   9 +-
 AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs    |   7 ++
 .../DTO/AMES/WipOutfitDto.cs                  |   6 +
 AMESCoreStudio.WebApi/DTO/AMES/WipSopDto.cs   |   8 +-
 AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs |  10 +-
 12 files changed, 159 insertions(+), 76 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index 0b0f2b61..f4e5a2dc 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -1363,7 +1363,7 @@ namespace AMESCoreStudio.Web.Controllers
             fqcResultMaster.QaMeno = model.QaMeno;
             fqcResultMaster.EndTime = DateTime.Now;
             fqcResultMaster.UpdateDate = DateTime.Now;
-            fqcResultMaster.SpecialPo = model.SpecialPo;
+            fqcResultMaster.SpecialPo = model.QaResult == "R" ? "" : model.SpecialPo;
             fqcResultMaster.UpdateUserID = GetLogInUserID();
             fqcResultMaster.MajorQty = model.MajorQty;
             fqcResultMaster.MinorQty = model.MinorQty;
@@ -1392,7 +1392,7 @@ namespace AMESCoreStudio.Web.Controllers
                 return Json(new { data = result.Msg, success = false });
                 //ModelState.AddModelError("error", result.Msg);
             }
-            
+
             //return View("FQC007B", model);
         }
         #endregion
diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index a44b4f43..0a6c936b 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -228,7 +228,6 @@ namespace AMESCoreStudio.Web.Controllers
                 !string.IsNullOrWhiteSpace(model.Engineer) ||
                 !string.IsNullOrWhiteSpace(model.PartsBakeRemarks) ||
                 model.PartsBakeTime != 0 ||
-                model.PcbBake != 0 ||
                 !string.IsNullOrWhiteSpace(model.PcbBakeRemarks) ||
                 !string.IsNullOrWhiteSpace(model.PcbProcessingRemarks))
             {
@@ -236,7 +235,6 @@ namespace AMESCoreStudio.Web.Controllers
                 // 判斷預設值是否更改過，如果有就判斷必填欄位
                 if (string.IsNullOrWhiteSpace(model.BiRatio.ToString()) ||
                 model.PartsBakeTime == 0 ||
-                model.PcbBake == 0 ||
                  string.IsNullOrWhiteSpace(model.BiosVer) ||
                 string.IsNullOrWhiteSpace(model.BiTemperature) ||
                 string.IsNullOrWhiteSpace(model.BiTime) ||
@@ -249,13 +247,12 @@ namespace AMESCoreStudio.Web.Controllers
                     if (model.PartsBakeTime == 0)
                         Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.PartsBakeTime)).Name + "，";
 
-                    if (model.PcbBake == 0)
-                        Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.PcbBake)).Name + "，";
+                    //if (model.PcbBake == 0)
+                    //    Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.PcbBake)).Name + "，";
 
                     if (string.IsNullOrWhiteSpace(model.BiosVer))
                         Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.BiosVer)).Name + "，";
 
-
                     if (string.IsNullOrWhiteSpace(model.BiTemperature))
                         Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.BiTemperature)).Name + "，";
 
@@ -1756,18 +1753,18 @@ namespace AMESCoreStudio.Web.Controllers
                     }
 
                     // 出貨序號
-                    if (!string.IsNullOrWhiteSpace(model.wipBarcodeOther.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcodeOther.EndNO))
-                    {
-                        var type_no = await _pcsApi.GetBarcodeTypeByTypeName("客戶條碼區間");
-                        if (type_no != null)
-                        {
-                            model.wipBarcodeOther.WipNO = model.wipInfo.WipNO;
-                            model.wipBarcodeOther.TypeNO = type_no.TypeNo;
-                            model.wipBarcodeOther.CreateUserID = UserID;
-                            model.wipBarcodeOther.UpdateUserID = UserID;
-                            result = await _pcsApi.PostWipBarcodeOther(JsonConvert.SerializeObject(model.wipBarcodeOther));
-                        }
-                    }
+                    //if (!string.IsNullOrWhiteSpace(model.wipBarcodeOther.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcodeOther.EndNO))
+                    //{
+                    //    var type_no = await _pcsApi.GetBarcodeTypeByTypeName("客戶條碼區間");
+                    //    if (type_no != null)
+                    //    {
+                    //        model.wipBarcodeOther.WipNO = model.wipInfo.WipNO;
+                    //        model.wipBarcodeOther.TypeNO = type_no.TypeNo;
+                    //        model.wipBarcodeOther.CreateUserID = UserID;
+                    //        model.wipBarcodeOther.UpdateUserID = UserID;
+                    //        result = await _pcsApi.PostWipBarcodeOther(JsonConvert.SerializeObject(model.wipBarcodeOther));
+                    //    }
+                    //}
 
                     // MAC
                     if (!string.IsNullOrWhiteSpace(model.wipMAC.StartNO) && !string.IsNullOrWhiteSpace(model.wipMAC.EndNO))
@@ -1791,6 +1788,7 @@ namespace AMESCoreStudio.Web.Controllers
                             else
                             {
                                 model.wipMAC.WipNO = model.wipInfo.WipNO;
+                                model.wipMAC.CreateUserID = UserID;
                                 result = await _pcsApi.PostWipMAC(JsonConvert.SerializeObject(model.wipMAC));
                             }
                         }
@@ -1817,6 +1815,8 @@ namespace AMESCoreStudio.Web.Controllers
                             {
                                 item.WipNo = model.wipInfo.WipNO;
                                 item.ItemNo = model.wipAtt.ItemNO;
+                                item.UpdateUserID = UserID;
+                                item.CreateUserID = UserID;
                                 if (item.WipKpID == 0)
                                     await _pcsApi.PostWipKp(JsonConvert.SerializeObject(item));
                                 else
@@ -1937,6 +1937,13 @@ namespace AMESCoreStudio.Web.Controllers
             }
             else
             {
+                model.wipInfo.ECNCheck = model.wipInfo.ECNCheck == "Y" ? "true" : "false";
+                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.wipInfo.SFISFlowCk = model.wipInfo.SFISFlowCk == "Y" ? "true" : "false";
                 if (result.Errors != null)
                 {
                     ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
@@ -2577,9 +2584,9 @@ namespace AMESCoreStudio.Web.Controllers
                 GetCheckboxCompanyLogo(model.wipLabel != null ? model.wipLabel.CompanyLogo : null);
                 GetCheckboxPrintMode(model.wipLabel != null ? model.wipLabel.PrintMode : null);
                 GetCheckboxWipAttr(model.wipLabel != null ? model.wipLabel.WipAttr : null);
-                GetCheckboxDIP(model.wipBoard != null ? model.wipBoard.DipSide : null);
-                GetCheckboxSMD(model.wipBoard != null ? model.wipBoard.Smd : null);
-                GetCheckboxSMDSolderMa(model.wipBoard != null ? model.wipBoard.SmdSolderMask : null);
+                GetCheckboxDIP(model.wipBoard != null ? string.Join(',', model.wipBoard.DipSides) : null);
+                GetCheckboxSMD(model.wipBoard != null ? string.Join(',', model.wipBoard.SMDs) : null);
+                GetCheckboxSMDSolderMa(model.wipBoard != null ? string.Join(',', model.wipBoard.SmdSolderMasks) : null);
                 #endregion
 
                 model.wipBarcodes = await _pcsApi.GetWipBarcode(model.wipInfo.WipNO);
@@ -2692,6 +2699,8 @@ namespace AMESCoreStudio.Web.Controllers
                     // 標籤
                     model.wipLabel.ApproveLogo = model.wipLabel.ApproveLogos == null ? null : string.Join(',', model.wipLabel.ApproveLogos);
                     model.wipLabel.WipNO = model.wipInfo.WipNO;
+                    model.wipLabel.CreateUserID = UserID;
+                    model.wipLabel.UpdateUserID = UserID;
                     await _pcsApi.PutWipLabel(JsonConvert.SerializeObject(model.wipLabel));
 
                     // 安勤統一執行WIP_SYSTEM
@@ -2703,6 +2712,8 @@ namespace AMESCoreStudio.Web.Controllers
                             {
                                 model.wipSystem.ItemNo = model.wipAtt.ItemNO;
                                 model.wipSystem.WipNo = model.wipInfo.WipNO;
+                                model.wipSystem.CreateUserID = UserID;
+                                model.wipSystem.UpdateUserID = UserID;
                                 await _pcsApi.PutWipSystem(JsonConvert.SerializeObject(model.wipSystem));
                             }
                         }
@@ -2718,6 +2729,8 @@ namespace AMESCoreStudio.Web.Controllers
                                 {
                                     model.wipSystem.ItemNo = model.wipAtt.ItemNO;
                                     model.wipSystem.WipNo = model.wipInfo.WipNO;
+                                    model.wipSystem.CreateUserID = UserID;
+                                    model.wipSystem.UpdateUserID = UserID;
                                     await _pcsApi.PutWipSystem(JsonConvert.SerializeObject(model.wipSystem));
                                 }
                             }
@@ -2734,6 +2747,8 @@ namespace AMESCoreStudio.Web.Controllers
                                     model.wipBoard.DipSide = model.wipBoard.DipSides == null ? null : string.Join(',', model.wipBoard.DipSides);
                                     model.wipBoard.ItemNo = model.wipAtt.ItemNO;
                                     model.wipBoard.WipNo = model.wipInfo.WipNO;
+                                    model.wipBoard.CreateUserID = UserID;
+                                    model.wipBoard.UpdateUserID = UserID;
                                     await _pcsApi.PutWipBoard(JsonConvert.SerializeObject(model.wipBoard));
                                 }
                             }
@@ -2754,6 +2769,7 @@ namespace AMESCoreStudio.Web.Controllers
                         model.wipBarcode.WipID = model.wipInfo.WipID;
                         model.wipBarcode.WipNO = model.wipInfo.WipNO;
                         model.wipBarcode.UnitNO = model.wipInfo.UnitNO;
+                        model.wipBarcode.CreateUserID = UserID;
                         result = await _pcsApi.PutWipBarcode(JsonConvert.SerializeObject(model.wipBarcode));
 
                     }
@@ -2795,6 +2811,7 @@ namespace AMESCoreStudio.Web.Controllers
                             else
                             {
                                 model.wipMAC.WipNO = model.wipInfo.WipNO;
+                                model.wipMAC.CreateUserID = UserID;
                                 result = await _pcsApi.PostWipMAC(JsonConvert.SerializeObject(model.wipMAC));
                             }
                         }
@@ -2821,6 +2838,7 @@ namespace AMESCoreStudio.Web.Controllers
                     {
                         item.WipNo = model.wipInfo.WipNO;
                         item.ItemNo = model.wipAtt.ItemNO;
+                        item.CreateUserID = UserID;
                         item.UpdateUserID = UserID;
                         if (item.WipKpID == 0)
                             await _pcsApi.PostWipKp(JsonConvert.SerializeObject(item));
@@ -2857,6 +2875,7 @@ namespace AMESCoreStudio.Web.Controllers
                         item.WipNo = model.wipInfo.WipNO;
                         item.ItemNo = model.wipAtt.ItemNO;
                         item.UpdateUserID = UserID;
+                        item.CreateUserID = UserID;
                         item.OutfitNo = ".";
                         if (item.WipOutfitID == 0)
                             await _pcsApi.PostWipOutfit(JsonConvert.SerializeObject(item));
@@ -2877,6 +2896,7 @@ namespace AMESCoreStudio.Web.Controllers
                     {
                         item.WipNo = model.wipInfo.WipNO;
                         item.ItemNo = model.wipAtt.ItemNO;
+                        item.CreateUserID = UserID;
                         item.UpdateUserID = UserID;
                         if (item.WipSOPID == 0)
                             await _pcsApi.PostWipSop(JsonConvert.SerializeObject(item));
@@ -2919,6 +2939,8 @@ namespace AMESCoreStudio.Web.Controllers
                             model.wipInfoBlob.WipNo = model.wipInfo.WipNO;
                             model.wipInfoBlob.ImageName = FileName;
                             model.wipInfoBlob.Filepath = $@"\UploadFolder\{model.wipInfo.WipNO}\";
+                            model.wipInfoBlob.CreateUserID = UserID;
+                            model.wipInfoBlob.UpdateUserID = UserID;
                             result = await _pcsApi.PostWipInfoBlob(JsonConvert.SerializeObject(model.wipInfoBlob));
                         }
                     }
@@ -3159,9 +3181,9 @@ namespace AMESCoreStudio.Web.Controllers
                 GetCheckboxCompanyLogo(model.wipLabel != null ? model.wipLabel.CompanyLogo : null);
                 GetCheckboxPrintMode(model.wipLabel != null ? model.wipLabel.PrintMode : null);
                 GetCheckboxWipAttr(model.wipLabel != null ? model.wipLabel.WipAttr : null);
-                GetCheckboxDIP(model.wipBoard != null ? model.wipBoard.DipSide : null);
-                GetCheckboxSMD(model.wipBoard != null ? model.wipBoard.Smd : null);
-                GetCheckboxSMDSolderMa(model.wipBoard != null ? model.wipBoard.SmdSolderMask : null);
+                GetCheckboxDIP(model.wipBoard != null ? string.Join(',', model.wipBoard.DipSides) : null);
+                GetCheckboxSMD(model.wipBoard != null ? string.Join(',', model.wipBoard.SMDs) : null);
+                GetCheckboxSMDSolderMa(model.wipBoard != null ? string.Join(',', model.wipBoard.SmdSolderMasks) : null);
                 #endregion
 
                 model.ruleStations = await _pcsApi.GetRuleStationByWipNo(model.wipInfo.WipNO);
@@ -3278,6 +3300,8 @@ namespace AMESCoreStudio.Web.Controllers
                     // 標籤
                     model.wipLabel.ApproveLogo = model.wipLabel.ApproveLogos == null ? null : string.Join(',', model.wipLabel.ApproveLogos);
                     model.wipLabel.WipNO = model.wipInfo.WipNO;
+                    model.wipLabel.UpdateUserID = UserID;
+                    model.wipLabel.CreateUserID = UserID;
                     await _pcsApi.PutWipLabel(JsonConvert.SerializeObject(model.wipLabel));
 
                     // 安勤統一執行WIP_SYSTEM
@@ -3289,6 +3313,8 @@ namespace AMESCoreStudio.Web.Controllers
                             {
                                 model.wipSystem.ItemNo = model.wipAtt.ItemNO;
                                 model.wipSystem.WipNo = model.wipInfo.WipNO;
+                                model.wipSystem.CreateUserID = UserID;
+                                model.wipSystem.UpdateUserID = UserID;
                                 await _pcsApi.PutWipSystem(JsonConvert.SerializeObject(model.wipSystem));
                             }
                         }
@@ -3304,6 +3330,8 @@ namespace AMESCoreStudio.Web.Controllers
                                 {
                                     model.wipSystem.ItemNo = model.wipAtt.ItemNO;
                                     model.wipSystem.WipNo = model.wipInfo.WipNO;
+                                    model.wipSystem.CreateUserID = UserID;
+                                    model.wipSystem.UpdateUserID = UserID;
                                     await _pcsApi.PutWipSystem(JsonConvert.SerializeObject(model.wipSystem));
                                 }
                             }
@@ -3320,45 +3348,25 @@ namespace AMESCoreStudio.Web.Controllers
                                     model.wipBoard.DipSide = model.wipBoard.DipSides == null ? null : string.Join(',', model.wipBoard.DipSides);
                                     model.wipBoard.ItemNo = model.wipAtt.ItemNO;
                                     model.wipBoard.WipNo = model.wipInfo.WipNO;
+                                    model.wipBoard.CreateUserID = UserID;
+                                    model.wipBoard.UpdateUserID = UserID;
                                     await _pcsApi.PutWipBoard(JsonConvert.SerializeObject(model.wipBoard));
                                 }
                             }
                         }
                     }
 
-                    //// 工單對應SOP
-                    //var q = await _pcsApi.GetMaterialSopQuery(itemNo: model.wipAtt.ItemNO, unitNo: model.wipInfo.UnitNO, state: "Y");
-                    //if (q.Data.Count() != 0)
-                    //{
-                    //    model.wipSop.MaterialSopID = q.Data.FirstOrDefault().MaterialSopID;
-                    //    await _pcsApi.PostWipSop(JsonConvert.SerializeObject(model.wipSop));
-                    //}
-
                     // 內部條碼
                     if (!string.IsNullOrWhiteSpace(model.wipBarcode.Remarks))
                     {
                         model.wipBarcode.WipID = model.wipInfo.WipID;
                         model.wipBarcode.WipNO = model.wipInfo.WipNO;
                         model.wipBarcode.UnitNO = model.wipInfo.UnitNO;
+                        model.wipBarcode.CreateUserID = UserID;
                         result = await _pcsApi.PutWipBarcode(JsonConvert.SerializeObject(model.wipBarcode));
 
                     }
 
-                    //// 出貨序號 改換點出貨序號時有資料就先儲存
-                    //if (!string.IsNullOrWhiteSpace(model.wipBarcodeOther.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcodeOther.EndNO))
-                    //{
-                    //    var type_no = await _pcsApi.GetBarcodeTypeByTypeName("客戶條碼區間");
-                    //    if (type_no != null)
-                    //    {
-                    //        model.wipBarcodeOther.WipNO = model.wipInfo.WipNO;
-                    //        model.wipBarcodeOther.TypeNO = type_no.TypeNo;
-                    //        if (model.wipBarcodeOther.OtherID != 0)
-                    //            result = await _pcsApi.PutWipBarcodeOther(JsonConvert.SerializeObject(model.wipBarcodeOther));
-                    //        else
-                    //            result = await _pcsApi.PostWipBarcodeOther(JsonConvert.SerializeObject(model.wipBarcodeOther));
-                    //    }
-                    //}
-
                     // MAC
                     if (!string.IsNullOrWhiteSpace(model.wipMAC.StartNO) && !string.IsNullOrWhiteSpace(model.wipMAC.EndNO))
                     {
@@ -3381,6 +3389,7 @@ namespace AMESCoreStudio.Web.Controllers
                             else
                             {
                                 model.wipMAC.WipNO = model.wipInfo.WipNO;
+                                model.wipMAC.CreateUserID = UserID;
                                 result = await _pcsApi.PostWipMAC(JsonConvert.SerializeObject(model.wipMAC));
                             }
                         }
@@ -3407,6 +3416,7 @@ namespace AMESCoreStudio.Web.Controllers
                     {
                         item.WipNo = model.wipInfo.WipNO;
                         item.ItemNo = model.wipAtt.ItemNO;
+                        item.CreateUserID = UserID;
                         item.UpdateUserID = UserID;
                         if (item.WipKpID == 0)
                             await _pcsApi.PostWipKp(JsonConvert.SerializeObject(item));
@@ -3443,6 +3453,7 @@ namespace AMESCoreStudio.Web.Controllers
                         item.WipNo = model.wipInfo.WipNO;
                         item.ItemNo = model.wipAtt.ItemNO;
                         item.OutfitNo = ".";
+                        item.CreateUserID = UserID;
                         item.UpdateUserID = UserID;
                         if (item.WipOutfitID == 0)
                             await _pcsApi.PostWipOutfit(JsonConvert.SerializeObject(item));
@@ -3463,6 +3474,7 @@ namespace AMESCoreStudio.Web.Controllers
                     {
                         item.WipNo = model.wipInfo.WipNO;
                         item.ItemNo = model.wipAtt.ItemNO;
+                        item.CreateUserID = UserID;
                         item.UpdateUserID = UserID;
                         if (item.WipSOPID == 0)
                             await _pcsApi.PostWipSop(JsonConvert.SerializeObject(item));
@@ -3504,6 +3516,7 @@ namespace AMESCoreStudio.Web.Controllers
 
                             model.wipInfoBlob.WipNo = model.wipInfo.WipNO;
                             model.wipInfoBlob.ImageName = FileName;
+                            model.wipInfoBlob.CreateUserID = UserID;
                             model.wipInfoBlob.Filepath = $@"\UploadFolder\{model.wipInfo.WipNO}\";
                             result = await _pcsApi.PostWipInfoBlob(JsonConvert.SerializeObject(model.wipInfoBlob));
                         }
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007B.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007B.cshtml
index 2edb9a6c..975afaf6 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007B.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007B.cshtml
@@ -29,7 +29,7 @@
             <div class="layui-col-xs10">
                 <div class="layui-form-item">
                     <div class="layui-inline" style="width:100px">
-                        <select id="pass" lay-filter="pass" lay-submit>
+                        <select id="passType" name="passType" lay-filter="passType" lay-submit>
                             <option value="0">N/A</option>
                             <option value="1">特採時</option>
                         </select>
@@ -116,10 +116,9 @@
     }
 
     <script type="text/javascript">
-
         layui.use(['form'], function () {
             form = layui.form;
-            form.on('select(pass)', function (data) {
+            form.on('select(passType)', function (data) {
                 if (data.value == "1") {
                     $("#Special").show();
                 }
@@ -129,6 +128,15 @@
             });
 
             form.on('submit(formDemo)', function (obj) {
+                var PassType = $("#passType").val();
+                if (PassType == "1") {
+                    var SpecialPo = $("#SpecialPo").val().trim() ;
+                    if (SpecialPo.length == 0) {
+                        hg.msg("請輸入特採單號");
+                        return;
+                    }
+                }
+
                 var index = layer.load(1, {
                     shade: [0.4, '#000'],
                     content: '儲存中......',
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
index a2f82bc6..ae898466 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
@@ -111,6 +111,7 @@
                                     <option value="">全部</option>
                                     <option value="A">未檢驗</option>
                                     <option value="P">允收</option>
+                                    <option value="P1">特採允收</option>
                                     <option value="R">驗退</option>
                                 </select>
                             </div>
@@ -217,17 +218,17 @@
                 width: 60,
                 title: '批量'
             },
-            //{
-            //    field: 'serialNo',
-            //    title: '箱號',
-            //    sort: true
-            //},
+
             {
                 field: 'statusName',
                 title: '檢驗狀態',
                 sort: true,
                 templet: '#statusName'
             },
+            {
+                field: 'specialNo',
+                title: '特採單號',
+            },
             {
                 field: 'endTime',
                 title: '抽驗結束時間',
@@ -301,11 +302,11 @@
         //alert("8" + factoryID.value);
         //alert("9" + factoryNo.value);
 
-        
+
     </script>
 
     <script type="text/html" id="statusName">
-        {{#  if(d.statusName === '允收'){ }}
+        {{#  if(d.statusName === '允收' || d.statusName === '特採允收'){ }}
         <span style="color: #07ab2a;">{{ d.statusName }}</span>
         {{#  } else if(d.statusName === '批退'){ }}
         <span style="color: #d70841;">{{ d.statusName }}</span>
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index 06079cf1..a7e03e63 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -440,6 +440,18 @@
                                 <div class="layui-input-inline">
                                     <input class="layui-input" asp-for="wipBoard.Engineer_Name" readonly="readonly" />
                                 </div>
+
+                                <div class="layui-input-inline" style="display: flex;align-items: center;height: 35px;">
+                                    <input asp-for="itemNoCT1" type="hidden" value="@Model.itemNoCT1" />
+                                    @if (!string.IsNullOrWhiteSpace(Model.itemNoCT1))
+                                    {
+                                        <span style="color:red">有維護標準工時</span>
+                                    }
+                                    else
+                                    {
+                                        <span style="color:red">**無維護標準工時**</span>
+                                    }
+                                </div>
                             </div>
                         </div>
 
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml
index 245f290a..3a16519e 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml
@@ -421,6 +421,17 @@
                                 <div class="layui-input-inline">
                                     <input class="layui-input" asp-for="wipBoard.Engineer_Name" readonly="readonly" />
                                 </div>
+                                <div class="layui-input-inline" style="display: flex;align-items: center;height: 35px;">
+                                    <input asp-for="itemNoCT1" type="hidden" value="@Model.itemNoCT1" />
+                                    @if (!string.IsNullOrWhiteSpace(Model.itemNoCT1))
+                                    {
+                                        <span style="color:red">有維護標準工時</span>
+                                    }
+                                    else
+                                    {
+                                        <span style="color:red">**無維護標準工時**</span>
+                                    }
+                                </div>
                             </div>
                         </div>
 
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
index b9fff9d6..cc7ad646 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
@@ -110,7 +110,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <returns></returns>
         [HttpGet("FqcInhouseMasterQuery")]
         public async Task<ResultModel<FqcInhouseMasterDto>> GetFqcInhouseMasterQuery(string barcodeNo, string wipNo, string boxNo
-          , string inhouseNo, string date_str, string date_end, string status, string factoryID,string factoryNo, int page = 0, int limit = 10)
+          , string inhouseNo, string date_str, string date_end, string status, string factoryID, string factoryNo, int page = 0, int limit = 10)
         {
             var q = from q1 in _context.FqcInhouseMasters
                         //join q2 in _context.FqcInhouseDetails on new { q1.InhouseNo, q1.SeqID } equals new { q2.InhouseNo, q2.SeqID }
@@ -133,7 +133,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         StatusName = q1.Status,
                         ProTypeName = q1.ProType,
                         CreateDate = q1.CreateDate,
-                        EndTime = q3.EndTime
+                        EndTime = q3.EndTime,
+                        SpecialNo = q3.SpecialPo
                     };
             //q1.Status == "P" ? "允收" : q1.Status == "R" ? "批退" : "未驗收完成",
             //IQueryable <FqcInhouseDetail> q1 = _context.FqcInhouseDetails;
@@ -144,7 +145,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 q = q.Where(w => w.WipNo == wipNo);
 
             if (!string.IsNullOrWhiteSpace(status))
-                q = q.Where(w => w.StatusName == status);
+            {
+                // P1 特採允收
+                if (status != "P1")
+                    q = q.Where(w => w.StatusName == status);
+                else
+                {
+                    q = q.Where(w => w.StatusName == "P" && !string.IsNullOrWhiteSpace(w.SpecialNo));
+                }
+            }
 
             if (!string.IsNullOrWhiteSpace(factoryID))
                 q = q.Where(w => w.Werks.ToString() == factoryID);
@@ -195,10 +204,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
              .ToList();
 
             // 修改狀態名稱
-            result.Data = result.Data.Select(s => { s.StatusName = s.StatusName == "P" ? "允收" : s.StatusName == "R" ? "批退" : "未驗收完成"; return s; })
+            result.Data = result.Data.Select(s => { s.StatusName = s.StatusName == "P" ? string.IsNullOrWhiteSpace(s.SpecialNo) ? "允收" : "特採允收" : s.StatusName == "R" ? "批退" : "未驗收完成"; return s; })
                           .ToList();
 
-            
+
 
             return result;
         }
@@ -234,7 +243,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                        ModelNo = q1.ModelNo,
                                        InhouseQty = q1.InhouseQty,
                                        SpecialPo = q2.SpecialPo,
-                                       StatusName = q1.Status == "P" ? "允收Pass" : q1.Status == "R" ? "批退Reject" : "",
+                                       StatusName = q1.Status == "P" ? string.IsNullOrWhiteSpace(q2.SpecialPo) ? "允收Pass" : "特採允收" : q1.Status == "R" ? "批退Reject" : "",
                                        FqcID = q2.WipNo == null ? 0 : q2.FqcID,
                                        InhouseMemo = q2.InhouseMemo,
                                        ManualQaMeno = q2.ManualQaMeno,
@@ -308,11 +317,14 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
                 // 特殊判斷 
                 // 檢查儀器編號 空白時預設帶N/A
-                query = query.Select(s => { s.OutfitNo = String.IsNullOrEmpty(s.OutfitNo) ? "N/A" : s.OutfitNo ; 
-                                            return s; }).ToList();
+                query = query.Select(s =>
+                {
+                    s.OutfitNo = String.IsNullOrEmpty(s.OutfitNo) ? "N/A" : s.OutfitNo;
+                    return s;
+                }).ToList();
 
                 // Proved 空白時 抓開立入庫單人員
-                foreach(var item in query.Where(w => string.IsNullOrWhiteSpace(w.Proved)))
+                foreach (var item in query.Where(w => string.IsNullOrWhiteSpace(w.Proved)))
                 {
                     var ByQuery = await _context.FqcInhouseMasters.Where(w => w.InhouseNo == item.InhouseNo && w.SeqID == item.SeqID).FirstOrDefaultAsync();
                     var UserInfo = await _context.UserInfoes.Where(w => w.UserID == ByQuery.CreateUserID).FirstOrDefaultAsync();
@@ -502,7 +514,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             IQueryable<FqcInhouseMaster_WareDto> q = from q1 in _context.FqcInhouseMasters
                                                      join q2 in _context.FqcInhouseDetails on new { q1.InhouseNo, q1.SeqID } equals new { q2.InhouseNo, q2.SeqID }
-                                                     join q2_1 in _context.WipBoxs on  q2.SerialNo equals q2_1.BoxNo
+                                                     join q2_1 in _context.WipBoxs on q2.SerialNo equals q2_1.BoxNo
                                                      join q3 in _context.FqcResultMasters on q1.InhouseNo equals q3.InhouseNo
                                                      join q4 in _context.WareHouseings on new { q2.InhouseNo, q2.SeqID, q2.SerialNo } equals new { q4.InhouseNo, q4.SeqID, q4.SerialNo } into q2q4
                                                      from q402 in q2q4.DefaultIfEmpty()
@@ -559,7 +571,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 q = q.Where(w => w.RecordDate <= DateTime.Parse(date_end));
             }
-            q= q.Where(w => w.StatusName == "P");
+            q = q.Where(w => w.StatusName == "P");
             ResultModel<FqcInhouseMaster_WareDto> result = new ResultModel<FqcInhouseMaster_WareDto>();
 
             // 紀錄筆數
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs
index c19e9656..bad088b8 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs
@@ -76,12 +76,19 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         public string SerialNo { get; set; }
 
         /// <summary>
-        /// 抽驗狀態  P-PASS(允收);R-REJECT(批退); A-初始狀態
+        /// 抽驗狀態  P-PASS(允收);R-REJECT(批退); A-初始狀態 ; P1-特採允收
         /// </summary>
         [DataMember]
         [Display(Name = "抽驗狀態")]
         public string StatusName { get; set; } = "A";
 
+        /// <summary>
+        /// 抽驗狀態  P-PASS(允收);R-REJECT(批退); A-初始狀態 ; P1-特採允收
+        /// </summary>
+        [DataMember]
+        [Display(Name = "特採單號")]
+        public string SpecialNo { get; set; }
+
         /// <summary>
         /// 產品類別 STANDARD(標準品),Order（訂單）
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs
index 3b8c42df..aae146e0 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs
@@ -75,6 +75,13 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
 
         public string UnitNoName { get; set; }
 
+        /// <summary>
+        /// 建立UserID
+        /// </summary>
+
+        public int CreateUserID { get; set; } = 0;
+
+
         /// <summary>
         /// 更新UserID
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/WipOutfitDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/WipOutfitDto.cs
index 72d0ba2b..befa2afe 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/WipOutfitDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/WipOutfitDto.cs
@@ -69,6 +69,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
 
         public string StationName { get; set; }
 
+        /// <summary>
+        /// 建立UserID
+        /// </summary>
+
+        public int CreateUserID { get; set; } = 0;
+
         /// <summary>
         /// 更新UserID
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/WipSopDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/WipSopDto.cs
index 7425d299..2aa73df1 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/WipSopDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/WipSopDto.cs
@@ -66,11 +66,17 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
 
         public string UnitNoName { get; set; }
 
+        /// <summary>
+        /// 建立UserID
+        /// </summary>
+
+        public int CreateUserID { get; set; } = 0;
+
         /// <summary>
         /// 更新UserID
         /// </summary>
 
-        public int? UpdateUserID { get; set; } 
+        public int? UpdateUserID { get; set; }
 
         /// <summary>
         /// 更新時間
diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs b/AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs
index 14cbfe75..e78b2ad2 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs
@@ -156,10 +156,10 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 零件烘烤溫度
         /// </summary>
-        [Column("PARTS_BAKE", TypeName = "NUMBER")]
+        [Column("PARTS_BAKE")]
         [DataMember]
         [Display(Name = "零件烘烤溫度")]
-        public decimal PartsBake { get; set; }
+        public int PartsBake { get; set; }
 
         /// <summary>
         /// 零件烘烤時間
@@ -180,10 +180,10 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// PCB烘烤
         /// </summary>
-        [Column("PCB_BAKE", TypeName = "NUMBER")]
+        [Column("PCB_BAKE")]
         [DataMember]
         [Display(Name = "PCB烘烤")]
-        public decimal PcbBake { get; set; }
+        public string PcbBake { get; set; }
 
         /// <summary>
         /// PCB烘烤備註
@@ -216,7 +216,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("SOLDER_PASTE")]
         [DataMember]
         [Display(Name = "錫膏")]
-        public int SolderPaste { get; set; }
+        public string SolderPaste { get; set; }
 
         /// <summary>
         /// 錫膏備註