diff --git a/AMESCoreStudio.Web/Views/WHS/WHS005.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS005.cshtml
index b4fbe16d..648f6a74 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS005.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS005.cshtml
@@ -55,115 +55,21 @@
             var form = layui.form,
                 layer = layui.layer;
             var table = layui.table;
-
-            table.render({
-                elem: '#test'
-                , url: "@Url.Action("GetStandardWorkTimes", "WHS")"
-
-                , title: '標準工時資料維護'
-                , cols: [[
-                    {
-                        field: 'standardID',
-                        title: '#',
-                        sort: true
-                    },
-                    {
-                        field: 'unitNo',
-                        title: '單位代號'
-                    },
-                    {
-                        field: 'lineInfo',
-                        title: '線別',
-                        templet: function (d) {
-                            var line;
-                            if (d.lineInfo)
-                                line = d.lineInfo["lineDesc"];
-                            else
-                                line = "N/A";
-
-                            return line;
-                        }
-                    },
-                    {
-                        field: 'stations',
-                        title: '站別',
-                        templet: function (d) {
-                            var station;
-                            if (d.stations)
-                                station = d.stations["stationName"];
-                            else
-                                station = "N/A";
-
-                            return station;
-
-                        }
-                    },
-                    {
-                        field: 'itemNo',
-                        title: '料號',
-                    },
-                    {
-                        field: 'side',
-                        title: '正背面',
-                    },
-                    {
-                        field: 'opcnt',
-                        title: '作業人數',
-                    },
-                    {
-                        field: 'firstTime',
-                        title: '首件產出時間(分)',
-                    },
-                    {
-                        field: 'totalCT',
-                        title: 'C/T(分)',
-                    },
-                    {
-                        field: 'ct',
-                        title: '節拍時間',
-                    },
-                    {
-                        field: 'machineCT',
-                        title: '操機數',
-                    }
-                ]]
-                , page: true
-                , limits: [3, 5, 10]//一页选择显示3,5或10条数据
-                , limit: 10 //一页显示10条数据
-                , parseData: function (res) { //将原始数据解析成tabe组件所规定的数据,res光
-                    var result;
-                    if (this.page.curr) {
-                        result = res.data.slice(this.limit * (this.page.curr - 1), this.limit * this.page.curr)
-                    }
-                    else {
-                        result = res.data.slice(0, this.limit);
-                    }
-
-                    return {
-                        "code": res.code,//解析接口状态
-                        "msg": res.msg,//解析提示文本
-                        "count": res.count,//解析数据长度
-                        "data": result//解析数据列表
-                      };
-                   }
-            });
-            //如果需要使用原始保单提交方式(刷新整个页面)
             //请注释掉下方 监听表单的 代码
             form.on('submit(submitBtn)', function (data) {
                 console.log("reload");
                 //打印表单数据
-                table.reload('test', {
-                    url: '/WHS/GetStandardWorkTimes005/',
-                    where: {
-                        u: $("#unit").val(),
-                        l: data.field.xmselectName,
-                        i: data.field.modelname
-                    }
-                });
+                //table.reload('test', {
+                //    url: '/WHS/GetStandardWorkTimes005/',
+                //    where: {
+                //        u: $("#unit").val(),
+                //        l: data.field.xmselectName,
+                //        i: data.field.modelname
+                //    }
+                //});
+                tt(data);
                 return false;//阻止默认表单提交行为
             });
-
-
         });
         var options = {
             el: '#demo1',
@@ -181,6 +87,83 @@
             data: [],
         };
         var demo1 = xmSelect.render(options)
+        var tableCols = [[
+            {
+                field: 'standardID',
+                title: '#',
+                sort: true
+            },
+            {
+                field: 'unitNo',
+                title: '單位代號'
+            },
+            {
+                field: 'lineInfo',
+                title: '線別',
+                templet: function (d) {
+                    var line;
+                    if (d.lineInfo)
+                        line = d.lineInfo["lineDesc"];
+                    else
+                        line = "N/A";
+
+                    return line;
+                }
+            },
+            {
+                field: 'stations',
+                title: '站別',
+                templet: function (d) {
+                    var station;
+                    if (d.stations)
+                        station = d.stations["stationName"];
+                    else
+                        station = "N/A";
+
+                    return station;
+
+                }
+            },
+            {
+                field: 'itemNo',
+                title: '料號',
+            },
+            {
+                field: 'side',
+                title: '正背面',
+            },
+            {
+                field: 'opcnt',
+                title: '作業人數',
+            },
+            {
+                field: 'firstTime',
+                title: '首件產出時間(分)',
+            },
+            {
+                field: 'totalCT',
+                title: 'C/T(分)',
+            },
+            {
+                field: 'ct',
+                title: '節拍時間',
+            },
+            {
+                field: 'machineCT',
+                title: '操機數',
+            }
+        ]];
+        var toolbar = [{
+            text: '新增',
+            layuiicon: '',
+            class: 'layui-btn-normal',
+            handler: function () {
+                hg.open('新增每日工時資料', '/WHS/WHS006C', 480, 480);
+
+            }
+        }
+        ];
+        var table;
         setTimeout(function () {
             console.log("setTimeout");
             $.ajax({
@@ -197,6 +180,21 @@
                 }
             });
         }, 100);
-
+        $(function () {
+            console.log("Start");
+            tt(null);
+        });
+        function tt(data) {
+            console.log("tt");
+            var iNO = "", uNO = "", iID = "";
+            if (data) {
+                iNO = data.field.modelname;
+                uNO = $("#unit").val();
+                lID = data.field.xmselectName;
+            }
+            table = hg.table.datatable('query', '每日工時資料維護', '/WHS/GetStandardWorkTimes005?'
+                + 'u=' + uNO + '&l=' + lNO + '&i=' + iNO
+                , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        };
     </script>
 }
\ No newline at end of file
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 951550bc..4ca6e427 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 775cf5c9..6154f658 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 ace4e30f..91d2a7e9 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 06178fc6..359fc6da 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 6e10103c..4914a50f 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 ce1fd18a..257a534b 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 ea12e182..15551cde 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 114aa3ce..c1b4fa5f 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 f89d5df6..5adcad51 100644
--- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
+++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
@@ -365,7 +365,7 @@
             條碼過站資料檔
             </summary>
         </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeStationController.GetBarcodeStationByKey(System.Int32,System.Int32,System.Int32,System.String)">
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeStationController.GetBarcodeStationByKey(System.Int32,System.Int32,System.Int32)">
             <summary>
             
             </summary>
@@ -1784,6 +1784,13 @@
             <param name="station">站別</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialKpController.GetMaterialKpByItemNo(System.String)">
+            <summary>
+            料號Key Parts 資料檔 to ItemNo
+            </summary>
+            <param name="id">料號No</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialKpController.PostMaterialKp(AMESCoreStudio.WebApi.Models.AMES.MaterialKp)">
             <summary>
             新增料號基本資料檔
@@ -3316,12 +3323,21 @@
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSerialRuleByQurey(System.String,System.String)">
             <summary>
-            取得出貨序號
+            取得出貨序號(單個)
             </summary>
             <param name="itemNo">料號</param>
             <param name="lotNo">生產序號</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSerialRuleByQurey(System.String,System.String,System.Int32)">
+            <summary>
+            取得出貨序號(多個)
+            </summary>
+            <param name="itemNo">料號</param>
+            <param name="lotNo">生產序號</param>
+            <param name="num">生產數量</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSampleSerialRule(System.String)">
             <summary>
             取得樣本序號
@@ -3864,6 +3880,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfo4QRS011(System.String,System.String,System.String)">
+            <summary>
+            查詢工單資料QRS011
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfoSelectParameter(AMESCoreStudio.WebApi.DTO.AMES.WipInfoDto,System.Int32,System.Int32)">
             <summary>
             查詢工單資料 by SelectParameter
@@ -4207,6 +4229,14 @@
             <param name="ruleStationID">流程ID</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipStationController.GetWipStation4QRS009Group(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.WipStationController.GetWipStation(System.Int32,System.Int32)">
             <summary>
             基本查詢
@@ -4499,6 +4529,14 @@
             <param name="barCodeCheckDto"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.CU_Tables(AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto,System.Boolean)">
+            <summary>
+            判斷過站完成新增or更新 Table
+            </summary>
+            <param name="barCodeCheckDto"></param>
+            <param name="burnIn">T:燒機In</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.Table_BarcodeInfo(AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto)">
             <summary>
             BarcodeInfo-條碼資料檔
@@ -4573,7 +4611,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.GetCheckWipNoSation(System.String,System.String,System.Int32,System.Int32)">
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.GetCheckWipNoSation(System.String,System.String,System.Int32,System.Int32,System.Int32)">
             <summary>
             判斷工單狀態
             </summary>
@@ -4581,6 +4619,7 @@
             <param name="unitno">生產單位</param>
             <param name="line">線別</param>
             <param name="flowrule">流程</param>
+            <param name="stationID">作業站ID</param>
             <returns></returns>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.CheckBarCodeFromWip(System.String)">
@@ -6932,6 +6971,11 @@
             KP料號NO
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipKpDto.KpNoName">
+            <summary>
+            KP料號NO項目名稱
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipKpDto.KpSeq">
             <summary>
             順序
@@ -7112,7 +7156,7 @@
             生產單位
             </summary>
         </member>
-        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipOutfitDto.RuleStationID">
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipOutfitDto.StationID">
             <summary>
             作業站ID
             </summary>
@@ -7204,7 +7248,7 @@
         </member>
         <member name="P:AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto.ruleStatus">
             <summary>
-            條碼過站狀態 P:Pass F:Fail
+            條碼過站狀態 P:Pass F:Fail 
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto.unitNo">
@@ -7247,6 +7291,11 @@
             出貨序號
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto.userID">
+            <summary>
+            過站UserID
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto.inputItem">
             <summary>
             紀錄組件或不良代碼
@@ -7267,6 +7316,11 @@
             組件:舊組件序號 NG:異常位置
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto.inputItem.kpItemNo">
+            <summary>
+            組件:組件料號 NG:
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto.Outfit">
             <summary>
             治具條碼
@@ -8897,6 +8951,11 @@
             工單-基本資料
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeStation.UserName">
+            <summary>
+            建立者姓名
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Models.AMES.BarcodeStatus">
             <summary>
             條碼狀態資料表
@@ -10944,7 +11003,7 @@
             站(前段)
             </summary>
         </member>
-        <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialOutfit.RuleStationID">
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialOutfit.StationID">
             <summary>
             站別
             </summary>
@@ -11064,7 +11123,7 @@
             生產單位
             </summary>
         </member>
-        <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialStationsItem.RuleStationID">
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialStationsItem.StationID">
             <summary>
             站別
             </summary>
@@ -14336,9 +14395,9 @@
             生產單位代號
             </summary>
         </member>
-        <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipOutfit.RuleStationID">
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipOutfit.StationID">
             <summary>
-            作業站
+            作業站ID
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipOutfit.CreateUserID">
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs
index 4b0093bb..154cbffe 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs
@@ -60,7 +60,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         }
 
         /// <summary>
-        /// 取得出貨序號
+        /// 取得出貨序號(單個)
         /// </summary>
         /// <param name="itemNo">料號</param>
         /// <param name="lotNo">生產序號</param>
@@ -189,6 +189,251 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
         }
 
+        /// <summary>
+        /// 取得出貨序號(多個)
+        /// </summary>
+        /// <param name="itemNo">料號</param>
+        /// <param name="lotNo">生產序號</param>
+        /// <param name="num">生產數量</param>
+        /// <returns></returns>
+        [HttpGet("ByQurey/{itemNo}/{lotNo}/{num}")]
+        public async Task<ResultModel<string>> GetSerialRuleByQurey(string itemNo, string lotNo,int num)
+        {
+            IQueryable<SerialRule> q = _context.SerialRules;
+            ResultModel<string> result = new ResultModel<string>();
+            var serialRule = await q.Where(p => p.ItemNo == itemNo).FirstOrDefaultAsync();
+            var serialRuleNew = serialRule;
+            var strRule = "";
+            var serial = "";
+            var minSerial = "";
+            var maxSerial="";
+            if (num <= 0)
+            {
+                result.Success = false;
+                result.Msg = "請輸入出貨數量!!";
+                return result;
+
+            }
+            if (serialRule == null || itemNo.ToUpper()=="OTHER")
+            {
+                itemNo = "OTHER";
+                if (lotNo.Length != 2)
+                {
+                    result.Success = false;
+                    result.Msg = "前置碼長度為2";
+                    //result.Msg = "無料號對應出貨序號規則";
+                    return result;
+                }
+                else
+                {
+                    serialRule = await q.Where(p => p.ItemNo == "OTHER").FirstOrDefaultAsync();
+                    serialRuleNew = serialRule;
+                    strRule = serialRule.Rule.ToUpper();
+                    serial = serialRule.Rule;
+
+                    if (strRule.Contains("[SS]"))
+                    {
+                        serial = serial.Replace("[SS]", lotNo);
+                    }
+                    if (strRule.Contains("[WW]"))
+                    {
+                        System.Globalization.GregorianCalendar gc = new System.Globalization.GregorianCalendar();
+                        DateTime datetime = DateTime.Now;
+                        int week = gc.GetWeekOfYear(datetime, System.Globalization.CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
+                        serial = serial.Replace("[WW]", week.ToString());
+
+                        if (serialRule.WNum != week)
+                        {
+                            serialRuleNew.WNum = week;
+                            if (serialRule.SnNum > 0)
+                                serialRuleNew.SnNum = 0;
+                        }
+                    }
+                    if (strRule.Contains("[YY]"))//年份後兩碼
+                    {
+                        var strYY = System.DateTime.Now.ToString("yy");
+                        if (serialRule.YNum.ToString() != System.DateTime.Now.ToString("yy"))
+                        {
+                            serialRuleNew.YNum = int.Parse(System.DateTime.Now.ToString("yy"));
+                            if (serialRule.SnNum > 0)
+                                serialRuleNew.SnNum = 0;
+                        }
+                        strYY = strYY.Replace("0", "Z");
+                        strYY = strYY.Replace("1", "A");
+                        strYY = strYY.Replace("2", "B");
+                        strYY = strYY.Replace("3", "C");
+                        strYY = strYY.Replace("4", "D");
+                        strYY = strYY.Replace("5", "E");
+                        strYY = strYY.Replace("6", "F");
+                        strYY = strYY.Replace("7", "G");
+                        strYY = strYY.Replace("8", "H");
+                        strYY = strYY.Replace("9", "J");
+
+                        serial = serial.Replace("[YY]", strYY);
+                    }
+                    if (strRule.Contains("[SN5]"))
+                    {
+                        serialRuleNew.SnNum++;
+                        if (num > 1)
+                        {
+                            minSerial = serial;
+                            maxSerial = serial;
+                            minSerial = minSerial.Replace("[SN5]", serialRuleNew.SnNum.ToString("00000"));
+                            serialRuleNew.SnNum = serialRuleNew.SnNum + num - 1;
+                            maxSerial = maxSerial.Replace("[SN5]", serialRuleNew.SnNum.ToString("00000"));
+                            serial = minSerial + "~" + maxSerial;
+
+                        }
+                        else
+                        {
+                            serial = serial.Replace("[SN5]", serialRuleNew.SnNum.ToString("00000"));
+                        }
+                    }
+
+
+
+
+                }
+            }
+            else
+            {
+                if (serialRule.LotLen != 0)
+                {
+                    if (lotNo == null)
+                    {
+
+
+                        result.Success = false;
+                        result.Msg = "所輸入LOT字數與規則不符合";
+                        return result;
+
+
+                    }
+                    if (serialRule.LotLen != lotNo.Length)
+                    {
+                        result.Success = false;
+                        result.Msg = "所輸入LOT字數與規則不符合";
+                        return result;
+                    }
+
+                }
+                strRule = serialRule.Rule.ToUpper();
+                serial = serialRule.Rule;
+                if (strRule.Contains("[YYYY]")) //年份
+                {
+                    serial = serial.Replace("[YYYY]", System.DateTime.Now.ToString("yyyy"));
+                    if (serialRule.YNum != System.DateTime.Now.Year)
+                    {
+                        serialRuleNew.YNum = System.DateTime.Now.Year;
+                        if (serialRule.SnNum > 0)
+                            serialRuleNew.SnNum = 0;
+                    }
+                }
+                if (strRule.Contains("[YY]"))//年份後兩碼
+                {
+                    serial = serial.Replace("[YY]", System.DateTime.Now.ToString("yy"));
+                    if (serialRule.YNum.ToString() != System.DateTime.Now.ToString("yy"))
+                    {
+                        serialRuleNew.YNum = int.Parse(System.DateTime.Now.ToString("yy"));
+                        if (serialRule.SnNum > 0)
+                            serialRuleNew.SnNum = 0;
+                    }
+                }
+                if (strRule.Contains("[MM]"))//月份
+                {
+                    serial = serial.Replace("[MM]", System.DateTime.Now.ToString("MM"));
+
+                    if (serialRule.MNum != System.DateTime.Now.Month)
+                    {
+                        serialRuleNew.MNum = System.DateTime.Now.Month;
+                        if (serialRule.SnNum > 0)
+                            serialRuleNew.SnNum = 0;
+                    }
+                }
+                if (strRule.Contains("[WW]"))
+                {
+                    System.Globalization.GregorianCalendar gc = new System.Globalization.GregorianCalendar();
+                    DateTime datetime = DateTime.Now;
+                    int week = gc.GetWeekOfYear(datetime, System.Globalization.CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
+                    serial = serial.Replace("[WW]", week.ToString());
+
+                    if (serialRule.WNum != week)
+                    {
+                        serialRuleNew.WNum = week;
+                        if (serialRule.SnNum > 0)
+                            serialRuleNew.SnNum = 0;
+                    }
+                }
+                if (strRule.Contains("[LOT3]"))
+                {
+                    serial = serial.Replace("[LOT3]", lotNo);
+                }
+                if (strRule.Contains("[LOT4]"))
+                {
+                    serial = serial.Replace("[LOT4]", lotNo);
+                }
+                if (strRule.Contains("[SN3]"))
+                {
+
+                    serialRuleNew.SnNum++;
+                    if (num > 1)
+                    {
+                        minSerial = serial;
+                        maxSerial = serial;
+                        minSerial = minSerial.Replace("[SN3]", serialRuleNew.SnNum.ToString("00000"));
+                        serialRuleNew.SnNum = serialRuleNew.SnNum + num - 1;
+                        maxSerial = maxSerial.Replace("[SN3]", serialRuleNew.SnNum.ToString("00000"));
+                        serial = minSerial + "~" + maxSerial;
+
+                    }
+                    else
+                    {
+                        serial = serial.Replace("[SN3]", serialRuleNew.SnNum.ToString("00000"));
+                    }
+                }
+                if (strRule.Contains("[SN4]"))
+                {
+                    serialRuleNew.SnNum++;
+                    if (num > 1)
+                    {
+                        minSerial = serial;
+                        maxSerial = serial;
+                        minSerial = minSerial.Replace("[SN4]", serialRuleNew.SnNum.ToString("00000"));
+                        serialRuleNew.SnNum = serialRuleNew.SnNum + num - 1;
+                        maxSerial = maxSerial.Replace("[SN4]", serialRuleNew.SnNum.ToString("00000"));
+                        serial = minSerial + "~" + maxSerial;
+
+                    }
+                    else
+                    {
+                        serial = serial.Replace("[SN4]", serialRuleNew.SnNum.ToString("00000"));
+                    }
+                }
+                //if (strRule.Contains("[MM1]"))//月份縮寫
+                //{
+                //    serial = strRule.Replace("[MM]", System.DateTime.Now.ToString("MMM"));
+                //}
+
+            }
+            _context.Entry(serialRuleNew).State = EntityState.Modified;
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = serial;
+
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
+
+
+        }
+
+
         /// <summary>
         /// 取得樣本序號
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs
index b716321c..fce25a9e 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs
@@ -149,10 +149,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
             //LINQ的 IN：
             var queryResult = from p in q
-            where (array).Contains(p.LineID) 
+            where(array).Contains(p.LineID)
+             //where (array).Contains(p.LineID) 
             select p;
 
-            if(u!="Null")
+            queryResult = queryResult.Where(l => array.Contains(l.LineID));
+            if (u!="Null")
                 queryResult = queryResult.Where(p => p.UnitNo.Equals(u));
             if(i!="Null")
                 queryResult = queryResult.Where(p => p.LineID.ToString() == l);
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 6e10103c..4914a50f 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 ce1fd18a..257a534b 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 ea12e182..15551cde 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 114aa3ce..c1b4fa5f 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 f89d5df6..5adcad51 100644
--- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
+++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
@@ -365,7 +365,7 @@
             條碼過站資料檔
             </summary>
         </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeStationController.GetBarcodeStationByKey(System.Int32,System.Int32,System.Int32,System.String)">
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarcodeStationController.GetBarcodeStationByKey(System.Int32,System.Int32,System.Int32)">
             <summary>
             
             </summary>
@@ -1784,6 +1784,13 @@
             <param name="station">站別</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialKpController.GetMaterialKpByItemNo(System.String)">
+            <summary>
+            料號Key Parts 資料檔 to ItemNo
+            </summary>
+            <param name="id">料號No</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.MaterialKpController.PostMaterialKp(AMESCoreStudio.WebApi.Models.AMES.MaterialKp)">
             <summary>
             新增料號基本資料檔
@@ -3316,12 +3323,21 @@
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSerialRuleByQurey(System.String,System.String)">
             <summary>
-            取得出貨序號
+            取得出貨序號(單個)
             </summary>
             <param name="itemNo">料號</param>
             <param name="lotNo">生產序號</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSerialRuleByQurey(System.String,System.String,System.Int32)">
+            <summary>
+            取得出貨序號(多個)
+            </summary>
+            <param name="itemNo">料號</param>
+            <param name="lotNo">生產序號</param>
+            <param name="num">生產數量</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSampleSerialRule(System.String)">
             <summary>
             取得樣本序號
@@ -3864,6 +3880,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfo4QRS011(System.String,System.String,System.String)">
+            <summary>
+            查詢工單資料QRS011
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipInfosController.GetWipInfoSelectParameter(AMESCoreStudio.WebApi.DTO.AMES.WipInfoDto,System.Int32,System.Int32)">
             <summary>
             查詢工單資料 by SelectParameter
@@ -4207,6 +4229,14 @@
             <param name="ruleStationID">流程ID</param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipStationController.GetWipStation4QRS009Group(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.WipStationController.GetWipStation(System.Int32,System.Int32)">
             <summary>
             基本查詢
@@ -4499,6 +4529,14 @@
             <param name="barCodeCheckDto"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.CU_Tables(AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto,System.Boolean)">
+            <summary>
+            判斷過站完成新增or更新 Table
+            </summary>
+            <param name="barCodeCheckDto"></param>
+            <param name="burnIn">T:燒機In</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.Table_BarcodeInfo(AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto)">
             <summary>
             BarcodeInfo-條碼資料檔
@@ -4573,7 +4611,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.GetCheckWipNoSation(System.String,System.String,System.Int32,System.Int32)">
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.GetCheckWipNoSation(System.String,System.String,System.Int32,System.Int32,System.Int32)">
             <summary>
             判斷工單狀態
             </summary>
@@ -4581,6 +4619,7 @@
             <param name="unitno">生產單位</param>
             <param name="line">線別</param>
             <param name="flowrule">流程</param>
+            <param name="stationID">作業站ID</param>
             <returns></returns>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.BarCodeCheckController.CheckBarCodeFromWip(System.String)">
@@ -6932,6 +6971,11 @@
             KP料號NO
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipKpDto.KpNoName">
+            <summary>
+            KP料號NO項目名稱
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipKpDto.KpSeq">
             <summary>
             順序
@@ -7112,7 +7156,7 @@
             生產單位
             </summary>
         </member>
-        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipOutfitDto.RuleStationID">
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipOutfitDto.StationID">
             <summary>
             作業站ID
             </summary>
@@ -7204,7 +7248,7 @@
         </member>
         <member name="P:AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto.ruleStatus">
             <summary>
-            條碼過站狀態 P:Pass F:Fail
+            條碼過站狀態 P:Pass F:Fail 
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto.unitNo">
@@ -7247,6 +7291,11 @@
             出貨序號
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto.userID">
+            <summary>
+            過站UserID
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto.inputItem">
             <summary>
             紀錄組件或不良代碼
@@ -7267,6 +7316,11 @@
             組件:舊組件序號 NG:異常位置
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto.inputItem.kpItemNo">
+            <summary>
+            組件:組件料號 NG:
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.DTO.AMES.BarCodeCheckDto.Outfit">
             <summary>
             治具條碼
@@ -8897,6 +8951,11 @@
             工單-基本資料
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.BarcodeStation.UserName">
+            <summary>
+            建立者姓名
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Models.AMES.BarcodeStatus">
             <summary>
             條碼狀態資料表
@@ -10944,7 +11003,7 @@
             站(前段)
             </summary>
         </member>
-        <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialOutfit.RuleStationID">
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialOutfit.StationID">
             <summary>
             站別
             </summary>
@@ -11064,7 +11123,7 @@
             生產單位
             </summary>
         </member>
-        <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialStationsItem.RuleStationID">
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.MaterialStationsItem.StationID">
             <summary>
             站別
             </summary>
@@ -14336,9 +14395,9 @@
             生產單位代號
             </summary>
         </member>
-        <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipOutfit.RuleStationID">
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipOutfit.StationID">
             <summary>
-            作業站
+            作業站ID
             </summary>
         </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipOutfit.CreateUserID">