diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index c9558b12..9e6009de 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -3966,6 +3966,8 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpPost]
         public async Task<IActionResult> PCS024CSaveAsync(BarcodeItem model)
         {
+
+            var bNo = model.B.BarcodeNo;
             if (ModelState.IsValid)
             {
                 IResultModel result;
@@ -3979,21 +3981,21 @@ namespace AMESCoreStudio.Web.Controllers
                 }
                 else
                 {
-                    var BarcodeItem = await _pcsApi.GetBarcodeItem(model.BarcodeItemID);
-                    var tt = BarcodeItem[0];
+                    //var BarcodeItem = await _pcsApi.GetBarcodeItem(model.BarcodeItemID);
+                    //var tt = BarcodeItem[0];
+                    //ViewBag.BarcodeID = model.BarcodeID;
+                    //ViewBag.WipID = model.WipID;
+                    //ViewBag.BarcodeNo = bNo;
+                    var BarcodeInfoes = await _pcsApi.GetBarcodeInfoesByNo(bNo);
+                    var tt = BarcodeInfoes[0];
                     ViewBag.BarcodeID = tt.BarcodeID;
                     ViewBag.WipID = tt.WipID;
-                    ViewBag.BarcodeNo = tt.B.BarcodeNo;
+                    ViewBag.BarcodeNo = bNo;
+                    await GetFactoryUnit();
+                    await GetItems();
 
                     ModelState.AddModelError("error", result.Msg);
-                    //if (result.Errors.Count > 0)
-                    //{
-                    //    ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
-                    //}
-                    //else
-                    //{
-                    //    ModelState.AddModelError("error", result.Msg);
-                    //}
+
                 }
             }
             return View("PCS024C", model);
diff --git a/AMESCoreStudio.Web/Views/JIG/JIG001.cshtml b/AMESCoreStudio.Web/Views/JIG/JIG001.cshtml
index e8187d87..cc7127fa 100644
--- a/AMESCoreStudio.Web/Views/JIG/JIG001.cshtml
+++ b/AMESCoreStudio.Web/Views/JIG/JIG001.cshtml
@@ -86,9 +86,9 @@
                 templet: function (d) {
                     var str = '';
                     if (d.typeFlag == 0)
-                        str = '設備/料件';
+                        str = '設備';
                     else
-                        str = '耗材';
+                        str = '料件';
                     return str
                 }
             },
diff --git a/AMESCoreStudio.Web/Views/JIG/JIG002C.cshtml b/AMESCoreStudio.Web/Views/JIG/JIG002C.cshtml
index 7ca2889e..0df8af5a 100644
--- a/AMESCoreStudio.Web/Views/JIG/JIG002C.cshtml
+++ b/AMESCoreStudio.Web/Views/JIG/JIG002C.cshtml
@@ -24,7 +24,7 @@
 
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="CommodityID" class="control-label col-sm-3"></label>
-                <select asp-for="CommodityID"  asp-items="@ViewBag.TypesList"  class="custom-select col-sm-9">
+                <select asp-for="CommodityID" asp-items="@ViewBag.TypesList" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>
                 <span asp-validation-for="CommodityID" class="text-danger offset-sm-3 my-sm-1"></span>
@@ -49,6 +49,11 @@
                 <input asp-for="UseLimitTimes" class="form-control col-sm-9" />
                 <span asp-validation-for="UseLimitTimes" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="AlertForeDays" class="control-label col-sm-3"></label>
+                <input asp-for="AlertForeDays" class="form-control col-sm-9" />
+                <span asp-validation-for="AlertForeDays" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
             @*<div class="form-group form-inline my-sm-1">
             <label asp-for="Status" class="control-label col-sm-3"></label>
             <select asp-for="Status" class="custom-select col-sm-9">
diff --git a/AMESCoreStudio.Web/Views/JIG/JIG002U.cshtml b/AMESCoreStudio.Web/Views/JIG/JIG002U.cshtml
index 4f770999..28358f2e 100644
--- a/AMESCoreStudio.Web/Views/JIG/JIG002U.cshtml
+++ b/AMESCoreStudio.Web/Views/JIG/JIG002U.cshtml
@@ -16,15 +16,15 @@
         <form enctype="multipart/form-data" method="post" asp-action="JIG002USave">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <input type="hidden" asp-for="VarityID" />
-            <input type="hidden" asp-for="CreateUserID"  />
+            <input type="hidden" asp-for="CreateUserID" />
             <input type="hidden" asp-for="UpdateUserID" value="@ViewBag.UserID" />
-            <input type="hidden" asp-for="CreateDate"  />
+            <input type="hidden" asp-for="CreateDate" />
             <input type="hidden" asp-for="UpdateDate" value="@System.DateTime.Now" />
             <input type="hidden" asp-for="Status" value="A" />
 
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="CommodityID" class="control-label col-sm-3"></label>
-                <select asp-for="CommodityID"  asp-items="@ViewBag.TypesList"  class="custom-select col-sm-9">
+                <select asp-for="CommodityID" asp-items="@ViewBag.TypesList" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>
                 <span asp-validation-for="CommodityID" class="text-danger offset-sm-3 my-sm-1"></span>
@@ -50,13 +50,18 @@
                 <span asp-validation-for="UseLimitTimes" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                    <label asp-for="Status" class="control-label col-sm-3"></label>
-                    <select asp-for="Status" class="custom-select col-sm-9">
-                        <option value="A">可用</option>
-                        <option value="S">停用</option>
-                    </select>
-                    <span asp-validation-for="Status" class="text-danger offset-sm-3 my-sm-1"></span>
-                </div>
+                <label asp-for="AlertForeDays" class="control-label col-sm-3"></label>
+                <input asp-for="AlertForeDays" class="form-control col-sm-9" />
+                <span asp-validation-for="AlertForeDays" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="Status" class="control-label col-sm-3"></label>
+                <select asp-for="Status" class="custom-select col-sm-9">
+                    <option value="A">可用</option>
+                    <option value="S">停用</option>
+                </select>
+                <span asp-validation-for="Status" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
             <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
             <div class="form-group">
                 <input type="submit" value="保存" class="btn btn-primary offset-sm-3" />
diff --git a/AMESCoreStudio.Web/Views/JIG/JIG006.cshtml b/AMESCoreStudio.Web/Views/JIG/JIG006.cshtml
index dfd87ac5..8ea34ce9 100644
--- a/AMESCoreStudio.Web/Views/JIG/JIG006.cshtml
+++ b/AMESCoreStudio.Web/Views/JIG/JIG006.cshtml
@@ -1,5 +1,5 @@
 @{
-    ViewData["Title"] = "設備基本數據維護";
+    ViewData["Title"] = "設備報廢/送修";
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
 }
 
diff --git a/AMESCoreStudio.Web/Views/JIG/JIG006S.cshtml b/AMESCoreStudio.Web/Views/JIG/JIG006S.cshtml
index fd76cf7c..be5f8b63 100644
--- a/AMESCoreStudio.Web/Views/JIG/JIG006S.cshtml
+++ b/AMESCoreStudio.Web/Views/JIG/JIG006S.cshtml
@@ -39,7 +39,7 @@
                     <option value="">請選擇</option>
                 </select>
                 <span asp-validation-for="StatusUserID" class="text-danger offset-sm-3 my-sm-1"></span>
-            </div>ConfirmUserID
+            </div>
             <div class="form-group form-inline my-sm-1">
                 <label class="control-label col-sm-3">報廢日期</label>
                 <input asp-for="StatusDate" value="@ViewBag.StatusDate" type="date" class="form-control col-sm-9" readonly />
@@ -53,7 +53,7 @@
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label class="control-label col-sm-3">判定人員</label>
-                <select id="ConfirmUserID" asp-for="ConfirmUserID" asp-items="@ViewBag.UserList" class="custom-select col-sm-9">
+                <select asp-for="ConfirmUserID" id="ConfirmUserID" asp-items="@ViewBag.UserList" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>
                 <span asp-validation-for="ConfirmUserID" class="text-danger offset-sm-3 my-sm-1"></span>
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS024C.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS024C.cshtml
index 88add3b4..3183e2b2 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS024C.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS024C.cshtml
@@ -21,6 +21,7 @@
             <input type="hidden" asp-for="CreateDate" value="@System.DateTime.Now" />
             <input type="hidden" asp-for="UpdateDate" value="@System.DateTime.Now" />
             <input type="hidden" asp-for="SysType" value="I" />
+            <input type="hidden" asp-for="B.BarcodeNo" value="@ViewBag.BarcodeNo" readonly />
 
             <div class="form-group form-inline my-sm-1">
                 <label class="control-label col-sm-3">製程單位</label>
@@ -30,7 +31,7 @@
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label class="control-label col-sm-3">站別</label>
-                <select asp-for="RuleStationID"  name="Role" id="Role" lay-filter="RoleInfo" asp-items="@ViewBag.GetStationsList" class="custom-select col-sm-9">
+                <select asp-for="RuleStationID" name="Role" id="Role" lay-filter="RoleInfo" asp-items="@ViewBag.GetStationsList" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>
                 <input type="hidden" name="RuleStationID" id="RuleStationID" />
@@ -90,21 +91,19 @@
          //再利用ajax將資料傳到後端，來獲取到對應下拉框選項而出現的值
         //檢查專案新增到下拉框中
         $.ajax({
-            url: "/BAS/GetRuleStationByUnit",
+            url: "/BAS/GetStationses",
             //url: "/BAS/GetStationsByUnit",
             dataType: 'json',
-            data: { id: data },
+            //data: { id: data },
             contentType: "application/json",
             type: 'get',
             success: function (result) {
-                console.info("info:" );
-                console.info(result.data);
                 if (result.data) {
                     $("#Role").empty();//清空下拉框的值
                     $('#Role').append(new Option("請選擇", ""));
                     $.each(result.data, function (index, item) {
-                        $('#Role').append(new Option(item.station.stationName, item.ruleStationID));// 下拉選單裡新增元素
-                        //$('#Role').append(new Option(item.stationName, item.stationID));// 下拉選單裡新增元素
+                        if (item.unitNo == data)
+                            $('#Role').append(new Option(item.stationName, item.stationID));// 下拉選單裡新增元素
                     });
                 }
                 else {
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS025U.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS025U.cshtml
index 5447bbe5..5531e78d 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS025U.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS025U.cshtml
@@ -79,10 +79,10 @@
          //再利用ajax將資料傳到後端，來獲取到對應下拉框選項而出現的值
         //檢查專案新增到下拉框中
         $.ajax({
-            url: "/BAS/GetRuleStationByUnit",
+            url: "/BAS/GetStationses",
             //url: "/BAS/GetStationsByUnit",
             dataType: 'json',
-            data: { id: data },
+            //data: { id: data },
             contentType: "application/json",
             type: 'get',
             success: function (result) {
@@ -92,8 +92,8 @@
                     $("#Role").empty();//清空下拉框的值
                     $('#Role').append(new Option("請選擇", ""));
                     $.each(result.data, function (index, item) {
-                        $('#Role').append(new Option(item.station.stationName, item.ruleStationID));// 下拉選單裡新增元素
-                        //$('#Role').append(new Option(item.stationName, item.stationID));// 下拉選單裡新增元素
+                        if (item.unitNo == data)
+                            $('#Role').append(new Option(item.stationName, item.stationID));// 下拉選單裡新增元素
                     });
                 }
                 else {
diff --git a/AMESCoreStudio.Web/Views/SPC/SPC001.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC001.cshtml
index 9d083825..7d504449 100644
--- a/AMESCoreStudio.Web/Views/SPC/SPC001.cshtml
+++ b/AMESCoreStudio.Web/Views/SPC/SPC001.cshtml
@@ -57,7 +57,7 @@
         //通过行tool删除，lay-event="del"
         function del(obj) {
             if (obj.data.inspectionTypeID) {
-                hg.confirm("巡檢類別：" + obj.data.groupName + "，确定要删除吗？", function () {
+                hg.confirm("巡檢類別：" + obj.data.inspectionNo + "，确定要删除吗？", function () {
                     $.ajax({
                         url: '/SPC/SPC001D',
                         data: { id: obj.data.inspectionTypeID },
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll
index 34cc09de..d3fd4ce8 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb
index e5e89358..938bb278 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll
index 0e87fb75..a42a9fbf 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb
index 47865eb2..029be5a8 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll
index 8f77484f..28184278 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb
index 09d84725..8936783d 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll
index 9677c5ff..8908aa93 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb
index 813a69cf..ad1fcf35 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
index e70681d1..7908f82c 100644
--- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
+++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
@@ -388,6 +388,14 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeStationController.GetBarcodeStationByInputQty(System.Int32,System.Int32)">
+            <summary>
+            查詢 已過站數量
+            </summary>
+            <param name="wipID">工單ID</param>
+            <param name="ruleStationID">站別ID</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeStationController.GetBarcodeStationByWipID(System.Int32)">
             <summary>
             用工單ID查是否有過站紀錄
@@ -1653,58 +1661,6 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController">
-            <summary>
-            料號基本資料檔Controller
-            </summary>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.#ctor(AMESCoreStudio.WebApi.AMESContext)">
-            <summary>
-            建構式
-            </summary>
-            <param name="context"></param>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.GetMaterialFlows">
-            <summary>
-            查詢料號流程資料檔
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.GetMaterialFlow(System.Int32)">
-            <summary>
-            料號流程資料檔
-            </summary>
-            <param name="id">ItemID</param>
-            <returns></returns>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.GetMaterialFlowsByQuery(System.String,System.String)">
-            <summary>
-             料號流程查詢
-            </summary>
-            <param name="itemno">料號</param>
-            <param name="unitNo">站別</param>
-            <returns></returns>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.PostMaterialFlows(AMESCoreStudio.WebApi.Models.BAS.MaterialFlow)">
-            <summary>
-            新增料號流程資料檔
-            </summary>
-            <param name="MaterialFlow"></param>
-            <returns></returns>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.PutMaterialFlows(System.Int32,AMESCoreStudio.WebApi.Models.BAS.MaterialFlow)">
-            <summary>
-            修改料號流程資料檔
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.DeleteMaterialFlow(System.Int32)">
-            <summary>
-            Delete料號流程
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
         <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.MaterialItemController">
             <summary>
             料號基本資料檔Controller
@@ -3608,6 +3564,13 @@
             <param name="wipBarcode"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipBarcodeController.PutWipBarcode(AMESCoreStudio.WebApi.Models.AMES.WipBarcode)">
+            <summary>
+            更新工單資料-條碼Barcode
+            </summary>
+            <param name="wipBarcode"></param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipBarcodeController.DeleteWipBarcode(System.String,System.String,System.String)">
             <summary>
             刪除工單條碼區間
@@ -3838,6 +3801,20 @@
             <param name="wipno">工單號碼</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfoCheckStart(System.String)">
+            <summary>
+            查詢工單是否投入
+            </summary>
+            <param name="wipno">工單號碼</param>
+            <returns>Y:投入N:未投入</returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfoCheckStartLine(System.String)">
+            <summary>
+            查詢工單是否開線
+            </summary>
+            <param name="wipno">工單號碼</param>
+            <returns>Y:已開線N:未開線</returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.PostWipInfo(AMESCoreStudio.WebApi.Models.AMES.WipInfo)">
             <summary>
             新增工單資料
@@ -3859,6 +3836,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.DeleteWipinfo(System.String)">
+            <summary>
+            删除工單相關資料
+            </summary>
+            <param name="id">工單號碼</param>
+            <returns></returns>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.WipKpsController">
             <summary>
             工單KP資訊資料檔
@@ -4019,6 +4003,15 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipMACController.GetCheckMAC(System.String,System.String,System.String)">
+            <summary>
+            確認MAC區間是否有重複
+            </summary>
+            <param name="id">工單號碼</param>
+            <param name="startNo">MAC起</param>
+            <param name="endNo">MAC迄</param>
+            <returns></returns>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.WipOutfitController">
             <summary>
             工單治具資料檔
@@ -4569,13 +4562,14 @@
             <param name="ItemNo">料號</param>
             <returns>0:找不到</returns>
         </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.GetBarCodeLastStopRuleStationID(System.Int32,System.Int32,System.Int32)">
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.GetBarCodeLastStopRuleStationID(System.Int32,System.Int32,System.Int32,System.Int32)">
             <summary>
             取得上一個作業站RuleStationID
             </summary>
             <param name="wipID">工單ID</param>
             <param name="barCodeID">BarCodeID</param>
             <param name="stationID">目前作業站ID</param>
+            <param name="flowRuleID">工單流程ID</param>
             <returns>true:false</returns>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.CheckNextStopCloseStation(System.String,System.String,System.Int32)">
@@ -5002,6 +4996,14 @@
             <param name="unitNo">站別</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.MaterialFlowsController.GetMaterialFlowsByWip(System.String,System.String)">
+            <summary>
+             料號流程查詢 By工單
+            </summary>
+            <param name="itemno">料號</param>
+            <param name="unitNo">站別</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.MaterialFlowsController.PostMaterialFlows(AMESCoreStudio.WebApi.Models.BAS.MaterialFlow)">
             <summary>
             新增料號流程資料檔
@@ -5117,11 +5119,11 @@
             <param name="nextStationId"></param>
             <returns></returns>
         </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.RulesController.GetRulesByNextStation(System.Int32)">
+        <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.RulesController.GetRulesByFlowRuleID(System.Int32)">
             <summary>
-            根據下一站別ID查詢
+            By流程ID 查詢
             </summary>
-            <param name="id"></param>
+            <param name="id">流程ID</param>
             <returns></returns>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.RulesController.PutRules(System.Int32,AMESCoreStudio.WebApi.Models.BAS.Rules)">
@@ -8430,6 +8432,7 @@
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeItem.RuleStationID">
             <summary>
             流程站别ID
+            改抓StationID 20220418
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeItem.ItemNo">
@@ -11891,6 +11894,11 @@
             預定試用次數
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.OutfitVarityInfo.AlertForeDays">
+            <summary>
+            預警提前天數
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.OutfitVarityInfo.CreateUserID">
             <summary>
             創建者ID
@@ -13661,6 +13669,11 @@
             客戶料號
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipInfo.FlowRemark">
+            <summary>
+            作業流程備註
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipInfo.GetFactoryUnit">
             <summary>
             生產單位
diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs
index d90bfbb8..ba8cfb78 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs
@@ -37,6 +37,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
 
         /// <summary>
         /// 流程站别ID
+        /// 改抓StationID 20220418
         /// </summary>
         [Column("RULE_STATION_ID")]
         [DataMember]
diff --git a/AMESCoreStudio.WebApi/Models/AMES/InspectionForm.cs b/AMESCoreStudio.WebApi/Models/AMES/InspectionForm.cs
index 89ea1bec..3d3b1e26 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/InspectionForm.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/InspectionForm.cs
@@ -25,6 +25,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// 巡檢類別ID
         /// </summary>
         [Column("INSPECTION_TYPEID")]
+        [Display(Name = "巡檢類別")]
         [DataMember]
         public int InspectionTypeID { get; set; }
 
diff --git a/AMESCoreStudio.WebApi/Models/AMES/OutfitVarityInfo.cs b/AMESCoreStudio.WebApi/Models/AMES/OutfitVarityInfo.cs
index 2afd0730..be3f8d20 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/OutfitVarityInfo.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/OutfitVarityInfo.cs
@@ -77,9 +77,20 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("USE_LIMIT_TIMES")]
         [DataMember]
         [Required]
-        [Display(Name = "預定試用次數")]
+        [Display(Name = "預定使用次數")]
         public int UseLimitTimes { get; set; } = 0;
 
+
+        /// <summary>
+        /// 預警提前天數
+        /// </summary>
+        [Column("ALERT_FORE_DAYS")]
+        [DataMember]
+        [Required]
+        [Display(Name = "預警提前天數")]
+        public int AlertForeDays { get; set; } = 0;
+        
+
         /// <summary>
         /// 創建者ID
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll
index 8f77484f..28184278 100644
Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll differ
diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb
index 09d84725..8936783d 100644
Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb differ
diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll
index 9677c5ff..8908aa93 100644
Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll differ
diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb
index 813a69cf..ad1fcf35 100644
Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb differ
diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
index e70681d1..7908f82c 100644
--- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
+++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
@@ -388,6 +388,14 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeStationController.GetBarcodeStationByInputQty(System.Int32,System.Int32)">
+            <summary>
+            查詢 已過站數量
+            </summary>
+            <param name="wipID">工單ID</param>
+            <param name="ruleStationID">站別ID</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeStationController.GetBarcodeStationByWipID(System.Int32)">
             <summary>
             用工單ID查是否有過站紀錄
@@ -1653,58 +1661,6 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController">
-            <summary>
-            料號基本資料檔Controller
-            </summary>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.#ctor(AMESCoreStudio.WebApi.AMESContext)">
-            <summary>
-            建構式
-            </summary>
-            <param name="context"></param>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.GetMaterialFlows">
-            <summary>
-            查詢料號流程資料檔
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.GetMaterialFlow(System.Int32)">
-            <summary>
-            料號流程資料檔
-            </summary>
-            <param name="id">ItemID</param>
-            <returns></returns>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.GetMaterialFlowsByQuery(System.String,System.String)">
-            <summary>
-             料號流程查詢
-            </summary>
-            <param name="itemno">料號</param>
-            <param name="unitNo">站別</param>
-            <returns></returns>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.PostMaterialFlows(AMESCoreStudio.WebApi.Models.BAS.MaterialFlow)">
-            <summary>
-            新增料號流程資料檔
-            </summary>
-            <param name="MaterialFlow"></param>
-            <returns></returns>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.PutMaterialFlows(System.Int32,AMESCoreStudio.WebApi.Models.BAS.MaterialFlow)">
-            <summary>
-            修改料號流程資料檔
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialFlowController.DeleteMaterialFlow(System.Int32)">
-            <summary>
-            Delete料號流程
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
         <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.MaterialItemController">
             <summary>
             料號基本資料檔Controller
@@ -3608,6 +3564,13 @@
             <param name="wipBarcode"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipBarcodeController.PutWipBarcode(AMESCoreStudio.WebApi.Models.AMES.WipBarcode)">
+            <summary>
+            更新工單資料-條碼Barcode
+            </summary>
+            <param name="wipBarcode"></param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipBarcodeController.DeleteWipBarcode(System.String,System.String,System.String)">
             <summary>
             刪除工單條碼區間
@@ -3838,6 +3801,20 @@
             <param name="wipno">工單號碼</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfoCheckStart(System.String)">
+            <summary>
+            查詢工單是否投入
+            </summary>
+            <param name="wipno">工單號碼</param>
+            <returns>Y:投入N:未投入</returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfoCheckStartLine(System.String)">
+            <summary>
+            查詢工單是否開線
+            </summary>
+            <param name="wipno">工單號碼</param>
+            <returns>Y:已開線N:未開線</returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.PostWipInfo(AMESCoreStudio.WebApi.Models.AMES.WipInfo)">
             <summary>
             新增工單資料
@@ -3859,6 +3836,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.DeleteWipinfo(System.String)">
+            <summary>
+            删除工單相關資料
+            </summary>
+            <param name="id">工單號碼</param>
+            <returns></returns>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.WipKpsController">
             <summary>
             工單KP資訊資料檔
@@ -4019,6 +4003,15 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipMACController.GetCheckMAC(System.String,System.String,System.String)">
+            <summary>
+            確認MAC區間是否有重複
+            </summary>
+            <param name="id">工單號碼</param>
+            <param name="startNo">MAC起</param>
+            <param name="endNo">MAC迄</param>
+            <returns></returns>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.WipOutfitController">
             <summary>
             工單治具資料檔
@@ -4569,13 +4562,14 @@
             <param name="ItemNo">料號</param>
             <returns>0:找不到</returns>
         </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.GetBarCodeLastStopRuleStationID(System.Int32,System.Int32,System.Int32)">
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.GetBarCodeLastStopRuleStationID(System.Int32,System.Int32,System.Int32,System.Int32)">
             <summary>
             取得上一個作業站RuleStationID
             </summary>
             <param name="wipID">工單ID</param>
             <param name="barCodeID">BarCodeID</param>
             <param name="stationID">目前作業站ID</param>
+            <param name="flowRuleID">工單流程ID</param>
             <returns>true:false</returns>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.CheckNextStopCloseStation(System.String,System.String,System.Int32)">
@@ -5002,6 +4996,14 @@
             <param name="unitNo">站別</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.MaterialFlowsController.GetMaterialFlowsByWip(System.String,System.String)">
+            <summary>
+             料號流程查詢 By工單
+            </summary>
+            <param name="itemno">料號</param>
+            <param name="unitNo">站別</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.MaterialFlowsController.PostMaterialFlows(AMESCoreStudio.WebApi.Models.BAS.MaterialFlow)">
             <summary>
             新增料號流程資料檔
@@ -5117,11 +5119,11 @@
             <param name="nextStationId"></param>
             <returns></returns>
         </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.RulesController.GetRulesByNextStation(System.Int32)">
+        <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.RulesController.GetRulesByFlowRuleID(System.Int32)">
             <summary>
-            根據下一站別ID查詢
+            By流程ID 查詢
             </summary>
-            <param name="id"></param>
+            <param name="id">流程ID</param>
             <returns></returns>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.BAS.RulesController.PutRules(System.Int32,AMESCoreStudio.WebApi.Models.BAS.Rules)">
@@ -8430,6 +8432,7 @@
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeItem.RuleStationID">
             <summary>
             流程站别ID
+            改抓StationID 20220418
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeItem.ItemNo">
@@ -11891,6 +11894,11 @@
             預定試用次數
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.OutfitVarityInfo.AlertForeDays">
+            <summary>
+            預警提前天數
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.OutfitVarityInfo.CreateUserID">
             <summary>
             創建者ID
@@ -13661,6 +13669,11 @@
             客戶料號
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipInfo.FlowRemark">
+            <summary>
+            作業流程備註
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipInfo.GetFactoryUnit">
             <summary>
             生產單位