diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index c0b322bd..5b27c068 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -1045,6 +1045,32 @@ namespace AMESCoreStudio.Web.Controllers
             var result = await _pcsApi.GetPlmMeterialInfoAutoComplete(search);
             return Json(new { data = result });
         }
+
+
+        public async Task<JsonResult> MaterialKpQueryAsync(string itemno = null, string station = null)
+        {
+
+            IEnumerable<MaterialKpDto> result = await _pcsApi.GetMaterialKpQuery(itemno: itemno, station: station);
+
+            if (result.Count() != 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count() });
+            }
+            return Json(new Table() { count = 0, data = null });
+        }
+
+
+        public async Task<JsonResult> MaterialOutfitByItemNo(string itemno = null, string station = null)
+        {
+
+            var result = await _pcsApi.GetMaterialOutfitByItemNo(itemno);
+
+            if (result.Count() != 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count() });
+            }
+            return Json(new Table() { count = 0, data = null });
+        }
         #endregion
 
         [ResponseCache(Duration = 0)]
@@ -1210,6 +1236,17 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 int wipID = int.Parse(result.Msg);
 
+                // 料號判斷，沒有就Insert
+                var checkMaterialItem = await _pcsApi.GetMaterialItemByItemNO(model.wipAtt.ItemNO);
+                if (checkMaterialItem == null)
+                {
+                    await _pcsApi.PostMaterialItem(JsonConvert.SerializeObject(
+                        new MaterialItem
+                        {
+                            ItemNo = model.wipAtt.ItemNO
+                        }));
+                }
+
                 // 工單屬性
                 model.wipAtt.WipNO = model.wipInfo.WipNO;
                 await _pcsApi.PostWipAtt(JsonConvert.SerializeObject(model.wipAtt));
@@ -1253,14 +1290,6 @@ namespace AMESCoreStudio.Web.Controllers
                     }
                 }
 
-                // 工單對應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.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcode.EndNO))
                 {
@@ -1304,10 +1333,11 @@ namespace AMESCoreStudio.Web.Controllers
                     }
                 }
 
-                // KeyParts 組合
+                // 料號相關
                 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))
                     {
@@ -1324,6 +1354,37 @@ namespace AMESCoreStudio.Web.Controllers
                         };
                         await _pcsApi.PostWipKp(JsonConvert.SerializeObject(wipKp));
                     }
+
+                    // 治具
+                    var materialOutfit = await _pcsApi.GetMaterialOutfitByItemNo(model.wipAtt.ItemNO);
+                    foreach (var item in materialOutfit.Where(w => w.UnitNo == model.wipInfo.UnitNO))
+                    {
+                        var wipOutfit = new WipOutfit
+                        {
+                            WipNo = model.wipInfo.WipNO,
+                            ItemNo = model.wipAtt.ItemNO,
+                            UnitNo = model.wipInfo.UnitNO,
+                            OutfitNo = item.OutfitNo,
+                            PartNo = item.StationType
+                        };
+                        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
+                        };
+                        await _pcsApi.PostWipSop(JsonConvert.SerializeObject(wipSop));
+                    }
                 }
             }
 
@@ -1690,7 +1751,7 @@ namespace AMESCoreStudio.Web.Controllers
                 // 先比對新舊ID 當舊ID有 新的沒有代表已刪除
                 var resultOld_WipKp = await _pcsApi.GetWipKpByWipNo(model.wipInfo.WipNO);
                 var delete_WipKpID = resultOld_WipKp.Select(s => s.WipKpID).Except(model.WipKps.Select(s => s.WipKpID));
-                foreach(var id in delete_WipKpID)
+                foreach (var id in delete_WipKpID)
                 {
                     await _pcsApi.DeleteWipKp(id);
                 }
@@ -1992,18 +2053,6 @@ namespace AMESCoreStudio.Web.Controllers
         }
         #endregion
 
-        public async Task<JsonResult> MaterialKpQueryAsync(string itemno = null, string station = null)
-        {
-
-            IEnumerable<MaterialKpDto> result = await _pcsApi.GetMaterialKpQuery(itemno: itemno, station: station);
-
-            if (result.Count() != 0)
-            {
-                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count() });
-            }
-            return Json(new Table() { count = 0, data = null });
-        }
-
         #region PCS005 工單資料查詢
         public async Task<IActionResult> PCS005()
         {
@@ -3585,10 +3634,10 @@ namespace AMESCoreStudio.Web.Controllers
         /// <param name="dateEnd">鎖定日期迄</param>
         /// <returns></returns>
         public async Task<IActionResult> PCS030QueryAsync(string itemNo, string unitNo
-            , string fileName, string state, string date_str, string date_end)
+            , string sopName, string sopType, string date_str, string date_end)
         {
             IResultModel<MaterialSopDto> result = await _pcsApi.GetMaterialSopQuery(itemNo: itemNo, unitNo: unitNo
-            , fileName: fileName, state: state, date_str: date_str, date_end: date_end);
+            , sopName: sopName, sopType: sopType, date_str: date_str, date_end: date_end);
 
             if (result.Data.Count() != 0)
             {
@@ -3614,6 +3663,7 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpGet]
         public async Task<IActionResult> PCS030C()
         {
+            GetSOPTypeSelect();
             await GetFactoryUnit();
             return View();
         }
@@ -3621,63 +3671,98 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpPost]
         public async Task<IActionResult> PCS030CAsync(MaterialSop model, IFormFile formFile)
         {
-            string FileName = string.Empty;
-            string NewName = string.Empty;
-            string FilePath = string.Empty;
+            //string FileName = string.Empty;
+            //string NewName = string.Empty;
+            //string FilePath = string.Empty;
 
-            //var fileProvider = _fileServerProvider.GetProvider("/aa");
-            //var fileInfo = fileProvider.GetFileInfo("/");
-            if (formFile != null)
-            {
-                if (formFile.Length > 0)
-                {
-                    //取得使用者上傳檔案的原始檔名
-                    FileName = Path.GetFileName(formFile.FileName);
-                    //取原始檔名中的副檔名
-                    var fileExt = Path.GetExtension(FileName);
-                    //為避免使用者上傳的檔案名稱發生重複，重新給一個亂數名稱
-                    NewName = Path.GetRandomFileName() + fileExt;
-                    //指定要寫入的路徑、檔名和副檔名
-                    FilePath = $"\\PDF\\";//本機目錄
-                    using (var stream = new FileStream(_env.WebRootPath + FilePath + NewName, FileMode.Create))
-                    {
-                        await formFile.CopyToAsync(stream);
-                    }
+            ////var fileProvider = _fileServerProvider.GetProvider("/aa");
+            ////var fileInfo = fileProvider.GetFileInfo("/");
+            //if (formFile != null)
+            //{
+            //    if (formFile.Length > 0)
+            //    {
+            //        //取得使用者上傳檔案的原始檔名
+            //        FileName = Path.GetFileName(formFile.FileName);
+            //        //取原始檔名中的副檔名
+            //        var fileExt = Path.GetExtension(FileName);
+            //        //為避免使用者上傳的檔案名稱發生重複，重新給一個亂數名稱
+            //        NewName = Path.GetRandomFileName() + fileExt;
+            //        //指定要寫入的路徑、檔名和副檔名
+            //        FilePath = $"\\PDF\\";//本機目錄
+            //        using (var stream = new FileStream(_env.WebRootPath + FilePath + NewName, FileMode.Create))
+            //        {
+            //            await formFile.CopyToAsync(stream);
+            //        }
 
-                    //var fileProvider = _fileServerProvider.GetProvider("/aa");
-                    //var fileInfo = fileProvider.GetFileInfo(formFile.FileName);
-                    //fileInfo = fileProvider.GetFileInfo(formFile.FileName);
-                    ////遠端目錄
-                    //using (var stream = new FileStream(fileInfo.PhysicalPath, FileMode.Create))
-                    //{
-                    //    await formFile.CopyToAsync(stream);
-                    //}
+            //        //var fileProvider = _fileServerProvider.GetProvider("/aa");
+            //        //var fileInfo = fileProvider.GetFileInfo(formFile.FileName);
+            //        //fileInfo = fileProvider.GetFileInfo(formFile.FileName);
+            //        ////遠端目錄
+            //        //using (var stream = new FileStream(fileInfo.PhysicalPath, FileMode.Create))
+            //        //{
+            //        //    await formFile.CopyToAsync(stream);
+            //        //}
 
 
 
-                    IResultModel result;
-                    model.FileName = FileName;
-                    model.NewName = NewName;
-                    model.FilePath = FilePath;// fileInfo.PhysicalPath;
+            //        IResultModel result;
+            //        model.FileName = FileName;
+            //        model.NewName = NewName;
+            //        model.FilePath = FilePath;// fileInfo.PhysicalPath;
+
+            //        result = await _pcsApi.PostMaterialSop(JsonConvert.SerializeObject(model));
+            //        if (result.Success)
+            //        {
+            //            var _msg = model.MaterialSopID == 0 ? "新增成功！" : "修改成功！";
+            //            return RedirectToAction("Refresh", "Home", new { msg = _msg });
+            //        }
+            //        else
+            //        {
+            //            ModelState.AddModelError("error", result.Msg);
+            //        }
+            //    }
+            //}
+            //else
+            //{
+            //    ModelState.AddModelError("error", "請選擇要上傳檔案");
+            //}
+            await GetFactoryUnit();
+            GetSOPTypeSelect();
+
+            IResultModel result;
+            result = await _pcsApi.PostMaterialSop(JsonConvert.SerializeObject(model));
+            if (model.MaterialSopID == 0)
+            {
 
-                    result = await _pcsApi.PostMaterialSop(JsonConvert.SerializeObject(model));
-                    if (result.Success)
-                    {
-                        var _msg = model.MaterialSopID == 0 ? "新增成功！" : "修改成功！";
-                        return RedirectToAction("Refresh", "Home", new { msg = _msg });
-                    }
-                    else
-                    {
-                        ModelState.AddModelError("error", result.Msg);
-                    }
-                }
             }
             else
             {
-                ModelState.AddModelError("error", "請選擇要上傳檔案");
+                //result = await _basApi.putmat(model.FactoryID, JsonConvert.SerializeObject(model));
             }
-            await GetFactoryUnit();
-            return View(model);
+
+            if (result.Success)
+            {
+                var _msg = model.MaterialSopID == 0 ? "新增成功！" : "修改成功！";
+                return RedirectToAction("Refresh", "Home", new { msg = _msg });
+            }
+            else
+            {
+                if (result.Errors != null)
+                {
+                    ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
+                }
+                else
+                {
+                    ModelState.AddModelError("error", result.Msg);
+                }
+            }
+
+            if (model.MaterialSopID == 0)
+            {
+                return View("PCS030C", model);
+            }
+            return View("PCS030U", model);
+
         }
 
         [HttpPost]
@@ -3961,9 +4046,9 @@ namespace AMESCoreStudio.Web.Controllers
 
 
                     IResultModel result;
-                    model.FileName = FileName;
-                    model.NewName = NewName;
-                    model.FilePath = FilePath;// fileInfo.PhysicalPath;
+                    //model.FileName = FileName;
+                    //model.NewName = NewName;
+                    //model.FilePath = FilePath;// fileInfo.PhysicalPath;
 
                     result = await _pcsApi.PostMaterialSop(JsonConvert.SerializeObject(model));
                     if (result.Success)
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
index f992ce18..4dd72a4a 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
@@ -522,6 +522,13 @@ namespace AMESCoreStudio.Web
         /// <param name="id">料號</param>
         [WebApiClient.Attributes.HttpGet("api/MaterialItem/ByItemNO/{id}")]
         ITask<MaterialItem> GetMaterialItemByItemNO(string id);
+
+        /// <summary>
+        /// 新增料號基本資料檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/MaterialItem")]
+        ITask<ResultModel<MaterialItem>> PostMaterialItem([FromBody, RawJsonContent] string model);
         #endregion
 
         #region MaterialKp Keypart 料號KP資訊資料檔
@@ -539,6 +546,8 @@ namespace AMESCoreStudio.Web
         /// <param name="station">站別</param>
         [WebApiClient.Attributes.HttpGet("api/MaterialKp/GetMaterialKpQuery")]
         ITask<List<MaterialKpDto>> GetMaterialKpQuery(string itemno = null, string station = null);
+
+
         #endregion
 
         #region MaterialOutfit 料號治具資訊資料檔
@@ -555,10 +564,10 @@ namespace AMESCoreStudio.Web
         /// <param name="id">料號</param>
         [WebApiClient.Attributes.HttpGet("api/MaterialOutfit/ByItemNO/{id}")]
         ITask<List<MaterialOutfit>> GetMaterialOutfitByItemNo(string id);
-        
+
         #endregion
 
-        #region MaterialOutfit 料號站別工項資料檔
+        #region MaterialStationsItem 料號站別工項資料檔
         /// <summary>
         /// 料號站別工項資料檔 By ItemID
         /// </summary>
@@ -575,23 +584,27 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/MaterialSop/{id}")]
         ITask<MaterialSop> GetMaterialSop(int id);
 
+        /// <summary>
+        /// 料號SOP資訊資料檔 ByItemNo
+        /// </summary>
+        /// <param name="id">料號</param>
+        [WebApiClient.Attributes.HttpGet("api/MaterialSop/ByItemNO/{id}")]
+        ITask<List<MaterialSop>> GetMaterialSopByItemNo(string id);
 
         /// <summary>
-        /// 製程工單鎖定查詢 Query
+        /// 料號SOP查詢 Query
         /// </summary>
-        /// <param name="lockStatus">工單狀態:鎖定|解鎖</param>
-        /// <param name="lockType">鎖定類型</param>
-        /// <param name="lockReasonType">鎖定原因類別</param>
-        /// <param name="stations">站別</param>
-        /// <param name="wipNO">工單</param>
-        /// <param name="itemNO">料號</param>
+        /// <param name="itemNo">工單狀態:料號</param>
+        /// <param name="unitNo">生產但為</param>
+        /// <param name="sopName">檔案名稱</param>
+        /// <param name="sopType">sop類型</param>
         /// <param name="date_str">鎖定日期起</param>
         /// <param name="date_end">鎖定日期迄</param>
         /// <returns></returns>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/MaterialSop/GetMaterialSopQuery")]
         ITask<ResultModel<MaterialSopDto>> GetMaterialSopQuery(string itemNo = null, string unitNo = null
-            , string fileName = null, string state = null, string date_str = null, string date_end = null);
+            , string sopName = null, string sopType = null, string date_str = null, string date_end = null);
 
         /// <summary>
         /// 新增SOP文件
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
index 2ec7c857..2a6c1388 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
@@ -30,8 +30,8 @@
                 <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" onchange="getPLMMeterial(this)" autocomplete="off" placeholder="請輸入工單號碼" />
+
+                        <input asp-for="wipInfo.WipNO" class="layui-input"  autocomplete="off" style="text-transform:uppercase;" placeholder="請輸入工單號碼" />
                         <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>
@@ -41,7 +41,7 @@
                     </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" placeholder="請輸入料號" />
+                        <input asp-for="wipAtt.ItemNO" class="layui-input" autocomplete="off" style="text-transform:uppercase;" placeholder="請輸入料號" />
                         <span asp-validation-for="wipAtt.ItemNO" class="layui-bg-red"></span>
                     </div>
                     <label asp-for="wipInfo.PlanQTY" class="layui-form-label"></label>
@@ -449,6 +449,7 @@
                             </div>
                         </div>
 
+
                         <div class="layui-form-item">
                             <div class="layui-inline">
                                 <label class="layui-form-label">Power Mode</label>
@@ -456,8 +457,7 @@
                                     <select asp-for="wipSystem.PowerModeType" asp-items="@ViewBag.GetWipSystemPMTypeSelect" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" autocomplete="off" />
-                                    <span style="color: #dc3545 !important;"></span>
+                                    <input class="layui-input" style="text-transform:uppercase;" asp-for="wipSystem.PowerMode" autocomplete="off" />
                                 </div>
                             </div>
                         </div>
@@ -465,7 +465,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">PLM參考</label>
                             <div class="layui-input-block">
-                                <input class="layui-input" />
+                                <input class="layui-input" asp-for="wipSystem.PowerMode_Desc" readonly="readonly" />
                             </div>
                         </div>
 
@@ -643,42 +643,27 @@
                     </div>
 
                     @* 治具組合sheet *@
-                    <div class="layui-tab-item">
-                        <table id="MydataTable" class="layui-table">
-                            @{ int j = 0;}
-                            <thead>
-                                <tr>
-                                    <th>
-                                        治具NO
-                                    </th>
-                                    <th>
-                                        治具名稱
-                                    </th>
-                                    <th>
-                                        流程名稱ID
-                                    </th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                @foreach (var index in Model.Outfits)
-                                {
-                                    <tr>
-                                        <td>
-
-                                            @index.OutfitNo
-                                        </td>
-                                        <td>
-                                            @index.StationType
-                                        </td>
-                                        <td>
-                                            @index.RuleStationID
-                                        </td>
-                                    </tr>
-                                    j++;
-                                }
-                            </tbody>
-                        </table>
-                    </div>
+                <div class="layui-tab-item">
+                    @*<table id="OutfitTable" class="layui-table">
+                        <thead>
+                            <tr>
+                                <th>
+                                    治具NO
+                                </th>
+                                <th>
+                                    治具名稱
+                                </th>
+                                <th>
+                                    流程名稱ID
+                                </th>
+                            </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>
+                </div>
 
                     @* SOP文件 sheet *@
                     <div class="layui-tab-item" style="padding-left:30px">
@@ -832,8 +817,8 @@
                 , theme: 'grid'
             });
 
-            // PLM料號關鍵字
-            $(".autocomplete").each(function () {
+                // PLM料號關鍵字
+                $(".autocomplete").each(function () {
                     layui.autocomplete({
                         element: this,
                         display: 'meterialNo',
@@ -844,12 +829,26 @@
                         query: {},
                         resArray: 'data',
                         done: function (item) {
-                            $(this.element).closest('div.layui-inline').find('input[id*=' + this.element.id + '_Desc]').val(item.productionMemo);
+                            $(this.element).closest('div.layui-inline').find('input[id*=' + this.element.id + '_Desc]').val(item.meterialDesc);
                         }
                     });
                 })
+                // PowerMode
+                layui.autocomplete({
+                    element: '#wipSystem_PowerMode',
+                    display: 'meterialNo',
+                    shortcut: 'modelName',
+                    num: 2,
+                    count: 10,
+                    url: '/PCS/getPLMMeterialAutoComplete',
+                    query: {},
+                    resArray: 'data',
+                    done: function (item) {
+                        $('#wipSystem_PowerMode_Desc').val(item.productionMemo);
+                    }
+                });
 
-                form.on('select(unit)', function (data) {
+            form.on('select(unit)', function (data) {
                     $("#unitNo").val(data.value);
                     getFlowRuleList(data.value);
                     getLineInfoList(data.value);
@@ -1007,6 +1006,40 @@
             hg.msghide("重新載入資料..");
             tableKeyParts ;
         });
+        @* Outfit sheet *@
+        hg.form.onsubmit('queryOutfit', function (data) {
+            var item = $("#wipAtt_ItemNO").val();
+            if ($.trim(item) == '' || item == undefined) {
+                parent.hg.msg("請輸入料號");
+                return;
+            }
+            var tableCols = [[
+                {
+                    field: 'outfitNo',
+                    width: 150,
+                    title: '設備編碼',
+                    sort: true
+                },
+                {
+                    field: 'stationType',
+                    title: '設備名稱',
+                    width: 200,
+                    sort: true
+                },
+                {
+                    field: 'unit.unitName',
+                    title: '生產單位',
+                    sort: true,
+                    templet: function (fileIng) {
+                        return fileIng.unit.unitName;
+                    }
+                }
+                ]
+            ];
+            var tableOutfit = hg.table.datatable('Outfit', '治具維護', '/PCS/MaterialOutfitByItemNo?itemNo=' + item, {}, tableCols, '', false, 'full-100');
+            hg.msghide("重新載入資料..");
+            tableOutfit;
+        });
         @* SOP文件 sheet *@
         hg.form.onsubmit('querysop', function (data) {
             var item = $("#wipAtt_ItemNO").val();
@@ -1094,7 +1127,7 @@
             tableruleStation;
         };
 
-    function getPLMMeterial(val) {
+        function getPLMMeterial(val) {
         var data = $("#PCS001").serialize();
         console.info(data);
                $.ajax(
@@ -1112,5 +1145,24 @@
                     }
                 });
         };
+
+        function refreshTable() {
+            var FactoryUnit = getFactoryUnitList();
+            var Select = "<select name=WipOutfits[" + No + "].UnitNo>";
+            $.each(FactoryUnit, function (index, item) {
+                Select += '<option value=' + item.value + '>' + item.text + '</option>';
+            });
+            Select += '</select>';
+
+            $.each(result, function (key, item) {
+                var contactdiv = '<tr>' +
+                    '<td><input value="" onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipOutfits[' + No + '].OutfitNo" /></td>' +
+                    '<td><input value="" onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipOutfits[' + No + '].PartNo" /></td>' +
+                    '<td>' + Select + '</td>' +
+                    '<td><a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a></td>' +
+                    '</tr>';
+                $('#OutfitTable').append(contactdiv);
+            });
+        }
 </script>
 }
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS030.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS030.cshtml
index f5efcce1..b282f127 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS030.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS030.cshtml
@@ -58,12 +58,10 @@
                     </div>
                     <div class="layui-col-sm4">
                         <div class="layui-inline">
-                            <label class="layui-form-label">文件狀態:</label>
+                            <label class="layui-form-label">SOP類型:</label>
                             <div class="layui-input-inline" style="width:100px">
-                                <select id="state" lay-filter="lockType" name="state" lay-submit>
+                                <select id="sopType" name="sopType" asp-items="@ViewBag.GetSOPTypeSelect" class="">
                                     <option value="">全部</option>
-                                    <option value="Y">使用中</option>
-                                    <option value="N">停用</option>
                                 </select>
                             </div>
                         </div>
@@ -75,9 +73,9 @@
                 <div class="layui-form-item">
                     <div class="layui-col-sm4">
                         <div class="layui-inline">
-                            <label class="layui-form-label">文件名稱:</label>
+                            <label class="layui-form-label">檔案名稱:</label>
                             <div class="layui-input-inline">
-                                <input id="fileName" name="fileName" autocomplete="off" class="layui-input" placeholder="請輸入文件名稱">
+                                <input id="sopName" name="sopName" autocomplete="off" class="layui-input" placeholder="請輸入文件名稱">
                             </div>
                         </div>
                     </div>
@@ -194,13 +192,13 @@
                 sort: true
             },
             {
-                field: 'fileName',
+                field: 'sopName',
                 title: '檔案名稱',
                 sort: true
             },
             {
-                field: 'state',
-                title: '狀態',
+                field: 'spType',
+                title: 'SOP類型',
                 width: 100,
                 sort: true
             },
@@ -216,7 +214,6 @@
                 width: 150,
                 templet: '<div>{{ layui.util.toDateString(d.updateDate, "yyyy/MM/dd") }}</div>'
             },
-            { field: 'state', title: '啟用/停用', width: 120, templet: '#switchState', unresize: true },
             {
                 field: 'right',
                 width: 80,
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS030C.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS030C.cshtml
index e6524e17..98a8eaf1 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS030C.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS030C.cshtml
@@ -27,7 +27,6 @@
                 </div>
             </div>
 
-
             <div class="layui-form-item">
                 <label asp-for="UnitNo" class="layui-form-label"></label>
                 <div class="layui-input-inline">
@@ -38,12 +37,31 @@
 
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label asp-for="FileName" class="layui-form-label"></label>
+                    <label asp-for="SopName" class="layui-form-label"></label>
+
+                    <div class="layui-input-inline">
+                        <input type="text" class="layui-input" asp-for="SopName">
+                        <span asp-validation-for="SopName" class="layui-bg-red"></span>
+                    </div>
+                </div>
+            </div>
 
-                    <label class="layui-btn">
-                        <input type="file" name="formFile" >
-                        @*<i class="layui-icon">&#xe67c;</i>上傳文件*@
-                    </label>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="SopPath" class="layui-form-label"></label>
+                    <div class="layui-input-block">
+                        <input type="text" class="layui-input" asp-for="SopPath">
+                        <span asp-validation-for="SopPath" class="layui-bg-red"></span>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="SopType" class="layui-form-label"></label>
+                    <div class="layui-input-block">
+                        <select asp-for="SopType" asp-items="@ViewBag.GetSOPTypeSelect" class=""></select>
+                    </div>
                 </div>
             </div>
 
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/MaterialItemController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/MaterialItemController.cs
index ffe55c93..4b18306f 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/MaterialItemController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/MaterialItemController.cs
@@ -83,7 +83,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             ResultModel<MaterialItem> result = new ResultModel<MaterialItem>();
             Helper helper = new Helper(_context);
-
+            MaterialItem.ItemID = helper.GetIDKey("ITEM_ID").Result;
             _context.MaterialItems.Add(MaterialItem);
             try
             {
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/MaterialKpController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/MaterialKpController.cs
index 4546a7a8..32e5b3d1 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/MaterialKpController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/MaterialKpController.cs
@@ -57,7 +57,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         }
 
 
-
         /// <summary>
         /// 料號基本資料檔 to ItemID
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/MaterialSopController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/MaterialSopController.cs
index c9541191..3ab9fc6c 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/MaterialSopController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/MaterialSopController.cs
@@ -60,20 +60,33 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return materialSop;
         }
 
+        /// <summary>
+        /// 料號SOP資料檔 to ItemID
+        /// </summary>
+        /// <param name="id">ItemID</param>
+        /// <returns></returns>
+        [HttpGet("ByItemNo/{id}")]
+        public async Task<IEnumerable<MaterialSop>> GetMaterialSopByItemNo(string id)
+        {
+            IQueryable<MaterialSop> q = _context.MaterialSops;
+            var result = await q.Where(p => p.ItemNo == id).ToListAsync();
+            return result;
+        }
+
         /// <summary>
         /// SOP文件查詢
         /// </summary>
         /// <param name="itemNo">料號</param>
         /// <param name="unitNo">生產單位</param>
-        /// <param name="fileName">檔案名稱</param>
-        /// <param name="state">狀態</param>
+        /// <param name="sopName">檔案名稱</param>
+        /// <param name="sopType">SOP類型</param>
         /// <param name="date_str">建立日期起</param>
         /// <param name="date_end">建立日期迄</param>
         /// <returns></returns>
         [Route("[action]")]
         [HttpGet]
         public async Task<ResultModel<MaterialSopDto>> GetMaterialSopQuery(string itemNo = null, string unitNo = null
-            , string fileName = null, string state = null, string date_str = null, string date_end = null)
+            , string sopName = null, string sopType = null, string date_str = null, string date_end = null)
         {
             IQueryable<MaterialSop> q = _context.MaterialSops;
 
@@ -83,11 +96,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             if (!string.IsNullOrWhiteSpace(unitNo))
                 q = q.Where(w => w.UnitNo == unitNo);
 
-            if (!string.IsNullOrWhiteSpace(fileName))
-                q = q.Where(w => w.FileName.Contains(fileName));
+            if (!string.IsNullOrWhiteSpace(sopName))
+                q = q.Where(w => w.SopType.Contains(sopName));
 
-            if (!string.IsNullOrWhiteSpace(state))
-                q = q.Where(w => w.State == state);
+            if (!string.IsNullOrWhiteSpace(sopType))
+                q = q.Where(w => w.SopType == sopType);
 
 
             if (DateTime.TryParse(date_str, out _))
@@ -106,10 +119,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 MaterialSopID = s.MaterialSopID,
                 ItemNo = s.ItemNo,
                 UnitName = s.FactoryUnit.UnitName,
-                FileName = s.FileName,
-                FilePath = s.FilePath,
-                State = s.State == "Y" ? "使用中" : "停用",
-                NewName = s.NewName,
+                SopName = s.SopName,
+                SopPath = s.SopPath,
+                SopType = s.SopType,
                 CreateDate = s.CreateDate,
                 CreateUserID = s.CreateUserID,
                 UpdateDate = s.UpdateDate,
@@ -125,7 +137,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             ResultModel<MaterialSop> result = new ResultModel<MaterialSop>();
             Helper helper = new Helper(_context);
             materialSop.MaterialSopID = helper.GetIDKey("MATERIAL_SOP_ID").Result;
-            materialSop.State = "Y";
             //wipLog.WipSopID = wipLog.WipID == 0 ? helper.GetIDKeyNoPost("WIP_ID").Result : wipLog.WipID;
             _context.MaterialSops.Add(materialSop);
             try
@@ -150,7 +161,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             var materialSop = new MaterialSop
             {
                 MaterialSopID = id,
-                State = state,
                 UpdateUserID = 1,
                 UpdateDate = System.DateTime.Now
            
@@ -158,7 +168,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             _context.Attach(materialSop);
 
             // 指定更新某個欄位
-            _context.Entry(materialSop).Property(p => p.State).IsModified = true;
             _context.Entry(materialSop).Property(p => p.UpdateUserID).IsModified = true;
             _context.Entry(materialSop).Property(p => p.UpdateDate).IsModified = true;
 
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/MaterialSopDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/MaterialSopDto.cs
index 69d03c62..671e3993 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/MaterialSopDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/MaterialSopDto.cs
@@ -27,24 +27,19 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         public string UnitName { get; set; }
 
         /// <summary>
-        /// 上傳檔案名稱
+        /// 檔案名稱
         /// </summary>
-        public string FileName { get; set; }
-
-        /// <summary>
-        /// 存放檔案名稱
-        /// </summary>
-        public string NewName { get; set; }
+        public string SopName { get; set; }
 
         /// <summary>
         /// 檔案路徑
         /// </summary>
-        public string FilePath { get; set; }
+        public string SopPath { get; set; }
 
         /// <summary>
-        /// Y:使用中N:停用
+        /// SOP類型
         /// </summary>
-        public string State { get; set; } = "Y";
+        public string SopType { get; set; }
 
         /// <summary>
         /// 建立UserID
diff --git a/AMESCoreStudio.WebApi/Models/AMES/MaterialSop.cs b/AMESCoreStudio.WebApi/Models/AMES/MaterialSop.cs
index 69f5e782..2b9bb06a 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/MaterialSop.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/MaterialSop.cs
@@ -39,50 +39,41 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// 生產單位ID
         /// </summary>
         [Display(Name = "生產單位")]
-        [Required]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Column("UNIT_NO")]
-        [StringLength(1)]
+        [StringLength(2)]
         [DataMember]
         public string UnitNo { get; set; }
 
         /// <summary>
-        /// 上傳檔案名稱
+        /// 檔案名稱
         /// </summary>
         [Display(Name = "檔案名稱")]
-        [Required]
-        [Column("FILENAME")]
-        [StringLength(100)]
-        [DataMember]
-        public string FileName { get; set; }
-
-        /// <summary>
-        /// 存放檔案名稱
-        /// </summary>
-        [Display(Name = "存放檔案名稱")]
-        [Required]
-        [Column("NEWNAME")]
-        [StringLength(100)]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Column("SOP_NAME")]
+        [StringLength(60)]
         [DataMember]
-        public string NewName { get; set; }
+        public string SopName { get; set; }
 
         /// <summary>
         /// 檔案路徑
         /// </summary>
-        [DataMember]
         [Display(Name = "檔案路徑")]
-        [Required]
-        [Column("FILEPATH")]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Column("SOP_PATH")]
         [StringLength(100)]
-        public string FilePath { get; set; }
+        [DataMember]
+        public string SopPath { get; set; }
 
         /// <summary>
-        /// Y:使用中N:停用
+        /// SOP類型
         /// </summary>
-        [Display(Name = "狀態")]
-        [Column("STATE")]
-        [StringLength(1)]
         [DataMember]
-        public string State { get; set; } = "Y";
+        [Display(Name = "SOP類型")]
+        [Required]
+        [Column("SOP_TYPE")]
+        [StringLength(10)]
+        public string SopType { get; set; }
 
         /// <summary>
         /// 建立UserID