diff --git a/AMESCoreStudio.Web/Controllers/BASController.cs b/AMESCoreStudio.Web/Controllers/BASController.cs
index aa2d929d..b5e6e63f 100644
--- a/AMESCoreStudio.Web/Controllers/BASController.cs
+++ b/AMESCoreStudio.Web/Controllers/BASController.cs
@@ -20,13 +20,15 @@ namespace AMESCoreStudio.Web.Controllers
         public readonly IBAS _basApi;
         public readonly ISYS _sysApi;
         public readonly IPCS _pcsApi;
-        public BASController(ILogger<BASController> logger, IBAS basApi, ISYS sysApi, IPCS pcsApi)
+        public readonly IJIG _jigApi;
+        public BASController(ILogger<BASController> logger, IBAS basApi, ISYS sysApi, IPCS pcsApi, IJIG jigApi)
         {
             _logger = logger;
             _basApi = basApi;
             _sysApi = sysApi;
             _pcsApi = pcsApi;
-        }
+            _jigApi = jigApi;
+    }
 
         #region 下拉選項
 
@@ -217,6 +219,19 @@ namespace AMESCoreStudio.Web.Controllers
             }
             ViewBag.RuleStationList = RuleStationItems;
         }
+
+        private async Task GetOutfitCommodityList()
+        {
+            var result = await _jigApi.GetOutfitCommodityInfoes();
+
+            var OutfitCommoditys = new List<SelectListItem>();
+            for (int i = 0; i < result.Count; i++)
+            {
+                OutfitCommoditys.Add(new SelectListItem(result[i].CommodityName, result[i].CommodityNo));
+            }
+            ViewBag.CommodityList = OutfitCommoditys;
+        }
+
         public void GetUserID()
         {
             var userID = "";
@@ -2171,7 +2186,7 @@ namespace AMESCoreStudio.Web.Controllers
         public async Task<IActionResult> BAS017UAsync(int id)
         {
             await GetUnitList(); 
-            await GetRuleStationsList();
+            await GetStationList();
             GetUserID();
              var result = await _basApi.GetMaterialStationsItem(id);
 
@@ -2230,7 +2245,7 @@ namespace AMESCoreStudio.Web.Controllers
         {
 
             await GetUnitList();
-            await GetRuleStationsList();
+            await GetStationList();
             GetUserID();
             if (ModelState.IsValid)
             {
@@ -2339,6 +2354,7 @@ namespace AMESCoreStudio.Web.Controllers
         {
             await GetUnitList();
             GetUserID();
+            await GetOutfitCommodityList();
             return View();
         }
 
@@ -2347,7 +2363,8 @@ namespace AMESCoreStudio.Web.Controllers
         public async Task<IActionResult> BAS018UAsync(int id)
         {
             await GetUnitList();
-            await GetRuleStationsList();
+            await GetStationList();
+            await GetOutfitCommodityList();
             GetUserID();
             var result = await _basApi.GetMaterialOutfit(id);
 
@@ -2385,6 +2402,7 @@ namespace AMESCoreStudio.Web.Controllers
                 }
                 else
                 {
+                    await GetOutfitCommodityList();
                     ModelState.AddModelError("error", result.Msg);
                     return View("BAS018C", model);
                 }
@@ -2401,7 +2419,7 @@ namespace AMESCoreStudio.Web.Controllers
         public async Task<IActionResult> BAS018USaveAsync(MaterialOutfit model)
         {
             await GetUnitList();
-            await GetRuleStationsList();
+            await GetStationList();
             GetUserID();
 
             if (ModelState.IsValid)
@@ -2418,7 +2436,7 @@ namespace AMESCoreStudio.Web.Controllers
                 }
                 else
                 {
-
+                    await GetOutfitCommodityList();
                     ModelState.AddModelError("error", result.Msg);
                     return View("BAS018U", model);
 
diff --git a/AMESCoreStudio.Web/Controllers/WHSController.cs b/AMESCoreStudio.Web/Controllers/WHSController.cs
index 5351ffbe..c630648b 100644
--- a/AMESCoreStudio.Web/Controllers/WHSController.cs
+++ b/AMESCoreStudio.Web/Controllers/WHSController.cs
@@ -964,7 +964,7 @@ namespace AMESCoreStudio.Web.Controllers
         }
         //修改页面
         [HttpGet]
-        public async Task<IActionResult> WHS009UAsync(int id, string type)
+        public async Task<IActionResult> WHS009UAsync(string id)
         {
             //製程單位
             await GetFactoryUnitsList2();
@@ -978,13 +978,17 @@ namespace AMESCoreStudio.Web.Controllers
             GetClassList();
             //其他部門
             await GetDeptList();
-            //+異常代碼
-            //+判定負責人詢問如何關聯單位與人
-            //+判定類別
 
-            ViewBag.type = type;
+            await GetExceptionClassesList();
+
+            await GetExceptionCodesList();
+
+            var result = await _whsApi.GetExceptionWorktime(id);
+            var result2 = await _whsApi.GetExceptionCode(result[0].ExceptionNo);
+            ViewBag.ClassNo = result2[0].ExceptionClassNo;
+            var result3 = await _whsApi.GetExceptionClass(result2[0].ExceptionClassNo);
+            ViewBag.GroupNo = result3[0].ExceptionGroupNo;
 
-            var result = await _whsApi.GetSupportUser(id);
 
             if (result.Count == 0)
             {
@@ -1041,14 +1045,17 @@ namespace AMESCoreStudio.Web.Controllers
                 }
                 else
                 {
-                    if (result.Errors.Count > 0)
-                    {
-                        ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
-                    }
-                    else
-                    {
-                        ModelState.AddModelError("error", result.Msg);
-                    }
+                    await GetExceptionClassesList();
+
+                    await GetExceptionCodesList();
+
+                    var result2 = await _whsApi.GetExceptionCode(model.ExceptionNo);
+                    ViewBag.ClassNo = result2[0].ExceptionClassNo;
+                    var result3 = await _whsApi.GetExceptionClass(result2[0].ExceptionClassNo);
+                    ViewBag.GroupNo = result3[0].ExceptionGroupNo;
+
+                    ModelState.AddModelError("error", result.Msg);
+
                 }
             }
             return View("WHS009U", model);
@@ -1632,13 +1639,13 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpGet]
         public async Task<IActionResult> WHS016UAsync(string id)
         {
+            await GetExceptionClassesList();
+            await GetExceptionCodesList();
             var result = await _whsApi.GetExceptionReason(id);
             var result2 = await _whsApi.GetExceptionCode(result[0].ExceptionNo);
             ViewBag.ClassNo = result2[0].ExceptionClassNo;
             var result3 = await _whsApi.GetExceptionClass(result2[0].ExceptionClassNo);
             ViewBag.GroupNo = result3[0].ExceptionGroupNo;
-            await GetExceptionClassesList();
-            await GetExceptionCodesList();
 
             if (result.Count == 0)
             {
@@ -1684,9 +1691,6 @@ namespace AMESCoreStudio.Web.Controllers
         public async Task<IActionResult> WHS016USaveAsync(ExceptionReason model)
         {
 
-            var ExceptionGroupNo = ViewBag.GroupNo ;
-            var ExceptionClassNo = ViewBag.ClassNo;
-
             if (ModelState.IsValid)
             {
                 IResultModel result;
@@ -1703,8 +1707,12 @@ namespace AMESCoreStudio.Web.Controllers
 
                     await GetExceptionClassesList();
                     await GetExceptionCodesList();
-                    ViewBag.GroupNo = ExceptionGroupNo;
-                    ViewBag.ClassNo = ExceptionClassNo;
+                    var result1 = await _whsApi.GetExceptionReason(model.ReasonNo);
+                    var result2 = await _whsApi.GetExceptionCode(result1[0].ExceptionNo);
+                    ViewBag.ClassNo = result2[0].ExceptionClassNo;
+                    var result3 = await _whsApi.GetExceptionClass(result2[0].ExceptionClassNo);
+                    ViewBag.GroupNo = result3[0].ExceptionGroupNo;
+
 
                     ModelState.AddModelError("error", result.Msg);
 
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS017.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS017.cshtml
index 3541ab6b..e3db46a8 100644
--- a/AMESCoreStudio.Web/Views/BAS/BAS017.cshtml
+++ b/AMESCoreStudio.Web/Views/BAS/BAS017.cshtml
@@ -80,11 +80,11 @@
             },//MTNO001-TEST
             {
                 field: 'rStation',
-                title: '製程單位',
+                title: '站別',
                 templet: function (d) {
                     var rStation;
                     if (d.rStation)
-                        rStation = d.rStation["stationDesc"];
+                        rStation = d.rStation["stationName"];
                     else
                         rStation = "N/A";
                     return rStation;
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS017C.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS017C.cshtml
index 832cebf1..583687a7 100644
--- a/AMESCoreStudio.Web/Views/BAS/BAS017C.cshtml
+++ b/AMESCoreStudio.Web/Views/BAS/BAS017C.cshtml
@@ -111,9 +111,9 @@
     });
     function getRuleStationByUnitNo(data) {
         $.ajax({
-            url: "/BAS/GetRuleStationByUnit",
+            url: "/BAS/GetStationses",
             dataType: 'json',
-            data: { id: data },
+            //data: { id: data },
             contentType: "application/json",
             type: 'get',
             success: function (result) {
@@ -121,8 +121,15 @@
                     $("#RuleStationID").empty();
                     var count = 0;
                     $.each(result.data, function (index, item) {
-                        $('#RuleStationID').append(new Option(item.stationDesc, item.ruleStationID));//修改參數
+                        if (item.unitNo == data) {
+                            $('#RuleStationID').append(new Option(item.stationName, item.stationID));//修改參數
+                            count = count + 1;
+                        }
                     });
+                    if (count == 0) {
+                        $("#RuleStationID").empty();
+                        $('#RuleStationID').append(new Option("無選項", ""));
+                    }
                 }
                 else {
                     $("#RuleStationID").empty();
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS017U.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS017U.cshtml
index 971afb76..5148c689 100644
--- a/AMESCoreStudio.Web/Views/BAS/BAS017U.cshtml
+++ b/AMESCoreStudio.Web/Views/BAS/BAS017U.cshtml
@@ -35,7 +35,7 @@
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="RuleStationID" class="control-label col-sm-3"></label>
-                <select id="RuleStationID" asp-for="RuleStationID" asp-items="@ViewBag.RuleStationList" class="custom-select col-sm-9"> 
+                <select id="RuleStationID" asp-for="RuleStationID" asp-items="@ViewBag.StationList" class="custom-select col-sm-9"> 
                     <option value="">請選擇</option>
                 </select>
                 <span asp-validation-for="RuleStationID" class="text-danger offset-sm-3 my-sm-1"></span>
@@ -108,7 +108,7 @@
         });
         function getRuleStationByUnitNo(data) {
             $.ajax({
-                url: "/BAS/GetRuleStationByUnit",
+                url: "/BAS/GetStationses",
                 dataType: 'json',
                 data: { id: data },
                 contentType: "application/json",
@@ -118,8 +118,15 @@
                         $("#RuleStationID").empty();
                         var count = 0;
                         $.each(result.data, function (index, item) {
-                            $('#RuleStationID').append(new Option(item.stationDesc, item.ruleStationID));//修改參數
+                            if (item.unitNo == data) {
+                                $('#RuleStationID').append(new Option(item.stationName, item.stationID));//修改參數
+                                count = count + 1;
+                            }
                         });
+                        if (count == 0) {
+                            $("#RuleStationID").empty();
+                            $('#RuleStationID').append(new Option("無選項", ""));
+                        }
                     }
                     else {
                         $("#RuleStationID").empty();
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS018.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS018.cshtml
index 392a13c5..27a793ef 100644
--- a/AMESCoreStudio.Web/Views/BAS/BAS018.cshtml
+++ b/AMESCoreStudio.Web/Views/BAS/BAS018.cshtml
@@ -73,11 +73,11 @@
             },
             {
                 field: 'rStation',
-                title: '流程站別',
+                title: '站別',
                 templet: function (d) {
                     var rStation;
                     if (d.rStation)
-                        rStation = d.rStation["stationDesc"];
+                        rStation = d.rStation["stationName"];
                     else
                         rStation = "N/A";
                     return rStation;
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS018C.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS018C.cshtml
index 223ca2b8..755b871e 100644
--- a/AMESCoreStudio.Web/Views/BAS/BAS018C.cshtml
+++ b/AMESCoreStudio.Web/Views/BAS/BAS018C.cshtml
@@ -27,6 +27,13 @@
                 <input id="ItemID" asp-for="ItemID" type="hidden" />
                 <span asp-validation-for="ItemID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="CommodityNo" class="control-label col-sm-3"></label>
+                <select id="UnitNo" asp-for="CommodityNo" asp-items="@ViewBag.CommodityList" class="custom-select col-sm-9">
+                    <option value="">請選擇</option>
+                </select>
+                <span asp-validation-for="CommodityNo" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="OutfitNo" class="control-label col-sm-3"></label>
                 <input asp-for="OutfitNo" class="form-control col-sm-9" />
@@ -101,7 +108,7 @@
     });
     function getRuleStationByUnitNo(data) {
         $.ajax({
-            url: "/BAS/GetRuleStationByUnit",
+            url: "/BAS/GetStationsByUnit",
             dataType: 'json',
             data: { id: data },
             contentType: "application/json",
@@ -111,8 +118,15 @@
                     $("#RuleStationID").empty();
                     var count = 0;
                     $.each(result.data, function (index, item) {
-                        $('#RuleStationID').append(new Option(item.stationDesc, item.ruleStationID));//修改參數
+                        if (item.unitNo == data) {
+                            $('#RuleStationID').append(new Option(item.stationName, item.stationID));//修改參數
+                            count = count + 1;
+                        }
                     });
+                    if (count == 0) {
+                        $("#RuleStationID").empty();
+                        $('#RuleStationID').append(new Option("無選項", ""));
+                    }
                 }
                 else {
                     $("#RuleStationID").empty();
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS018U.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS018U.cshtml
index 327dc98c..aa064391 100644
--- a/AMESCoreStudio.Web/Views/BAS/BAS018U.cshtml
+++ b/AMESCoreStudio.Web/Views/BAS/BAS018U.cshtml
@@ -26,6 +26,13 @@
                 <input id="ItemID" asp-for="ItemID" type="hidden" />
                 <span asp-validation-for="ItemID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="CommodityNo" class="control-label col-sm-3"></label>
+                <select id="UnitNo" asp-for="CommodityNo" asp-items="@ViewBag.CommodityList" class="custom-select col-sm-9">
+                    <option value="">請選擇</option>
+                </select>
+                <span asp-validation-for="CommodityNo" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="OutfitNo" class="control-label col-sm-3"></label>
                 <input asp-for="OutfitNo" class="form-control col-sm-9" />
@@ -40,7 +47,7 @@
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="RuleStationID" class="control-label col-sm-3"></label>
-                <select id="RuleStationID" asp-for="RuleStationID" asp-items="@ViewBag.RuleStationList" class="custom-select col-sm-9">
+                <select id="RuleStationID" asp-for="RuleStationID" asp-items="@ViewBag.StationList" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>
                 <span asp-validation-for="RuleStationID" class="text-danger offset-sm-3 my-sm-1"></span>
@@ -98,7 +105,7 @@
         });
         function getRuleStationByUnitNo(data) {
             $.ajax({
-                url: "/BAS/GetRuleStationByUnit",
+                url: "/BAS/GetStationses",
                 dataType: 'json',
                 data: { id: data },
                 contentType: "application/json",
@@ -108,8 +115,15 @@
                         $("#RuleStationID").empty();
                         var count = 0;
                         $.each(result.data, function (index, item) {
-                            $('#RuleStationID').append(new Option(item.stationDesc, item.ruleStationID));//修改參數
+                            if (item.unitNo == data) {
+                                $('#RuleStationID').append(new Option(item.stationName, item.stationID));//修改參數
+                                count = count + 1;
+                            }
                         });
+                        if (count == 0) {
+                            $("#RuleStationID").empty();
+                            $('#RuleStationID').append(new Option("無選項", ""));
+                        }
                     }
                     else {
                         $("#RuleStationID").empty();
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS006C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS006C.cshtml
index 77a40c97..d5381976 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS006C.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS006C.cshtml
@@ -20,24 +20,24 @@
 
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="UserNo" class="control-label col-sm-3"></label>
-                <input id="UserNo" asp-for="UserNo" class="form-control col-sm-6" />
+                <input id="UserNo" asp-for="UserNo" class="form-control col-sm-9" />
                 <span asp-validation-for="UserNo" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="UserName" class="control-label col-sm-3"></label>
-                <input id="UserName" asp-for="UserName" class="form-control col-sm-6" />
+                <input id="UserName" asp-for="UserName" class="form-control col-sm-9" />
                 <span asp-validation-for="UserName" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="Werks" class="control-label col-sm-2"></label>
-                <select asp-for="Werks" asp-items="@ViewBag.FactoryList" class="custom-select col-sm-4">
+                <label asp-for="Werks" class="control-label col-sm-3"></label>
+                <select asp-for="Werks" asp-items="@ViewBag.FactoryList" class="custom-select col-sm-9">
                     <option value="">N/A</option>
                 </select>
                 <span asp-validation-for="Werks" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="UnitNo" class="control-label col-sm-2"></label>
-                <select id="UnitNo" asp-for="UnitNo" asp-items="@ViewBag.FactoryUnit" class="custom-select col-sm-5">
+                <label asp-for="UnitNo" class="control-label col-sm-3"></label>
+                <select id="UnitNo" asp-for="UnitNo" asp-items="@ViewBag.FactoryUnit" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>
                 <span asp-validation-for="UnitNo" class="text-danger offset-sm-3 my-sm-1"></span>
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS006U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS006U.cshtml
index 20acf940..a4d8afd2 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS006U.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS006U.cshtml
@@ -21,25 +21,25 @@
 
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="UserNo" class="control-label col-sm-3"></label>
-                <input id="UserNoShow" class="form-control col-sm-6" readonly />
+                <input id="UserNoShow" class="form-control col-sm-9" readonly />
                 <span asp-validation-for="UserNo" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="UserName" class="control-label col-sm-3"></label>
-                <input id="UserNameShow" class="form-control col-sm-6" readonly />
+                <input id="UserNameShow" class="form-control col-sm-9" readonly />
                 <span asp-validation-for="UserName" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="Werks" class="control-label col-sm-2"></label>
-                <select asp-for="Werks" asp-items="@ViewBag.FactoryList" class="custom-select col-sm-4">
+                <label asp-for="Werks" class="control-label col-sm-3"></label>
+                <select asp-for="Werks" asp-items="@ViewBag.FactoryList" class="custom-select col-sm-9">
                     <option value="">N/A</option>
                 </select>
                 <span asp-validation-for="Werks" class="text-danger offset-sm-3 my-sm-1">
                 </span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="UnitNo" class="control-label col-sm-2"></label>
-                <select id="UnitNo" asp-for="UnitNo" asp-items="@ViewBag.FactoryUnit" class="custom-select col-sm-5"></select>
+                <label asp-for="UnitNo" class="control-label col-sm-3"></label>
+                <select id="UnitNo" asp-for="UnitNo" asp-items="@ViewBag.FactoryUnit" class="custom-select col-sm-9"></select>
                 <span asp-validation-for="UnitNo" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS009.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS009.cshtml
index 512b40df..7c0a8d8e 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS009.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS009.cshtml
@@ -209,14 +209,14 @@
         ];
         //通过行tool编辑，lay-event="edit"
         function edit(obj) {
-            if (obj.data.classID) {
-                hg.open('修改異常工時', '/WHS/WHS009U/' + obj.data.exceptionID, 640, 320);
+            if (obj.data.exceptionID) {
+                hg.open('修改異常工時', '/WHS/WHS009U/' + obj.data.exceptionID, 480,480);
             }
         }
         //通过行tool删除，lay-event="del"
         function del(obj) {
             if (obj.data.classID) {
-                hg.confirm("異常工時：" + obj.data.exceptionID + "，确定要删除吗？", function () {
+                hg.confirm("異常工時：" + obj.data.exceptionID + "，確定要删除嗎？", function () {
                     $.ajax({
                         url: '/WHS/WHS009D',
                         data: { id: obj.data.exceptionID },
@@ -231,7 +231,7 @@
                             }
                         },
                         error: function () {
-                            hg.msg("网络请求失败！");
+                            hg.msg("網路請求失敗！");
                         }
                     });
                 });
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml
index 9fb27c7b..2f7406fe 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml
@@ -323,7 +323,7 @@
                     var count = 0;
                     $.each(result.data, function (index, item) {
                         if (item.exceptionClassNo == data) { //修改等號
-                            $('#ExceptionNo').append(new Option(item.exceptionDescCh, item.exceptionNo));//修改參數
+                            $('#ExceptionNo').append(new Option(item.exceptionDescCH, item.exceptionNo));//修改參數
                             count = count + 1;
                         }
                     });
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS009U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS009U.cshtml
index b0ad9a94..9c3b7760 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS009U.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS009U.cshtml
@@ -68,13 +68,13 @@
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label class="control-label col-sm-3">類別編號</label>
-                <select id="ExceptionClass" class="custom-select col-sm-9" readonly>
+                <select id="ExceptionClass"  asp-items="@ViewBag.ExceptionClasses" class="custom-select col-sm-9" readonly>
                     <option value="">請選擇</option>
                 </select>
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="ExceptionNo" class="control-label col-sm-3"></label>
-                <select asp-for="ExceptionNo" class="custom-select col-sm-9" readonly>
+                <select asp-for="ExceptionNo"   asp-items="@ViewBag.ExceptionCodes"  class="custom-select col-sm-9" readonly>
                     <option value="">N/A</option>
                 </select>
                 <span asp-validation-for="ExceptionNo" class="text-danger offset-sm-3 my-sm-1"></span>
@@ -166,9 +166,11 @@
     @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
         await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
 
-    <script type="text/javascript">
+<script type="text/javascript">
 
     $(document).ready(function () {
+        $("#ExceptionType").val("@ViewBag.GroupNo");
+        $("#ExceptionClass").val("@ViewBag.ClassNo");
 
         var error = '@Html.ValidationMessage("error")';
         if ($(error).text() != '') {
@@ -273,7 +275,7 @@
                 layui.form.render("select");
             }
         });
-    };
+        };
     function getExceptionClass(data) {
         $.ajax({
             url: "/WHS/GetExceptionClasses",
@@ -284,10 +286,11 @@
             success: function (result) {
                 if (result.data) {
                     $("#ExceptionClass").empty();
+                    $('#ExceptionClass').append(new Option("請選擇", ""));
                     var count = 0;
                     $.each(result.data, function (index, item) {
-                        if (item.exceptionGroupNo == data) {//修改等號
-                            $('#ExceptionClass').append(new Option(item.userName, item.userID));//修改參數
+                        if (item.exceptionGroupNo == data) {//修改等號 EXCEPTION_GROUP_NO
+                            $('#ExceptionClass').append(new Option(item.exceptionClassName, item.exceptionClassNo));//修改參數
                             count = count + 1;
                         }
                     });
@@ -323,7 +326,7 @@
                     var count = 0;
                     $.each(result.data, function (index, item) {
                         if (item.exceptionClassNo == data) { //修改等號
-                            $('#ExceptionNo').append(new Option(item.userName, item.userID));//修改參數
+                            $('#ExceptionNo').append(new Option(item.exceptionDescCH, item.exceptionNo));//修改參數
                             count = count + 1;
                         }
                     });
@@ -341,7 +344,7 @@
         });
     };
 
-    </script>
+</script>
 
 
 }
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS015U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS015U.cshtml
index 626ec484..c4defe79 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS015U.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS015U.cshtml
@@ -75,7 +75,6 @@
                 parent.hg.msg(error);
             }
         });
-
         $("#ExceptionType").change(function () {
             var data = $("#ExceptionType").val();
             getExceptionClassByType(data);
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS016.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS016.cshtml
index 75067566..6592175d 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS016.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS016.cshtml
@@ -197,7 +197,7 @@
         //通过行tool编辑，lay-event="edit"
         function edit(obj) {
             if (obj.data.reasonNo) {
-                hg.open('修改異常工時原因', '/WHS/WHS016U/' + obj.data.reasonNo, 640, 320);
+                hg.open('修改異常工時原因', '/WHS/WHS016U/' + obj.data.reasonNo, 480, 480);
             }
         }
 
@@ -230,7 +230,7 @@
             layuiicon: '&#xe608;',
             class: 'layui-btn-normal',
             handler: function () {
-                hg.open('新增異常工時原因', '/WHS/WHS016C', 640, 320);
+                hg.open('新增異常工時原因', '/WHS/WHS016C', 480, 480);
 
             }
         }
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS016U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS016U.cshtml
index d6704e42..1f87fd5c 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS016U.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS016U.cshtml
@@ -19,11 +19,14 @@
             <input type="hidden" asp-for="UpdateUserID" value="0" />
             <input type="hidden" asp-for="CreateDate" />
             <input type="hidden" asp-for="UpdateDate" value="@System.DateTime.Now" />
-            <input type="hidden" asp-for="Status"/>
+            <input type="hidden" asp-for="Status" />
+            <input type="hidden" value="@ViewBag.ClassNo" />
+            <input type="hidden" value="@ViewBag.GroupNo" />
+
 
             <div class="form-group form-inline my-sm-1">
                 <label class="control-label col-sm-3">歸屬類別</label>
-                <select id="ExceptionType" value="@ViewBag.GroupNo" class="custom-select col-sm-9">
+                <select id="ExceptionType" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                     <option value="I">內部</option>
                     <option value="O">外部</option>
@@ -31,7 +34,7 @@
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label class="control-label col-sm-3">異常工時類別</label>
-                <select id="ExceptionClass" asp-items="@ViewBag.ExceptionClasses" value="@ViewBag.ClassNo" class="custom-select col-sm-9">
+                <select id="ExceptionClass" asp-items="@ViewBag.ExceptionClasses" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>
             </div>
@@ -42,6 +45,11 @@
                 </select>
                 <span asp-validation-for="ExceptionNo" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="ReasonNo" class="control-label col-sm-3"></label>
+                <input asp-for="ReasonNo" class="form-control col-sm-9" readonly />
+                <span asp-validation-for="ReasonNo" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="ReasonDescCH" class="control-label col-sm-3"></label>
                 <input asp-for="ReasonDescCH" class="form-control col-sm-9" />
@@ -70,15 +78,18 @@
     @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
         await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
 
-    <script type="text/javascript">
-    $(document).ready(function () {
+<script type="text/javascript">
+        $(document).ready(function () {
+            console.log("@ViewBag.ClassNo");
+            console.log("@ViewBag.GroupNo");
+            $("#ExceptionType").val("@ViewBag.GroupNo");
+            $("#ExceptionClass").val("@ViewBag.ClassNo");
         var error = '@Html.ValidationMessage("error")';
         if ($(error).text() != '') {
             parent.hg.msg(error);
         }
     });
 
-
         $("#ExceptionType").change(function () {
             var data = $("#ExceptionType").val();
             //console.info(data);
@@ -155,7 +166,7 @@
                 }
             });
         };
-    </script>
+</script>
 
 
 }
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 e07d7ca3..17294dac 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 ab88a41c..cd811938 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 4fa48ab7..3ca85de2 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 8606439a..fb32877f 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 725706cd..3ea63244 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 9767e4e6..52b43752 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 8a85a76c..88fa4265 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 3a094aec..92f5506e 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 5b12ec40..9baa5347 100644
--- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
+++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
@@ -4675,7 +4675,7 @@
             <param name="ItemNo">料號</param>
             <returns>0:找不到</returns>
         </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.GetBarCodeLastStopRuleStationID(System.Int32,System.Int32,System.Int32,System.Int32)">
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.GetBarCodeLastStopRuleStationID(System.Int32,System.Int32,System.Int32,System.Int32,System.Nullable{System.Int32})">
             <summary>
             取得上一個作業站RuleStationID
             </summary>
@@ -4683,6 +4683,7 @@
             <param name="barCodeID">BarCodeID</param>
             <param name="stationID">目前作業站ID</param>
             <param name="flowRuleID">工單流程ID</param>
+            <param name="RuleStationID">目前作業站ID(RuleStation)</param>
             <returns>true:false</returns>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.CheckNextStopCloseStation(System.String,System.String,System.Int32)">
@@ -10912,6 +10913,11 @@
             料號ID
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialOutfit.CommodityNo">
+            <summary>
+            治具種類NO
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialOutfit.OutfitNo">
             <summary>
             治具NO
@@ -10924,7 +10930,7 @@
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialOutfit.RuleStationID">
             <summary>
-            流程站別編號
+            站別
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialOutfit.CreateUserID">
@@ -11044,7 +11050,7 @@
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialStationsItem.RuleStationID">
             <summary>
-            流程站別編號
+            站別
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialStationsItem.StationType">
diff --git a/AMESCoreStudio.WebApi/Models/AMES/MaterialOutfit.cs b/AMESCoreStudio.WebApi/Models/AMES/MaterialOutfit.cs
index a8b610dd..4cdc14cb 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/MaterialOutfit.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/MaterialOutfit.cs
@@ -42,11 +42,20 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public int ItemID { get; set; }
 
         /// <summary>
-        /// 治具NO
+        /// 治具種類NO
         /// </summary>
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
-        [Display(Name = "治具代碼")]
+        [Display(Name = "治具種類")]
+        [Column("COMMODITY_NO")]
+        [StringLength(15)]
+        public string CommodityNo { get; set; }
+
+        /// <summary>
+        /// 治具NO
+        /// </summary>
+        [DataMember]
+        [Display(Name = "治具編碼")]
         [Column("OUTFIT_NO")]
         [StringLength(15)]
         public string OutfitNo { get; set; }
@@ -61,10 +70,10 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public string StationType { get; set; }
 
         /// <summary>
-        /// 流程站別編號
+        /// 站別
         /// </summary>
         [Column("RULE_STATION_ID")]
-        [Display(Name = "流程站別")]
+        [Display(Name = "站別")]
         [DataMember]
         [Required]
         public int RuleStationID { get; set; }
@@ -117,7 +126,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// 製程單位主檔
         /// </summary>
         [ForeignKey("RuleStationID")]
-        public virtual AMESCoreStudio.WebApi.Models.BAS.RuleStation RStation { get; set; }
+        public virtual AMESCoreStudio.WebApi.Models.BAS.Stations RStation { get; set; }
 
         /// <summary>
         /// 製程單位主檔
diff --git a/AMESCoreStudio.WebApi/Models/AMES/MaterialStationsItem.cs b/AMESCoreStudio.WebApi/Models/AMES/MaterialStationsItem.cs
index 896f5c32..5de78c52 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/MaterialStationsItem.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/MaterialStationsItem.cs
@@ -42,12 +42,12 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public string UnitNo { get; set; }
 
         /// <summary>
-        /// 流程站別編號
+        /// 站別
         /// </summary>
         [Column("RULE_STATION_ID")]
         [DataMember]
         [Required]
-        [Display(Name = "流程站別編號")]
+        [Display(Name = "站別")]
         public int RuleStationID { get; set; }
 
         /// <summary>
@@ -138,6 +138,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// 製程單位主檔
         /// </summary>
         [ForeignKey("RuleStationID")]
-        public virtual AMESCoreStudio.WebApi.Models.BAS.RuleStation RStation { get; set; }
+        public virtual AMESCoreStudio.WebApi.Models.BAS.Stations RStation { get; set; }
     }
 }
diff --git a/AMESCoreStudio.WebApi/Models/AMES/OutfitVarityInfo.cs b/AMESCoreStudio.WebApi/Models/AMES/OutfitVarityInfo.cs
index be3f8d20..1e279488 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/OutfitVarityInfo.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/OutfitVarityInfo.cs
@@ -35,7 +35,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// 規格代碼
         /// </summary>
         [Column("VARIETY_NO")]
-        [StringLength(2)]
+        [StringLength(5)]
         [DataMember]
         [Required]
         [Display(Name = "規格代碼")]
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 725706cd..3ea63244 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 9767e4e6..52b43752 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 8a85a76c..88fa4265 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 3a094aec..92f5506e 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 5b12ec40..9baa5347 100644
--- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
+++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
@@ -4675,7 +4675,7 @@
             <param name="ItemNo">料號</param>
             <returns>0:找不到</returns>
         </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.GetBarCodeLastStopRuleStationID(System.Int32,System.Int32,System.Int32,System.Int32)">
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.GetBarCodeLastStopRuleStationID(System.Int32,System.Int32,System.Int32,System.Int32,System.Nullable{System.Int32})">
             <summary>
             取得上一個作業站RuleStationID
             </summary>
@@ -4683,6 +4683,7 @@
             <param name="barCodeID">BarCodeID</param>
             <param name="stationID">目前作業站ID</param>
             <param name="flowRuleID">工單流程ID</param>
+            <param name="RuleStationID">目前作業站ID(RuleStation)</param>
             <returns>true:false</returns>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.CheckNextStopCloseStation(System.String,System.String,System.Int32)">
@@ -10912,6 +10913,11 @@
             料號ID
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialOutfit.CommodityNo">
+            <summary>
+            治具種類NO
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialOutfit.OutfitNo">
             <summary>
             治具NO
@@ -10924,7 +10930,7 @@
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialOutfit.RuleStationID">
             <summary>
-            流程站別編號
+            站別
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialOutfit.CreateUserID">
@@ -11044,7 +11050,7 @@
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialStationsItem.RuleStationID">
             <summary>
-            流程站別編號
+            站別
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialStationsItem.StationType">