From af3b07cf5338a4a66cd43ec2468fec3ff33f91ab Mon Sep 17 00:00:00 2001
From: Ray <raylin@aten.com>
Date: Mon, 25 Apr 2022 19:35:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=B7=A5=E5=96=AE=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E8=B3=87=E6=96=99=E7=B6=AD=E8=AD=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PCSController.cs              | 515 +++++++++---------
 AMESCoreStudio.Web/Views/PCS/PCS001.cshtml    | 412 ++++++++++----
 AMESCoreStudio.Web/Views/PCS/PCS003.cshtml    |   4 +
 3 files changed, 574 insertions(+), 357 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index c8ee9a33..3a959954 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -1298,7 +1298,7 @@ namespace AMESCoreStudio.Web.Controllers
 
         //頁面提交，id=0 添加，id>0 修改
         [HttpPost]
-        public async Task<IActionResult> PCS001Async(WipDataViewModel model, IFormFile formFile)
+        public async Task<IActionResult> PCS001Async(WipDataViewModel model, string action, IFormFile formFile)
         {
             #region 選單
             await GetProductType();
@@ -1328,7 +1328,63 @@ namespace AMESCoreStudio.Web.Controllers
             #endregion
             IResultModel result;
             int UserID = GetLogInUserID();
-            // Checkbox轉換
+
+            if (action == "Copy")
+            {
+                model.wipAtt = await _pcsApi.GetWipAtt(model.wipInfo.WipNO);
+
+                if (model.wipAtt == null)
+                {
+
+                }
+
+                model.wipBarcodes = await _pcsApi.GetWipBarcode(model.wipInfo.WipNO);
+                model.wipBarcode = model.wipBarcodes.FirstOrDefault();
+                model.ruleStations = await _pcsApi.GetRuleStationByWipNo(model.wipInfo.WipNO);
+
+                model.wipBoard = await _pcsApi.GetWipBoard(model.wipInfo.WipNO);
+                if (model.wipBoard != null)
+                {
+                    if (!string.IsNullOrWhiteSpace(model.wipBoard.Engineer))
+                    {
+                        var UserInof = _sysApi.GetUserInfoByUserNo(model.wipBoard.Engineer).InvokeAsync().Result;
+                        if (UserInof != null)
+                            model.wipBoard.Engineer_Name = UserInof.UserName;
+                    }
+                }
+
+                model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO);
+                if (model.wipSystem != null)
+                {
+                    if (!string.IsNullOrWhiteSpace(model.wipSystem.Engineer))
+                    {
+                        var UserInof = _sysApi.GetUserInfoByUserNo(model.wipSystem.Engineer).InvokeAsync().Result;
+                        if (UserInof != null)
+                            model.wipSystem.Engineer_Name = UserInof.UserName;
+                    }
+                }
+
+                model.wipMAC = await _pcsApi.GetWipMAC(model.wipInfo.WipNO);
+                if (model.wipMAC != null)
+                {
+                    model.wipMAC.StartNO = model.wipMAC.Title + model.wipMAC.StartNO;
+                    model.wipMAC.EndNO = model.wipMAC.Title + model.wipMAC.EndNO;
+                }
+
+                model.wipLabel = await _pcsApi.GetWipLabel(model.wipInfo.WipNO);
+
+                model.wipBarcodeOther = await _pcsApi.GetWipBarcodeOther(model.wipInfo.WipNO);
+
+                model.WipKps = await _pcsApi.GetWipKpByWipNo(model.wipInfo.WipNO);
+
+                model.WipOutfits = await _pcsApi.GetWipOutfitByWipNo(model.wipInfo.WipNO);
+
+                model.WipSops = await _pcsApi.GetWipSopByWipNo(model.wipInfo.WipNO);
+
+                model.wipInfoBlobs = await _pcsApi.GetWipInfoBlob(model.wipInfo.WipNO);
+            }
+
+            #region Checkbox轉換
             model.wipInfo.ECNCheck = model.wipInfo.ECNCheck == "true" ? "Y" : "N";
             model.wipInfo.ModelCheck = model.wipInfo.ModelCheck == "true" ? "Y" : "N";
             model.wipInfo.InputFlag = model.wipInfo.InputFlag == "true" ? "Y" : "N";
@@ -1337,301 +1393,262 @@ namespace AMESCoreStudio.Web.Controllers
             model.wipInfo.CustomerVIP = model.wipInfo.CustomerVIP == "true" ? "Y" : "N";
             model.wipInfo.SFISFlowCk = model.wipInfo.SFISFlowCk == "true" ? "Y" : "N";
             //板卡
-            model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "true" ? "Y" : "N";
-            model.wipBoard.DipTape = model.wipBoard.DipTape == "true" ? "Y" : "N";
-            model.wipBoard.DipSolderMask = model.wipBoard.DipSolderMask == "true" ? "Y" : "N";
-            model.wipBoard.Burn = model.wipBoard.Burn == "true" ? "Y" : "N";
-            model.wipBoard.ISPartsBake = model.wipBoard.ISPartsBake == "true" ? "Y" : "N";
+            if (model.wipBoard != null)
+            {
+                model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "true" ? "Y" : "N";
+                model.wipBoard.DipTape = model.wipBoard.DipTape == "true" ? "Y" : "N";
+                model.wipBoard.DipSolderMask = model.wipBoard.DipSolderMask == "true" ? "Y" : "N";
+                model.wipBoard.Burn = model.wipBoard.Burn == "true" ? "Y" : "N";
+                model.wipBoard.ISPartsBake = model.wipBoard.ISPartsBake == "true" ? "Y" : "N";
+            }
             //系統
-            model.wipSystem.FinePackage = model.wipSystem.FinePackage == "true" ? "Y" : "N";
-
-            // 判斷資料填寫
-            var Msg = CheckWipInfoInsert(model);
-
-
-            // 判斷是否有開重複工單+生產單位
-            var wipInfoQuery = await _pcsApi.GetWipInfoByWipNO(model.wipInfo.WipNO);
-            if (wipInfoQuery.Any())
+            if (model.wipSystem != null)
             {
-                if (wipInfoQuery.Where(w => w.UnitNO == model.wipInfo.UnitNO).Count() != 0)
-                {
-                    Msg += "  同樣生產單位已建立相同工單了  ";
-                }
+                model.wipSystem.FinePackage = model.wipSystem.FinePackage == "true" ? "Y" : "N";
             }
 
-            if (!string.IsNullOrWhiteSpace(Msg))
-            {
-                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";
-                //板卡
-                model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "Y" ? "true" : "false";
-                model.wipBoard.DipTape = model.wipBoard.DipTape == "Y" ? "true" : "false";
-                model.wipBoard.DipSolderMask = model.wipBoard.DipSolderMask == "Y" ? "true" : "false";
-                model.wipBoard.ISPartsBake = model.wipBoard.ISPartsBake == "Y" ? "true" : "false";
-                model.wipBoard.Burn = model.wipBoard.Burn == "Y" ? "true" : "false";
-
-                //系統
-                model.wipSystem.FinePackage = model.wipSystem.FinePackage == "Y" ? "true" : "false";
-                ModelState.AddModelError("error", Msg);
 
-                return View("PCS001", model);
-            }
+            #endregion
 
-            result = await _pcsApi.PostWipInfo(JsonConvert.SerializeObject(model.wipInfo));
-            if (result.Success)
+            #region 保存動作
+            if (action == "保存")
             {
-                int wipID = int.Parse(result.Msg);
+                // 判斷資料填寫
+                var Msg = CheckWipInfoInsert(model);
 
-                // 料號判斷，沒有就Insert
-                var checkMaterialItem = await _pcsApi.GetMaterialItemByItemNO(model.wipAtt.ItemNO);
-                if (checkMaterialItem == null)
+                // 判斷是否有開重複工單+生產單位
+                var wipInfoQuery = await _pcsApi.GetWipInfoByWipNO(model.wipInfo.WipNO);
+                if (wipInfoQuery.Any())
                 {
-                    await _pcsApi.PostMaterialItem(JsonConvert.SerializeObject(
-                        new MaterialItem
-                        {
-                            ItemNo = model.wipAtt.ItemNO,
-                            CreateUserID = UserID
-                        }));
+                    if (wipInfoQuery.Where(w => w.UnitNO == model.wipInfo.UnitNO).Count() != 0)
+                    {
+                        Msg += "  同樣生產單位已建立相同工單了  ";
+                    }
                 }
 
-                // 工單屬性
-                model.wipAtt.WipNO = model.wipInfo.WipNO;
-                model.wipAtt.CreateUserID = UserID;
-                await _pcsApi.PostWipAtt(JsonConvert.SerializeObject(model.wipAtt));
+                if (!string.IsNullOrWhiteSpace(Msg))
+                {
+                    ModelState.AddModelError("error", Msg);
 
-                // 標籤
-                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.PostWipLabel(JsonConvert.SerializeObject(model.wipLabel));
-
-                // 新增工單Log
-                WipLog wiplog = new WipLog();
-                wiplog.WipID = wipID;
-                wiplog.StatusNO = "N";
-                wiplog.WipDesc = ".";
-                wiplog.CreateUserID = UserID;
-                await _pcsApi.PostWipLog(JsonConvert.SerializeObject(wiplog));
+                    return View("PCS001", model);
+                }
 
-                // 系統
-                if (model.wipInfo.UnitNO == "B" || model.wipInfo.UnitNO == "P" || model.wipInfo.UnitNO == "T")
+                result = await _pcsApi.PostWipInfo(JsonConvert.SerializeObject(model.wipInfo));
+                if (result.Success)
                 {
-                    if (string.IsNullOrWhiteSpace(CheckWipInfoInsert_WipSystem(model.wipSystem)))
+                    int wipID = int.Parse(result.Msg);
+
+                    // 料號判斷，沒有就Insert
+                    var checkMaterialItem = await _pcsApi.GetMaterialItemByItemNO(model.wipAtt.ItemNO);
+                    if (checkMaterialItem == null)
                     {
-                        if (!string.IsNullOrWhiteSpace(model.wipSystem.BiTemperature))
+                        await _pcsApi.PostMaterialItem(JsonConvert.SerializeObject(
+                            new MaterialItem
+                            {
+                                ItemNo = model.wipAtt.ItemNO,
+                                CreateUserID = UserID
+                            }));
+                    }
+
+                    // 工單屬性
+                    model.wipAtt.WipNO = model.wipInfo.WipNO;
+                    model.wipAtt.CreateUserID = UserID;
+                    await _pcsApi.PostWipAtt(JsonConvert.SerializeObject(model.wipAtt));
+
+                    // 標籤
+                    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.PostWipLabel(JsonConvert.SerializeObject(model.wipLabel));
+
+                    // 新增工單Log
+                    WipLog wiplog = new WipLog();
+                    wiplog.WipID = wipID;
+                    wiplog.StatusNO = "N";
+                    wiplog.WipDesc = ".";
+                    wiplog.CreateUserID = UserID;
+                    await _pcsApi.PostWipLog(JsonConvert.SerializeObject(wiplog));
+
+                    // 系統
+                    if (model.wipInfo.UnitNO == "B" || model.wipInfo.UnitNO == "P" || model.wipInfo.UnitNO == "T")
+                    {
+                        if (string.IsNullOrWhiteSpace(CheckWipInfoInsert_WipSystem(model.wipSystem)))
                         {
-                            model.wipSystem.ItemNo = model.wipAtt.ItemNO;
-                            model.wipSystem.WipNo = model.wipInfo.WipNO;
-                            model.wipSystem.CreateUserID = UserID;
-                            model.wipSystem.UpdateUserID = UserID;
-                            await _pcsApi.PostWipSystem(JsonConvert.SerializeObject(model.wipSystem));
+                            if (!string.IsNullOrWhiteSpace(model.wipSystem.BiTemperature))
+                            {
+                                model.wipSystem.ItemNo = model.wipAtt.ItemNO;
+                                model.wipSystem.WipNo = model.wipInfo.WipNO;
+                                model.wipSystem.CreateUserID = UserID;
+                                model.wipSystem.UpdateUserID = UserID;
+                                await _pcsApi.PostWipSystem(JsonConvert.SerializeObject(model.wipSystem));
+                            }
                         }
                     }
-                }
-                else
-                // 板卡
-                {
-                    if (string.IsNullOrWhiteSpace(CheckWipInfoInsert_WipBoard(model.wipBoard)))
+                    else
+                    // 板卡
                     {
-                        if (!string.IsNullOrWhiteSpace(model.wipBoard.BiTemperature))
+                        if (string.IsNullOrWhiteSpace(CheckWipInfoInsert_WipBoard(model.wipBoard)))
                         {
-                            model.wipBoard.Smd = model.wipBoard.SMDs == null ? null : string.Join(',', model.wipBoard.SMDs);
-                            model.wipBoard.DipSide = model.wipBoard.DipSides == null ? null : string.Join(',', model.wipBoard.DipSides);
-                            model.wipBoard.SmdSolderMask = model.wipBoard.SmdSolderMasks == null ? null : string.Join(',', model.wipBoard.SmdSolderMasks);
-                            model.wipBoard.ItemNo = model.wipAtt.ItemNO;
-                            model.wipBoard.WipNo = model.wipInfo.WipNO;
-                            model.wipBoard.CreateUserID = UserID;
-                            model.wipBoard.UpdateUserID = UserID;
-                            await _pcsApi.PostWipBoard(JsonConvert.SerializeObject(model.wipBoard));
+                            if (!string.IsNullOrWhiteSpace(model.wipBoard.BiTemperature))
+                            {
+                                model.wipBoard.Smd = model.wipBoard.SMDs == null ? null : string.Join(',', model.wipBoard.SMDs);
+                                model.wipBoard.DipSide = model.wipBoard.DipSides == null ? null : string.Join(',', model.wipBoard.DipSides);
+                                model.wipBoard.SmdSolderMask = model.wipBoard.SmdSolderMasks == null ? null : string.Join(',', model.wipBoard.SmdSolderMasks);
+                                model.wipBoard.ItemNo = model.wipAtt.ItemNO;
+                                model.wipBoard.WipNo = model.wipInfo.WipNO;
+                                model.wipBoard.CreateUserID = UserID;
+                                model.wipBoard.UpdateUserID = UserID;
+                                await _pcsApi.PostWipBoard(JsonConvert.SerializeObject(model.wipBoard));
+                            }
                         }
                     }
-                }
-
-                // 內部條碼
-                if (!string.IsNullOrWhiteSpace(model.wipBarcode.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcode.EndNO))
-                {
-                    model.wipBarcode.WipID = wipID;
-                    model.wipBarcode.WipNO = model.wipInfo.WipNO;
-                    model.wipBarcode.UnitNO = model.wipInfo.UnitNO;
-                    model.wipBarcode.CreateUserID = UserID;
-                    result = await _pcsApi.PostWipBarcode(JsonConvert.SerializeObject(model.wipBarcode));
-
-                    // 工單條碼規則設定文件檔
-                    WipRule wipRule = new WipRule();
-                    wipRule.WipNO = model.wipInfo.WipNO;
-                    wipRule.KeyNo = "00";
-                    wipRule.BarcodeLen = 14;
-                    wipRule.BarcodeFormat = model.wipInfo.UnitNO;
-                    result = await _pcsApi.PostWipRule(JsonConvert.SerializeObject(wipRule));
-                }
 
-                // 出貨序號
-                if (!string.IsNullOrWhiteSpace(model.wipBarcodeOther.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcodeOther.EndNO))
-                {
-                    var type_no = await _pcsApi.GetBarcodeTypeByTypeName("客戶條碼區間");
-                    if (type_no != null)
+                    // 內部條碼
+                    if (!string.IsNullOrWhiteSpace(model.wipBarcode.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcode.EndNO))
                     {
-                        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));
+                        model.wipBarcode.WipID = wipID;
+                        model.wipBarcode.WipNO = model.wipInfo.WipNO;
+                        model.wipBarcode.UnitNO = model.wipInfo.UnitNO;
+                        model.wipBarcode.CreateUserID = UserID;
+                        result = await _pcsApi.PostWipBarcode(JsonConvert.SerializeObject(model.wipBarcode));
+
+                        // 工單條碼規則設定文件檔
+                        WipRule wipRule = new WipRule();
+                        wipRule.WipNO = model.wipInfo.WipNO;
+                        wipRule.KeyNo = "00";
+                        wipRule.BarcodeLen = 14;
+                        wipRule.BarcodeFormat = model.wipInfo.UnitNO;
+                        result = await _pcsApi.PostWipRule(JsonConvert.SerializeObject(wipRule));
                     }
-                }
 
-                // MAC
-                if (!string.IsNullOrWhiteSpace(model.wipMAC.StartNO) && !string.IsNullOrWhiteSpace(model.wipMAC.EndNO))
-                {
-                    var mACInfo = await _pcsApi.GetMACInfo(model.wipAtt.ItemNO);
-                    if (mACInfo != null)
+                    // 出貨序號
+                    if (!string.IsNullOrWhiteSpace(model.wipBarcodeOther.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcodeOther.EndNO))
                     {
-                        model.wipMAC.WipNO = model.wipInfo.WipNO;
-                        model.wipMAC.Title = mACInfo.Title;
-                        model.wipMAC.ClassGroup = mACInfo.ClassGroup;
-                        model.wipMAC.CreateUserID = UserID;
-                        result = await _pcsApi.PostWipMAC(JsonConvert.SerializeObject(model.wipMAC));
-                        result = await _pcsApi.PutMACInfoByClassGroup(mACInfo.ClassGroup, model.wipMAC.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));
+                        }
                     }
-                }
 
-                // 料號相關
-                var materialItem = await _pcsApi.GetMaterialItemByItemNO(model.wipAtt.ItemNO);
-                if (materialItem != null)
-                {
-                    // KeyParts 組合
-                    var materialKp = await _pcsApi.GetMaterialKpByItemID(materialItem.ItemID);
-                    foreach (var item in materialKp.Where(w => w.StationType == model.wipInfo.UnitNO))
+                    // MAC
+                    if (!string.IsNullOrWhiteSpace(model.wipMAC.StartNO) && !string.IsNullOrWhiteSpace(model.wipMAC.EndNO))
                     {
-                        var wipKp = new WipKp
+                        var mACInfo = await _pcsApi.GetMACInfo(model.wipAtt.ItemNO);
+                        if (mACInfo != null)
                         {
-                            WipNo = model.wipInfo.WipNO,
-                            ItemNo = model.wipAtt.ItemNO,
-                            UnitNo = model.wipInfo.UnitNO,
-                            KpName = item.KpName,
-                            KpNo = item.KpNo,
-                            KpSeq = item.KpSeq,
-                            Length = item.Length,
-                            Title = item.Title,
-                            CreateUserID = UserID,
-                            UpdateUserID = UserID
-                        };
-                        await _pcsApi.PostWipKp(JsonConvert.SerializeObject(wipKp));
+                            model.wipMAC.WipNO = model.wipInfo.WipNO;
+                            model.wipMAC.Title = mACInfo.Title;
+                            model.wipMAC.ClassGroup = mACInfo.ClassGroup;
+                            model.wipMAC.CreateUserID = UserID;
+                            result = await _pcsApi.PostWipMAC(JsonConvert.SerializeObject(model.wipMAC));
+                            result = await _pcsApi.PutMACInfoByClassGroup(mACInfo.ClassGroup, model.wipMAC.EndNO);
+                        }
                     }
 
-                    // 治具
-                    var materialOutfit = await _pcsApi.GetMaterialOutfitByItemNo(model.wipAtt.ItemNO);
-                    foreach (var item in materialOutfit.Where(w => w.UnitNo == model.wipInfo.UnitNO))
+                    // 料號相關
+                    var materialItem = await _pcsApi.GetMaterialItemByItemNO(model.wipAtt.ItemNO);
+                    if (materialItem != null)
                     {
-                        var wipOutfit = new WipOutfit
+                        // KeyParts 組合
+                        var materialKp = await _pcsApi.GetMaterialKpByItemID(materialItem.ItemID);
+                        foreach (var item in materialKp.Where(w => w.StationType == model.wipInfo.UnitNO))
                         {
-                            WipNo = model.wipInfo.WipNO,
-                            ItemNo = model.wipAtt.ItemNO,
-                            UnitNo = model.wipInfo.UnitNO,
-                            OutfitNo = item.OutfitNo,
-                            PartNo = item.StationType,
-                            CreateUserID = UserID,
-                            UpdateUserID = UserID
-                        };
-                        await _pcsApi.PostWipOutfit(JsonConvert.SerializeObject(wipOutfit));
-                    }
+                            var wipKp = new WipKp
+                            {
+                                WipNo = model.wipInfo.WipNO,
+                                ItemNo = model.wipAtt.ItemNO,
+                                UnitNo = model.wipInfo.UnitNO,
+                                KpName = item.KpName,
+                                KpNo = item.KpNo,
+                                KpSeq = item.KpSeq,
+                                Length = item.Length,
+                                Title = item.Title,
+                                CreateUserID = UserID,
+                                UpdateUserID = UserID
+                            };
+                            await _pcsApi.PostWipKp(JsonConvert.SerializeObject(wipKp));
+                        }
 
-                    // 工單對應SOP
-                    var materialSop = await _pcsApi.GetMaterialSopByItemNo(model.wipAtt.ItemNO);
-                    foreach (var item in materialSop.Where(w => w.UnitNo == model.wipInfo.UnitNO))
-                    {
-                        var wipSop = new WipSop
+                        // 治具
+                        var materialOutfit = await _pcsApi.GetMaterialOutfitByItemNo(model.wipAtt.ItemNO);
+                        foreach (var item in materialOutfit.Where(w => w.UnitNo == model.wipInfo.UnitNO))
                         {
-                            WipNo = model.wipInfo.WipNO,
-                            ItemNo = model.wipAtt.ItemNO,
-                            UnitNo = model.wipInfo.UnitNO,
-                            SOPName = item.SopName,
-                            SOPPath = item.SopPath,
-                            SOPType = item.SopType,
-                            CreateUserID = UserID,
-                            UpdateUserID = UserID
-                        };
-                        await _pcsApi.PostWipSop(JsonConvert.SerializeObject(wipSop));
+                            var wipOutfit = new WipOutfit
+                            {
+                                WipNo = model.wipInfo.WipNO,
+                                ItemNo = model.wipAtt.ItemNO,
+                                UnitNo = model.wipInfo.UnitNO,
+                                OutfitNo = item.OutfitNo,
+                                PartNo = item.StationType,
+                                CreateUserID = UserID,
+                                UpdateUserID = UserID
+                            };
+                            await _pcsApi.PostWipOutfit(JsonConvert.SerializeObject(wipOutfit));
+                        }
+
+                        // 工單對應SOP
+                        var materialSop = await _pcsApi.GetMaterialSopByItemNo(model.wipAtt.ItemNO);
+                        foreach (var item in materialSop.Where(w => w.UnitNo == model.wipInfo.UnitNO))
+                        {
+                            var wipSop = new WipSop
+                            {
+                                WipNo = model.wipInfo.WipNO,
+                                ItemNo = model.wipAtt.ItemNO,
+                                UnitNo = model.wipInfo.UnitNO,
+                                SOPName = item.SopName,
+                                SOPPath = item.SopPath,
+                                SOPType = item.SopType,
+                                CreateUserID = UserID,
+                                UpdateUserID = UserID
+                            };
+                            await _pcsApi.PostWipSop(JsonConvert.SerializeObject(wipSop));
+                        }
                     }
                 }
-            }
 
 
-
-            if (result.Success)
-            {
-                var _msg = "新增成功！";
-                return RedirectToAction("Refresh", "Home", new { msg = _msg });
-            }
-            else
-            {
-                if (result.Errors != null)
+                if (result.Success)
                 {
-                    ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
+                    var _msg = "新增成功！";
+                    return RedirectToAction("Refresh", "Home", new { msg = _msg });
                 }
                 else
                 {
-                    ModelState.AddModelError("error", result.Msg);
+                    if (result.Errors != null)
+                    {
+                        ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
+                    }
+                    else
+                    {
+                        ModelState.AddModelError("error", result.Msg);
+                    }
                 }
             }
-            return View();
-        }
-
-        [HttpPost]
-        public async Task<IActionResult> PCS001CreateWipNo(WipDataViewModel model)
-        {
-            //await GetUnitList();
-            await GetProductType();
-            await GetFactoryInfo();
-            await GetFactoryUnit();
-            await GetLineInfo();
-            await GetMFGType();
-            await GetProcessTypes();
-            await GetFlowRuleList();
-            GetWipSEQType();
-            GetBurnType();
-            GetPartsBakeType();
-            GetPCBBakeTypeSelect();
-            GetPCBProcessingTypeSelect();
-            GetSolderPasteSelect();
-            GetWipType();
-            GetSOPTypeSelect();
-            GetWipSystemTypeSelect();
-            GetWipSystemPMTypeSelect();
-            GetCheckboxApproveLogo();
-            GetCheckboxCompanyLogo();
-            GetCheckboxPrintMode();
-            GetCheckboxWipAttr();
-            GetCheckboxDIP();
-            GetCheckboxSMD();
-
-            model.wipAtt = await _pcsApi.GetWipAtt(model.wipInfo.WipNO);
-            model.wipBarcodes = await _pcsApi.GetWipBarcode(model.wipInfo.WipNO);
-            model.ruleStations = await _pcsApi.GetRuleStationByWipNo(model.wipInfo.WipNO);
-
-            var q1 = await _pcsApi.GetMaterialSopQuery(itemNo: model.wipAtt.ItemNO);
-            model.materialSops = q1.Data;
-
-            model.WipKps = await _pcsApi.GetWipKpByWipNo(model.wipInfo.WipNO);
-
-            model.wipBoard = await _pcsApi.GetWipBoard(model.wipInfo.WipNO);
-
-            model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO);
-
-            model.wipMAC = await _pcsApi.GetWipMAC(model.wipInfo.WipNO);
-
-            model.wipLabel = await _pcsApi.GetWipLabel(model.wipInfo.WipNO);
-
-            model.wipBarcodeOther = await _pcsApi.GetWipBarcodeOther(model.wipInfo.WipNO);
+            #endregion
 
-            model.Outfits = await _pcsApi.GetMaterialOutfitByItemNo(model.wipAtt.ItemNO);
+            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";
+            //板卡
+            model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "Y" ? "true" : "false";
+            model.wipBoard.DipTape = model.wipBoard.DipTape == "Y" ? "true" : "false";
+            model.wipBoard.DipSolderMask = model.wipBoard.DipSolderMask == "Y" ? "true" : "false";
+            model.wipBoard.ISPartsBake = model.wipBoard.ISPartsBake == "Y" ? "true" : "false";
+            model.wipBoard.Burn = model.wipBoard.Burn == "Y" ? "true" : "false";
 
-            return View("PCS001", model);
+            //系統
+            model.wipSystem.FinePackage = model.wipSystem.FinePackage == "Y" ? "true" : "false";
+            return View(model);
         }
 
         public async Task<IActionResult> PCS001R(int id)
@@ -1943,7 +1960,7 @@ namespace AMESCoreStudio.Web.Controllers
                 }
             }
 
-           
+
             result = await _pcsApi.PutWipInfo(JsonConvert.SerializeObject(model.wipInfo));
             if (result.Success)
             {
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
index 45dd0ddb..15a0956c 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
@@ -1,7 +1,7 @@
 @model AMESCoreStudio.Web.ViewModels.PCS.WipDataViewModel
 
 
-@{ ViewData["Title"] = "PCS001C";
+@{ ViewData["Title"] = "PCS001";
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
 }
 
@@ -17,11 +17,12 @@
 
 <div class="layui-card">
     <div class="col-sm-12">
-        <form enctype="multipart/form-data" method="post" id="PCS001" asp-action="PCS001" class="layui-form">
+        <form enctype="multipart/form-data" method="post" asp-action="PCS001" class="layui-form">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-
-            <div class="layui-form-item" style="padding-left:30px">
-                @*<input @if (Model.wipInfo != null) { @(Model.wipInfo.InputFlag == "Y" ? "checked" : "") } type="checkbox" title="判斷前製程是否已經投入" name="wipInfo.InputFlag" />*@
+            <input asp-for="wipAtt.ItemNO" type="hidden" value="@if(Model.wipAtt != null) {@Model.wipAtt.ItemNO}" />
+            <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">
                 <input asp-for="wipInfo.InputFlag" type="checkbox" title="判斷前製程是否已經投入" />
             </div>
 
@@ -29,10 +30,12 @@
                 <div class="layui-inline">
                     <label asp-for="wipInfo.WipNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-
-                        <input asp-for="wipInfo.WipNO" class="layui-input" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" placeholder="請輸入工單號碼" />
+                        <input asp-for="wipInfo.WipNO" style="width: 140px; display:initial" class="layui-input" autocomplete="off" />
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" name="action" value="Copy" lay-submit lay-filter="querysubmit">
+                            <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                        </button>
                         <span asp-validation-for="wipInfo.WipNO" class="layui-bg-red"></span>
-                        <input id="btnCreateWipNo" hidden type="submit" value="submit" asp-controller="PCS" asp-action="PCS001CreateWipNo" />
+
                     </div>
                     <label asp-for="wipInfo.WipSEQ" class="layui-form-label"></label>
                     <div class="layui-input-inline">
@@ -40,12 +43,15 @@
                     </div>
                     <label asp-for="wipAtt.ItemNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="wipAtt.ItemNO" class="layui-input" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" placeholder="請輸入料號" />
+                        <input asp-for="wipAtt.ItemNO" style="width: 140px; display:initial" class="layui-input" autocomplete="off" />
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" name="action" value="Item" lay-submit lay-filter="querysubmit">
+                            <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                        </button>
                         <span asp-validation-for="wipAtt.ItemNO" class="layui-bg-red"></span>
                     </div>
                     <label asp-for="wipInfo.PlanQTY" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="wipInfo.PlanQTY" class="layui-input" autocomplete="off" placeholder="請輸入計劃數量" />
+                        <input asp-for="wipInfo.PlanQTY" class="layui-input" autocomplete="off" />
                         <span asp-validation-for="wipInfo.PlanQTY" class="layui-bg-red"></span>
                     </div>
                 </div>
@@ -67,7 +73,7 @@
                     </div>
                     <label asp-for="wipInfo.WerksNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="wipInfo.WerksNO" class="layui-input" autocomplete="off" placeholder="請輸入委外廠編號" />
+                        <input asp-for="wipInfo.WerksNO" class="layui-input" autocomplete="off" />
                         <span asp-validation-for="wipInfo.WerksNO" class="layui-bg-red"></span>
                     </div>
 
@@ -78,23 +84,21 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">客戶類別</label>
                     <div class="layui-input-inline">
-                        @*<input @if (Model.wipInfo != null) { @(Model.wipInfo.CustomerMedical == "Y" ? "checked" : "") } type="checkbox" title="醫療" name="wipInfo.CustomerMedical" />
-                            <input @if (Model.wipInfo != null) { @(Model.wipInfo.CustomerVIP == "Y" ? "checked" : "") } type="checkbox" title="VIP" name="wipInfo.CustomerVIP" />*@
                         <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">
-                        <input asp-for="wipInfo.CustomerNO" class="layui-input" autocomplete="off" placeholder="請輸入客戶名稱" />
+                        <input asp-for="wipInfo.CustomerNO" class="layui-input" autocomplete="off" />
                         <span asp-validation-for="wipInfo.CustomerNO" class="layui-bg-red"></span>
                     </div>
                     <label asp-for="wipInfo.CustomerItemNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="wipInfo.CustomerItemNO" class="layui-input" autocomplete="off" placeholder="請輸入客戶料號" />
+                        <input asp-for="wipInfo.CustomerItemNO" class="layui-input" autocomplete="off" />
                     </div>
                     <label asp-for="wipInfo.Sales" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="wipInfo.Sales" class="layui-input" autocomplete="off" placeholder="請輸入業務" />
+                        <input asp-for="wipInfo.Sales" class="layui-input" autocomplete="off" />
                     </div>
                 </div>
             </div>
@@ -103,9 +107,9 @@
                 <div class="layui-inline">
                     <label asp-for="wipInfo.UnitNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <select id="unit" lay-filter="unit" asp-for="wipInfo.UnitNO" asp-items="@ViewBag.FactoryUnitList" class=""></select>
+                        <select id="unit" lay-filter="unit" asp-for="wipInfo.UnitNO" asp-items="@ViewBag.FactoryUnitByWipNo" class=""></select>
                     </div>
-                    <input id="unitNo" type="hidden" name="unitNo" value="0" />
+                    <input id="unitNo" type="hidden" asp-for="wipInfo.UnitNO" />
                     <label asp-for="wipInfo.LineID" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <select lay-filter="lind" asp-for="wipInfo.LineID" asp-items="@ViewBag.LineInfoList" class="">
@@ -117,13 +121,13 @@
 
                     <label asp-for="wipInfo.RelatedWONO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="wipInfo.RelatedWONO" class="layui-input" placeholder="請輸入關聯工單/客戶工單" />
+                        <input asp-for="wipInfo.RelatedWONO" class="layui-input" />
                         <span asp-validation-for="wipInfo.RelatedWONO" class="layui-bg-red"></span>
                     </div>
 
                     <label asp-for="wipInfo.OrderNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="wipInfo.OrderNO" class="layui-input" placeholder="請輸入訂單號碼" />
+                        <input asp-for="wipInfo.OrderNO" class="layui-input" />
                     </div>
                 </div>
             </div>
@@ -143,12 +147,9 @@
             </div>
 
             <div class="layui-form-item" style="padding-left:30px">
-                @*<input @if (Model.wipInfo != null) { @(Model.wipInfo.ModelCheck == "Y" ? "checked" : "") } type="checkbox" title="混線投入機種檢查" name="wipInfo.ModelCheck" />
-                    <input @if (Model.wipInfo != null) { @(Model.wipInfo.ECNCheck == "Y" ? "checked" : "") } type="checkbox" title="混線投入ECN相同檢查" name="wipInfo.ECNCheck" />
-                    <input @if (Model.wipInfo != null) { @(Model.wipInfo.Priority == "Y" ? "checked" : "") } type="checkbox" title="線上強制工單" name="wipInfo.Priority" />*@
-                <input asp-for="wipInfo.ModelCheck" type="checkbox" title="混線投入機種檢查" />
-                <input asp-for="wipInfo.ECNCheck" type="checkbox" title="混線投入ECN相同檢查" />
-                <input asp-for="wipInfo.Priority" type="checkbox" title="線上強制工單" />
+                <input type="checkbox" title="混線投入機種檢查" asp-for="wipInfo.ModelCheck" />
+                <input type="checkbox" title="混線投入ECN相同檢查" asp-for="wipInfo.ECNCheck" />
+                <input type="checkbox" title="線上強制工單" asp-for="wipInfo.Priority" />
             </div>
 
             <div class="layui-tab layui-tab-brief">
@@ -162,6 +163,7 @@
                     <li>治具組合</li>
                     <li>SOP文件</li>
                     <li>標籤選項</li>
+                    <li>上傳檔案</li>
                 </ul>
                 <div class="layui-tab-content">
                     @* 工單屬性sheet *@
@@ -170,7 +172,7 @@
                             <div class="layui-inline">
                                 <label asp-for="wipAtt.ModelNO" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipAtt.ModelNO" class="layui-input" placeholder="請輸入機種" />
+                                    <input asp-for="wipAtt.ModelNO" class="layui-input" />
                                 </div>
                                 <label asp-for="wipAtt.WipProcess" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
@@ -188,12 +190,12 @@
                             <div class="layui-inline">
                                 <label asp-for="wipAtt.Boards" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipAtt.Boards" class="layui-input" placeholder="請輸入聯板數" />
+                                    <input asp-for="wipAtt.Boards" class="layui-input" />
                                     <span asp-validation-for="wipAtt.Boards" class="layui-bg-red"></span>
                                 </div>
                                 <label asp-for="wipInfo.BoxCNT" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipInfo.BoxCNT" class="layui-input" placeholder="請輸入包裝單箱數量" />
+                                    <input asp-for="wipInfo.BoxCNT" class="layui-input" />
                                     <span asp-validation-for="wipInfo.BoxCNT" class="layui-bg-red"></span>
                                 </div>
                             </div>
@@ -203,11 +205,11 @@
                             <div class="layui-inline">
                                 <label asp-for="wipAtt.ECN" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipAtt.ECN" class="layui-input" placeholder="請輸入ECN版本" />
+                                    <input asp-for="wipAtt.ECN" class="layui-input" />
                                 </div>
                                 <label asp-for="wipAtt.EAN" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipAtt.EAN" class="layui-input" placeholder="請輸入EAN" />
+                                    <input asp-for="wipAtt.EAN" class="layui-input" />
                                 </div>
                             </div>
                         </div>
@@ -216,12 +218,12 @@
                             <div class="layui-inline">
                                 <label asp-for="wipInfo.WipScheduleDate" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipInfo.WipScheduleDate" class="layui-input" readonly="" placeholder="yyyy/MM/dd" />
+                                    <input asp-for="wipInfo.WipScheduleDate" class="layui-input" readonly="" />
                                     <span asp-validation-for="wipInfo.WipScheduleDate" class="layui-bg-red"></span>
                                 </div>
                                 <label asp-for="wipInfo.WipDueDate" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipInfo.WipDueDate" class="layui-input" readonly="" placeholder="yyyy/MM/dd" />
+                                    <input asp-for="wipInfo.WipDueDate" class="layui-input" readonly="" />
                                     <span asp-validation-for="wipInfo.WipDueDate" class="layui-bg-red"></span>
                                 </div>
                             </div>
@@ -231,15 +233,16 @@
 
                     @* 序號編碼sheet *@
                     <div class="layui-tab-item">
+                        <label class="layui-form-label">生產序號</label>
                         <div class="layui-form-item">
                             <div class="layui-inline">
                                 <label class="layui-form-label">生產序號</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipBarcode.StartNO" readonly class="layui-input" />
+                                    <input asp-for="wipBarcode.StartNO" class="layui-input" />
                                 </div>
                                 <div class="layui-form-mid">-</div>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipBarcode.EndNO" readonly class="layui-input" />
+                                    <input asp-for="wipBarcode.EndNO" class="layui-input" />
                                 </div>
                                 <div class="layui-input-inline">
                                     <input id="GetBarCode" class="layui-btn layui-btn-primary layui-border-blue layui-btn-sm" type="button" value="產生條碼" />
@@ -264,11 +267,11 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label">MAC</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipMAC.StartNO" readonly class="layui-input" />
+                                    <input asp-for="wipMAC.StartNO" class="layui-input" />
                                 </div>
                                 <div class="layui-form-mid">-</div>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipMAC.EndNO" readonly class="layui-input" />
+                                    <input asp-for="wipMAC.EndNO" class="layui-input" />
                                 </div>
                                 <div class="layui-input-inline">
                                     <input id="GetMAC" class="layui-btn layui-btn-primary layui-border-blue layui-btn-sm" type="button" value="產生MAC" />
@@ -285,26 +288,133 @@
                     </div>
 
                     @* Keypart組合sheet *@
-                    <div class="layui-tab-item" style="padding-left:30px">
-                        <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" lay-submit lay-filter="queryKeyParts">刷新</a>
-                        <table class="layui-hide" id="keyparts" lay-filter="keyparts"></table>
+                    <div class="layui-tab-item">
+                        <a id="KPTableAdd" class="layui-btn layui-btn-xs layui-icon layui-icon-add-circle">新增</a>
+                        <input type="hidden" value=@Model.WipKps.Count() id="WipKpCount" />
+                        <table id="KPTable" class="layui-table">
+                            @{int k = 0;}
+                            <thead>
+                                <tr>
+                                    <th>
+                                        KP料號名稱
+                                    </th>
+                                    <th>
+                                        KP料號NO
+                                    </th>
+                                    <th>
+                                        順序
+                                    </th>
+                                    <th>
+                                        前置碼
+                                    </th>
+                                    <th>
+                                        長度
+                                    </th>
+                                    <th>
+                                        生產單位代號
+                                    </th>
+                                    <th>
+
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @foreach (var index in Model.WipKps)
+                                {
+                                    <tr>
+                                        <td>
+                                            <input name="WipKps[@k].WipKpID" type="hidden" value="@index.WipKpID" />
+                                            <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.KpName" name="WipKps[@k].KpName" />
+                                        </td>
+                                        <td>
+                                            <select asp-for="@index.KpNo" name="WipKps[@k].KpNo" asp-items="@ViewBag.ItemsList" class=""></select>
+                                        </td>
+                                        <td>
+                                            <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.KpSeq" name="WipKps[@k].KpSeq" />
+                                        </td>
+                                        <td>
+                                            <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.Title" name="WipKps[@k].Title" />
+                                        </td>
+                                        <td>
+                                            <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.Length" name="WipKps[@k].Length" />
+                                        </td>
+                                        <td>
+                                            <select asp-for="@index.UnitNo" name="WipKps[@k].UnitNo" asp-items="@ViewBag.FactoryUnitByWipNo" class=""></select>
+                                        </td>
+                                        <td>
+                                            <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a>
+                                        </td>
+                                    </tr>
+                                    k++;
+                                }
+                            </tbody>
+                        </table>
+
                     </div>
 
                     @* 生產流程sheet *@
-                    <div class="layui-tab-item" style="padding-left:30px">
+                    <div class="layui-tab-item">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="wipInfo.FlowRuleID" class="layui-form-label"></label>
+                                <label asp-for="wipInfo.FlowRuleID" as class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <select lay-filter="flow" asp-for="wipInfo.FlowRuleID" asp-items="@ViewBag.FlowRuleList" class=""></select>
+                                    <select lay-filter="flow" asp-for="wipInfo.FlowRuleID" asp-items="@ViewBag.MaterialFlowRule" class=""></select>
                                 </div>
-                                <input id="flowId" type="hidden" name="flowId" value="" />
                             </div>
                             <div class="layui-inline">
-                                <input asp-for="wipInfo.SFISFlowCk" type="checkbox" title="途程確認" />
+                                <input type="checkbox" title="途程確認" asp-for="wipInfo.SFISFlowCk" />
                             </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">作業流程註解</label>
+                                <div class="layui-input-block">
+                                    <textarea placeholder="請輸入作業流程註解" asp-for="wipInfo.FlowRemark" class="layui-textarea"></textarea>
+                                </div>
+                            </div>
+                            <table class="layui-hide" id="ruleStation" lay-filter="ruleStation"></table>
+                            <table id="rulestionOld" class="layui-table">
+                                <thead>
+                                    <tr>
+                                        <th>
+                                            生產單位
+                                        </th>
+                                        <th>
+                                            流程名稱
+                                        </th>
+                                        <th>
+                                            站別描述
+                                        </th>
+                                        <th>
+                                            站別順序
+                                        </th>
+                                        <th>
+                                            站別類型
+                                        </th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach (var index in Model.ruleStations)
+                                    {
+                                        <tr>
+                                            <td>
+                                                @index.UnitNoName
+                                            </td>
+                                            <td>
+                                                @index.FlowRuleName
+                                            </td>
+                                            <td>
+                                                @index.StationDesc
+                                            </td>
+                                            <td>
+                                                @index.Sequence
+                                            </td>
+                                            <td>
+                                                @index.StationType
+                                            </td>
+                                        </tr>
+                                    }
+                                </tbody>
+                            </table>
                         </div>
-                        <table class="layui-hide" id="ruleStation" lay-filter="ruleStation"></table>
                     </div>
 
                     @* 板卡-工程資訊sheet *@
@@ -333,16 +443,18 @@
                         </div>
 
                         <div class="layui-form-item">
-                            <label class="layui-form-label">SMD點紅膠</label>
+                            <label class="layui-form-label">SMD點紅膠備註</label>
                             <div class="layui-input-block">
                                 <input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" />
                             </div>
                         </div>
 
                         <div class="layui-form-item">
-                            <label class="layui-form-label">SMD點防焊膠</label>
-                            <div class="layui-input-block">
-                                <cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
+                            <div class="layui-inline">
+                                <label class="layui-form-label">SMD點防焊膠</label>
+                                <div class="layui-input-block">
+                                    <cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
+                                </div>
                             </div>
                         </div>
 
@@ -358,12 +470,9 @@
                                 <label class="layui-form-label">DIP</label>
                                 <div class="layui-input-block">
                                     <cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox>
-                                    @*<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
-                                        <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipTape == "Y" ? "checked" : "") } type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" />
-                                        <input @if (Model.wipBoard != null) { @(Model.wipBoard. == "Y" ? "checked" : "") } type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" />*@
                                     <input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" />
                                     <input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" />
-                                    <input asp-for="wipBoard.DipSolderMask" type="checkbox" title="點防焊膠" />
+                                    <input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />
                                 </div>
                             </div>
                         </div>
@@ -379,7 +488,7 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label">燒錄</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipBoard.Burn" type="checkbox" title="是否燒入" />
+                                    <input type="checkbox" title="是否燒入" asp-for="wipBoard.Burn" />
                                 </div>
                                 <div class="layui-input-inline">
                                     <label asp-for="wipBoard.BurnLocation" class="layui-form-label"></label>
@@ -400,9 +509,9 @@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <div class="layui-input-inline">
-                                    <input asp-for="wipBoard.ISPartsBake" type="checkbox" title="零件是否需要烘烤" />
-                                </div>
+                                <input type="checkbox" title="零件是否需要烘烤" asp-for="wipBoard.Burn" />
+                            </div>
+                            <div class="layui-inline">
                                 <label class="layui-form-label">零件烘烤溫度</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.GetPartsBakeTypeList" asp-for="wipBoard.PartsBake" class=""></select>
@@ -609,7 +718,7 @@
                                     <select asp-for="wipSystem.BiosType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input autocomplete" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" asp-for="wipSystem.Bios" autocomplete="off" />
+                                    <input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" asp-for="wipSystem.Bios" autocomplete="off" />
                                 </div>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" asp-for="wipSystem.Bios_Desc" readonly="readonly" />
@@ -632,7 +741,7 @@
                                     <select asp-for="wipSystem.ECType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input autocomplete" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" asp-for="wipSystem.Ec" autocomplete="off" />
+                                    <input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" asp-for="wipSystem.Ec" autocomplete="off" />
                                 </div>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" asp-for="wipSystem.Ec_Desc" readonly="readonly" />
@@ -647,7 +756,7 @@
                                     <select asp-for="wipSystem.FWType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input autocomplete" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" asp-for="wipSystem.Fw" autocomplete="off" />
+                                    <input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" asp-for="wipSystem.Fw" autocomplete="off" />
                                 </div>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" asp-for="wipSystem.Fw_Desc" readonly="readonly" />
@@ -662,7 +771,7 @@
                                     <select asp-for="wipSystem.FW1Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input autocomplete" asp-for="wipSystem.Fw1" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
+                                    <input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" asp-for="wipSystem.Fw1" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
                                 </div>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" asp-for="wipSystem.Fw1_Desc" readonly="readonly" />
@@ -677,7 +786,7 @@
                                     <select asp-for="wipSystem.FW2Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input autocomplete" asp-for="wipSystem.Fw2" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
+                                    <input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" asp-for="wipSystem.Fw2" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
                                 </div>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" asp-for="wipSystem.Fw2_Desc" readonly="readonly" />
@@ -692,7 +801,7 @@
                                     <select asp-for="wipSystem.OsType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input autocomplete" asp-for="wipSystem.OsVer" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
+                                    <input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" asp-for="wipSystem.OsVer" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
                                 </div>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" asp-for="wipSystem.OsVer_Desc" readonly="readonly" />
@@ -750,31 +859,102 @@
 
                     @* 治具組合sheet *@
                     <div class="layui-tab-item">
-                        @*<table id="OutfitTable" class="layui-table">
-                                <thead>
+                        <a id="OutfitTableAdd" class="layui-btn layui-btn-xs layui-icon layui-icon-add-circle">新增</a>
+                        <input type="hidden" value=@Model.WipOutfits.Count() id="WipOutfitCount" />
+                        <table id="OutfitTable" class="layui-table">
+                            @{int l = 0;}
+                            <thead>
+                                <tr>
+                                    <th>
+                                        治具種類
+                                    </th>
+                                    <th>
+                                        生產單位
+                                    </th>
+                                    <th>
+                                        流程站別
+                                    </th>
+                                    <th>
+
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @foreach (var index in Model.WipOutfits)
+                                {
                                     <tr>
-                                        <th>
-                                            治具NO
-                                        </th>
-                                        <th>
-                                            治具名稱
-                                        </th>
-                                        <th>
-                                            流程名稱ID
-                                        </th>
+
+                                        <td>
+                                            <input name="WipOutfits[@l].WipOutfitID" type="hidden" value="@index.WipOutfitID" />
+                                            <select asp-for="@index.PartNo" name="WipOutfits[@l].PartNo" asp-items="@ViewBag.OutfitCommodityInfo" class=""></select>
+                                        </td>
+                                        <td>
+                                            <select asp-for="@index.UnitNo" name="WipOutfits[@l].UnitNo" asp-items="@ViewBag.FactoryUnitByWipNo" class=""></select>
+                                        </td>
+
+                                        <td>
+                                            <select asp-for="@index.RuleStationID" name="WipOutfits[@l].RuleStationID" asp-items="@ViewBag.RuleStationByWipNoUnitNoList" class=""></select>
+                                        </td>
+                                        <td>
+                                            <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a>
+                                        </td>
                                     </tr>
-                                </thead>
-                                <tbody id="tblbody">
-                                </tbody>
-                            </table>*@
-                        <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" lay-submit lay-filter="queryOutfit">刷新</a>
-                        <table class="layui-hide" id="Outfit" lay-filter="Outfit"></table>
+                                    l++;
+                                }
+                            </tbody>
+                        </table>
                     </div>
 
                     @* SOP文件 sheet *@
-                    <div class="layui-tab-item" style="padding-left:30px">
-                        <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" lay-submit lay-filter="querysop">刷新</a>
-                        <table class="layui-hide" id="wipsop" lay-filter="wipsop"></table>
+                    <div class="layui-tab-item" lay-filter="test2">
+                        <a id="SopTableAdd" class="layui-btn layui-btn-xs layui-icon layui-icon-add-circle">新增</a>
+                        <input type="hidden" value=@Model.WipSops.Count() id="WipSopCount" />
+                        <table id="SopTable" class="layui-table">
+                            @{int i = 0;}
+                            <thead>
+                                <tr>
+                                    <th>
+                                        SOP文件敘述
+                                    </th>
+                                    <th>
+                                        檔案路徑
+                                    </th>
+                                    <th>
+                                        SOP類型
+                                    </th>
+                                    <th>
+                                        生產單位
+                                    </th>
+                                    <th>
+
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @foreach (var index in Model.WipSops)
+                                {
+                                    <tr>
+                                        <td>
+                                            <input name="WipSops[@i].WipSOPID" type="hidden" value="@index.WipSOPID" />
+                                            <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.SOPName" name="WipSops[@i].SOPName" />
+                                        </td>
+                                        <td>
+                                            <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.SOPPath" name="WipSops[@i].SOPPath" />
+                                        </td>
+                                        <td>
+                                            <select asp-for="@index.SOPType" name="WipSops[@i].SOPType" asp-items="@ViewBag.GetSOPTypeSelect" class=""></select>
+                                        </td>
+                                        <td>
+                                            <select asp-for="@index.UnitNo" name="WipSops[@i].UnitNo" asp-items="@ViewBag.FactoryUnitByWipNo" class=""></select>
+                                        </td>
+                                        <td>
+                                            <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a>
+                                        </td>
+                                    </tr>
+                                    i++;
+                                }
+                            </tbody>
+                        </table>
                     </div>
 
                     @* 標籤選項sheet *@
@@ -802,6 +982,7 @@
                             <label class="layui-form-label">公司LOGO</label>
                             <div class="layui-input-block">
                                 <cl-radio asp-items="@ViewBag.GetCheckboxCompanyLogo" asp-for="wipLabel.CompanyLogo"></cl-radio>
+
                             </div>
                         </div>
                         <div class="layui-form-item">
@@ -810,7 +991,6 @@
                                 <cl-radio asp-items="@ViewBag.GetCheckboxWipAttr" asp-for="wipLabel.WipAttr"></cl-radio>
                             </div>
                         </div>
-
                         <div class="layui-form-item">
                             <label class="layui-form-label">備註</label>
                             <div class="layui-input-block">
@@ -819,22 +999,57 @@
                         </div>
                     </div>
 
-
+                    @* 上傳資料sheet *@
+                    <div class="layui-tab-item">
+                        <div class="layui-form-item">
+                            <table lay-filter="demo" class="layui-table">
+                                <thead>
+                                    <tr>
+                                        <th lay-data="{field:'username', width:100}">檔案名稱</th>
+                                        <th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach (var index in Model.wipInfoBlobs)
+                                    {
+                                        <tr>
+                                            <td>
+
+                                                @index.ImageName
+                                            </td>
+                                            <td>
+                                                @index.Filepath
+                                            </td>
+                                        </tr>
+                                    }
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="layui-form-item">
+                            <div class="layui-inline">
+                                <label class="layui-form-label" asp-for="wipInfoBlob.ImageName">檔案</label>
+                                <label class="layui-btn">
+                                    <input type="file" name="formFile">
+                                </label>
+                                <input type="hidden" asp-for="wipInfoBlob.ImageName">
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
 
             <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
             <div class="layui-form-item">
                 <div style="text-align:center">
-                    <input type="submit" value="保存" class="layui-btn" />
+                    <input type="submit" value="保存" name="action" class="layui-btn" />
                 </div>
             </div>
         </form>
     </div>
 </div>
 @section Scripts {
-    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
-        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+    @*@{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }*@
 
     <script type="text/javascript">
         $(document).ready(function () {
@@ -1237,25 +1452,6 @@
             tableruleStation;
         };
 
-        function getPLMMeterial(val) {
-        var data = $("#PCS001").serialize();
-        console.info(data);
-               $.ajax(
-                {
-                    url: "@Url.Action("PCS001CreateWipNo", "PCS")",
-                    dataType: 'json',
-                    data: data,
-                    type: 'POST',
-                    success: function (result)
-                    {
-                    },
-                    error: function (result)
-                    {
-                        alert(result);
-                    }
-                });
-        };
-
         function refreshTable() {
             var FactoryUnit = getFactoryUnitList();
             var Select = "<select name=WipOutfits[" + No + "].UnitNo>";
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index 28fa1195..cc92133e 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -1495,6 +1495,7 @@
                 });
             return a;
         };
+
         //KP Items 選單
         function getItemsList()
         {
@@ -1517,6 +1518,7 @@
                 });
             return b;
         };
+
         //治具種類
         function getOutfitCommodityList()
         {
@@ -1539,6 +1541,7 @@
                 });
             return a;
         };
+
         //流程ID對應作業站
         function getRuleStationByFlowID(data)
         {
@@ -1561,6 +1564,7 @@
                 });
             return b;
         };
+
         //SOPType
         function getSOPType() {
                var a;