diff --git a/AMESCoreStudio.Web/Controllers/BASController.cs b/AMESCoreStudio.Web/Controllers/BASController.cs
index 22c719b3..2067def3 100644
--- a/AMESCoreStudio.Web/Controllers/BASController.cs
+++ b/AMESCoreStudio.Web/Controllers/BASController.cs
@@ -2491,5 +2491,216 @@ namespace AMESCoreStudio.Web.Controllers
 
         #endregion
 
+        #region BAS019料號治具资料维护相关
+
+        public IActionResult BAS019()
+        {
+            return View();
+        }
+
+        //新增頁面
+        public async Task<IActionResult> BAS019C()
+        {
+            GetUserID();
+            return View();
+        }
+
+        //修改页面
+        [HttpGet]
+        public async Task<IActionResult> BAS019UAsync(int id)
+        {
+            GetUserID();
+            var result = await _basApi.GetSerialRule(id);
+
+            if (result.Count == 0)
+            {
+                return View();
+            }
+            return View(result[0]);
+        }
+
+        public async Task<IActionResult> BAS019DAsync(int id)
+        {
+            var result = await _basApi.DeleteSerialRule(id);
+            return Json(new Result() { success = true, msg = "" });
+        }
+
+        //頁面提交，id=0 添加，id>0 修改
+        [HttpPost]
+        public async Task<IActionResult> BAS019CSaveAsync(SerialRule model)
+        {
+
+            GetUserID();
+            if (ModelState.IsValid)
+            {
+                IResultModel result;
+
+                if (model.Rule.Contains("[YYYY]")) //年份
+                {
+                    model.YLen = 4;
+                }
+                if (model.Rule.Contains("[YY]"))//年份後兩碼
+                {
+                    model.YLen = 2;
+                }
+                if (model.Rule.Contains("[MM]"))//月份
+                {
+                    model.MLen = 2;
+                }
+                if (model.Rule.Contains("[WW]"))
+                {
+                    model.WLen = 2;
+
+                }
+                if (model.Rule.Contains("[LOT3]"))
+                {
+                    model.LotLen=3;
+                }
+                if (model.Rule.Contains("[LOT4]"))
+                {
+                    model.LotLen = 4;
+                }
+                if (model.Rule.Contains("[SN3]"))
+                {
+                    model.SnLen = 3;
+
+                }
+                if (model.Rule.Contains("[SN4]"))
+                {
+                    model.SnLen = 4;
+                }
+
+
+                result = await _basApi.PostSerialRule(JsonConvert.SerializeObject(model));
+
+
+                if (result.Success)
+                {
+                    var _msg = "添加成功！";
+                    return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                }
+                else
+                {
+                    await GetOutfitCommodityList();
+                    ModelState.AddModelError("error", result.Msg);
+                    return View("BAS019C", model);
+                }
+            }
+            else
+            {
+                ModelState.AddModelError("error", "缺少必填資料");
+                return View("BAS019C", model);
+            }
+
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> BAS019USaveAsync(SerialRule model)
+        {
+            GetUserID();
+
+            if (ModelState.IsValid)
+            {
+                IResultModel result;
+
+                if (model.Rule.Contains("[YYYY]")) //年份
+                {
+                    model.YLen = 4;
+                }
+                if (model.Rule.Contains("[YY]"))//年份後兩碼
+                {
+                    model.YLen = 2;
+                }
+                if (model.Rule.Contains("[MM]"))//月份
+                {
+                    model.MLen = 2;
+                }
+                if (model.Rule.Contains("[WW]"))
+                {
+                    model.WLen = 2;
+
+                }
+                if (model.Rule.Contains("[LOT3]"))
+                {
+                    model.LotLen = 3;
+                }
+                if (model.Rule.Contains("[LOT4]"))
+                {
+                    model.LotLen = 4;
+                }
+                if (model.Rule.Contains("[SN3]"))
+                {
+                    model.SnLen = 3;
+
+                }
+                if (model.Rule.Contains("[SN4]"))
+                {
+                    model.SnLen = 4;
+                }
+
+                result = await _basApi.PutSerialRule(model.SerialRuleID, JsonConvert.SerializeObject(model));
+
+
+                if (result.Success)
+                {
+                    var _msg = "修改成功！";
+                    return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                }
+                else
+                {
+                    ModelState.AddModelError("error", result.Msg);
+                    return View("BAS019U", model);
+
+                }
+            }
+            else
+            {
+                ModelState.AddModelError("error", "缺少必填資料");
+                return View("BAS019U", model);
+            }
+        }
+
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> GetSerialRulesAsync()
+        {
+            var result = await _basApi.GetSerialRules();
+
+            if (result.Count > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+            }
+
+            return Json(new Table() { count = 0, data = null });
+        }
+
+
+        public async Task<IActionResult> GetSerialRuleAsync(int ID)
+        {
+            var result = await _basApi.GetSerialRule(ID);
+
+            if (result.Count > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+            }
+
+            return Json(new Table() { count = 0, data = null });
+        }
+
+
+        public async Task<IActionResult> GetSerialRuleByItemNoAsync(string ID)
+        {
+            var result = await _basApi.GetSerialRuleByItemNo(ID);
+
+            if (result.Count > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+            }
+
+            return Json(new Table() { count = 0, data = null });
+        }
+
+        #endregion
+
     }
 }
diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 58d0b9e1..0415a7c3 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -4615,6 +4615,8 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 var FlowRule = result_Wip.FirstOrDefault().FlowRuleID;
                 var result_RuleStation = await _basApi.GetRuleStationsByFlow(FlowRule, 0);
+                //result_RuleStation = result_RuleStation.Where(w => w.StationType == "M").OrderBy(o => o.Sequence).ToList();
+                //var Stations = new List<SelectListItem>();
                 result_RuleStation = result_RuleStation.Where(w => w.StationType == "M" && w.StationID != 1000).OrderBy(o => o.Sequence).ToList();
                 var RuleStations = new List<SelectListItem>();
                 for (int i = 0; i < result_RuleStation.Count; i++)
@@ -4882,6 +4884,108 @@ namespace AMESCoreStudio.Web.Controllers
             }
             return user_id;
         }
+
+        #region PCS033組件资料维护相关
+
+        public IActionResult PCS033()
+        {
+            return View();
+        }
+        //新增頁面
+        public async Task<IActionResult> PCS033C()
+        {
+            var id = GetLogInUserID();
+            ViewBag.UserID = id;
+            var result = await _sysApi.GetUserInfo(id); 
+            var name = result[0].UserName;
+            ViewBag.UserName = name;
+            return View();
+        }
+
+        //頁面提交，id=0 添加，id>0 修改
+        [HttpPost]
+        public async Task<IActionResult> PCS033CSaveAsync(SampleSipmentSN model)
+        {
+
+            if (ModelState.IsValid)
+            {
+                IResultModel result;
+                IResultModel result2;
+
+                result2 = await _pcsApi.GetSampleSerialRule(model.Qty);
+                if (result2.Success)
+                {
+                    string str, str1;
+                    var strA = result2.Msg.Split("-");
+                    str = strA[0];
+                    str1 = strA[1];
+                    model.StartNo = str;
+                    model.EndNo = str1;
+                    result = await _pcsApi.PostSampleSipmentSN(JsonConvert.SerializeObject(model));
+                    if (result.Success)
+                    {
+                        var _msg = "取得序號成功！,序號為["+ result2.Msg + "]";
+                        return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                    }
+                    else
+                    {
+
+                        ModelState.AddModelError("error", result.Msg);
+
+                    }
+                }
+                else
+                {
+
+                    ModelState.AddModelError("error", "取得序號失敗");
+
+
+                }
+            }
+            return View("PCS033C", model);
+
+        }
+
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> GetSampleSipmentSNsAsync()
+        {
+
+            var result = await _pcsApi.GetSampleSipmentSNs();
+
+            if (result.Count > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+            }
+
+            return Json(new Table() { count = 0, data = null });
+        }
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> GetSampleSipmentSNsByQueryAsync(string itemNo, string wipNo, string userName, string Sdate, string Edate)
+        {
+            if (string.IsNullOrEmpty(wipNo))
+                wipNo = "*";
+            if (string.IsNullOrEmpty(itemNo))
+                itemNo = "*";
+            if (string.IsNullOrEmpty(userName))
+                userName = "*";
+            if (string.IsNullOrEmpty(Sdate))
+                Sdate = "*";
+            if (string.IsNullOrEmpty(Edate))
+                Edate = "*";
+
+            var result = await _pcsApi.GetSampleSipmentSNsByQurey( itemNo,  wipNo,  userName,  Sdate,  Edate);
+
+            if (result.Count > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+            }
+
+            return Json(new Table() { count = 0, data = null });
+        }
+
+        #endregion
     }
 
 
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
index 10517931..9268fd5e 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
@@ -1122,5 +1122,28 @@ namespace AMESCoreStudio.Web
         ITask<ResultModel<string>> GetSerialRuleByQurey(string itemNo,string lotNo ,int num);
         #endregion
 
+        #region 樣品出貨序號紀錄
+
+        /// <summary>
+        /// 新增組件
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/SampleSipmentSNs")]
+        ITask<ResultModel<SampleSipmentSN>> PostSampleSipmentSN([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 獲取組件
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/SampleSipmentSNs")]
+        ITask<List<SampleSipmentSN>> GetSampleSipmentSNs();
+
+
+        [WebApiClient.Attributes.HttpGet("api/SampleSipmentSNs/ByQurey/{itemNo}/{wipNo}/{userName}/{Sdate}/{Edate}")]
+        ITask<List<SampleSipmentSN>> GetSampleSipmentSNsByQurey(string itemNo, string wipNo, string userName, string Sdate, string Edate);
+
+        [WebApiClient.Attributes.HttpGet("api/SerialRules/Sample/num/{num}")]
+        ITask<ResultModel<string>> GetSampleSerialRule(int num);
+        #endregion
     }
 }
diff --git a/AMESCoreStudio.Web/HttpApis/IBAS.cs b/AMESCoreStudio.Web/HttpApis/IBAS.cs
index 616d4fe9..54acba8b 100644
--- a/AMESCoreStudio.Web/HttpApis/IBAS.cs
+++ b/AMESCoreStudio.Web/HttpApis/IBAS.cs
@@ -840,6 +840,53 @@ namespace AMESCoreStudio.Web
 
         #endregion
 
+        #region BAS019出貨序號編碼規則維護相關
+
+        /// <summary>
+        /// 新增出貨序號編碼規則
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/SerialRules")]
+        ITask<ResultModel<SerialRule>> PostSerialRule([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 更新出貨序號編碼規則
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPut("api/SerialRules/{id}")]
+        ITask<ResultModel<SerialRule>> PutSerialRule(int id, [FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 刪除出貨序號編碼規則
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpDelete("api/SerialRules/{id}")]
+        ITask<ResultModel<string>> DeleteSerialRule(int id);
+
+        /// <summary>
+        /// 根據ID獲取指定出貨序號編碼規則
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/SerialRules/{id}")]
+        ITask<List<SerialRule>> GetSerialRule(int id);
+
+        /// <summary>
+        /// 獲取出貨序號編碼規則資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/SerialRules")]
+        ITask<List<SerialRule>> GetSerialRules();
+
+        /// <summary>
+        /// 獲取出貨序號編碼規則ByItemNo
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/SerialRules/ItemNo/{id}")]
+        ITask<List<SerialRule>> GetSerialRuleByItemNo(string id);
+
+
+
+        #endregion
 
     }
 }
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS019.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS019.cshtml
new file mode 100644
index 00000000..0dced5d6
--- /dev/null
+++ b/AMESCoreStudio.Web/Views/BAS/BAS019.cshtml
@@ -0,0 +1,132 @@
+@{
+    ViewData["Title"] = "出貨序號編碼規則維護";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<div class="layui-card">
+    <div class="layui-card-header">
+        <div class="layui-form">
+            <div class="layui-form-item ">
+                <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-card-body">
+        <div class="layui-form" style="margin-bottom:5px;">
+            <div class="layui-form-item">
+                <div class="layui-inline" style="margin-right:5px;">
+                    <label class="layui-inline layui-form-label">料號</label>
+                    <div class="layui-input-inline">
+                        <input type="text" name="itemNo" id="itemNo" placeholder="请输入料號" autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-inline" style="margin-left:0px;">
+                    <div class="layui-btn-group">
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" id="querysubmit" lay-filter="querysubmit">
+                            <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <table class="layui-hide" id="test" lay-filter="test"></table>
+    </div>
+</div>
+
+@section Scripts{
+    <script type="text/javascript">
+        var table;
+        $(function () {
+            tt();
+        });
+        var tableCols = [[
+            {
+                field: 'serialRuleID',
+                sort: true,
+                title: '#'
+            },
+            {
+                field: 'itemNo',
+                sort: true,
+                title: '料號'
+            },
+            {
+                field: 'rule',
+                title: '編碼規則'
+            },//MTNO001-TEST
+            {
+                field: 'right',
+                width: 200,
+                title: '操作',
+                fixed: 'right',
+                templet: function (d) {
+                    return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del" > 删除</a> '
+                }
+            }]
+        ];
+        //通过行tool编辑，lay-event="edit"
+        function edit(obj) {
+            console.info(obj.data);
+            if (obj.data.serialRuleID) {
+                hg.open('修改出貨序號編碼規則', '/BAS/BAS019U/' + obj.data.serialRuleID , 480,480);
+            }
+        }
+        //通过行tool删除，lay-event="del"
+        function del(obj) {
+            //alert(obj);
+            if (obj.data.materialOutfitID) {
+                hg.confirm("系統：" + obj.data.itemNo + "，確定要删除嗎？", function () {
+                    $.ajax({
+                        url: '/BAS/BAS019D',
+                        data: { id: obj.data.serialRuleID},
+                        type: 'POST',
+                        success: function (data) {
+                            if (data.success) {
+                                obj.del(); //只删本地数据
+                                hg.msghide("删除成功！");
+                            }
+                            else {
+                                hg.msg(data.msg);
+                            }
+                        },
+                        error: function () {
+                            hg.msg("網路請求失敗！");
+                        }
+                    });
+                });
+            }
+        }     
+        var toolbar = [{
+            text: '新增',
+            layuiicon: '&#xe608;',
+            class: 'layui-btn-normal',
+            handler: function () {
+                hg.open('新增出貨序號編碼規則', '/BAS/BAS019C', 480, 480);
+
+            }
+        }
+        ];
+        ////搜索
+        $('#querysubmit').click(function () {
+            hg.msghide("刷新数据！");
+            tt();
+            return false;
+
+        });
+        //基本数据表格
+        function tt() {
+            var iNO = "";
+            iNO = $("#itemNo").val();
+            if (iNO) {
+                table = hg.table.datatable('test', '出貨序號編碼規則', '/BAS/GetSerialRuleByItemNo?ID=' + iNO
+                    , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+            }
+            else {
+                table = hg.table.datatable('test', '出貨序號編碼規則', '/BAS/GetSerialRules'
+                    , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+
+            }
+
+        };
+    </script>
+}
\ No newline at end of file
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS019C.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS019C.cshtml
new file mode 100644
index 00000000..c827610e
--- /dev/null
+++ b/AMESCoreStudio.Web/Views/BAS/BAS019C.cshtml
@@ -0,0 +1,76 @@
+@model AMESCoreStudio.WebApi.Models.AMES.SerialRule
+
+
+@{ ViewData["Title"] = "BAS019C";
+    Layout = "~/Views/Shared/_FormLayout.cshtml"; }
+
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+</style>
+
+<div class="row">
+    <div class="col-sm-12">
+        <form enctype="multipart/form-data" method="post" asp-action="BAS019CSave">
+            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+            <input type="hidden" asp-for="SerialRuleID" value="0" />
+            <input type="hidden" asp-for="CreateUserID" value="@ViewBag.UserID" />
+            <input type="hidden" asp-for="UpdateUserID" value="@ViewBag.UserID" />
+            <input type="hidden" asp-for="CreateDate" value="@System.DateTime.Now" />
+            <input type="hidden" asp-for="UpdateDate" value="@System.DateTime.Now" />
+
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="ItemNo" class="control-label col-sm-3"></label>
+                <input asp-for="ItemNo" class="form-control col-sm-9" />
+                <span asp-validation-for="ItemNo" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="Rule" class="control-label col-sm-3"></label>
+                <input asp-for="Rule" class="form-control col-sm-9" />
+                <span asp-validation-for="Rule" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label class="control-label col-sm-12">編號規則,如下:</label>
+                <label class="control-label col-sm-3">[YY]</label>
+                <label class="control-label col-sm-9">：生產西元年後2碼</label>
+                <label class="control-label col-sm-3">[MM]</label>
+                <label class="control-label col-sm-9">：生產月別</label>
+                <label class="control-label col-sm-3">[WW]</label>
+                <label class="control-label col-sm-9">：生產週別</label>
+                <label class="control-label col-sm-3">[SN3]</label>
+                <label class="control-label col-sm-9">：3碼流水號 </label>
+                <label class="control-label col-sm-3">[SN4]</label>
+                <label class="control-label col-sm-9">：4碼流水號 </label>
+                <label class="control-label col-sm-3">[LOT3]</label>
+                <label class="control-label col-sm-9">：3碼生產批號 </label>
+                <label class="control-label col-sm-3">[LOT4]</label>
+                <label class="control-label col-sm-9">：4碼生產批號 </label>
+                <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">**如果非以上規則系統將無法判斷**</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" />
+            </div>
+
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+
+    <script type="text/javascript">
+        $(document).ready(function () {
+            var error = '@Html.ValidationMessage("error")';
+            if ($(error).text() != '') {
+                parent.hg.msg(error);
+            }
+        });
+    </script>
+
+
+}
+
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS019U.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS019U.cshtml
new file mode 100644
index 00000000..22693738
--- /dev/null
+++ b/AMESCoreStudio.Web/Views/BAS/BAS019U.cshtml
@@ -0,0 +1,78 @@
+@model AMESCoreStudio.WebApi.Models.AMES.SerialRule
+
+
+@{ ViewData["Title"] = "BAS019U";
+    Layout = "~/Views/Shared/_FormLayout.cshtml"; }
+
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+</style>
+
+<div class="row">
+    <div class="col-sm-12">
+        <form enctype="multipart/form-data" method="post" asp-action="BAS019USave">
+            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+            <input type="hidden" asp-for="SerialRuleID" />
+            <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="UpdateDate" value="@System.DateTime.Now" />
+            <input type="hidden" asp-for="YNum" />
+            <input type="hidden" asp-for="YLen" />
+            <input type="hidden" asp-for="MLen" />
+            <input type="hidden" asp-for="MNum" />
+            <input type="hidden" asp-for="WNum" />
+            <input type="hidden" asp-for="WLen" />
+            <input type="hidden" asp-for="LotLen" />
+            <input type="hidden" asp-for="LotNum" />
+            <input type="hidden" asp-for="SnNum" />
+            <input type="hidden" asp-for="SnLen" />
+
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="ItemNo" class="control-label col-sm-3"></label>
+                <input asp-for="ItemNo" class="form-control col-sm-9" />
+                <span asp-validation-for="ItemNo" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="Rule" class="control-label col-sm-3"></label>
+                <input asp-for="Rule" class="form-control col-sm-9" />
+                <span asp-validation-for="Rule" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label class="control-label col-sm-12">編號規則,如下:</label>
+                <label class="control-label col-sm-9">[YY]：生產西元年後2碼</label>
+                <label class="control-label col-sm-9">[MM]：生產月別</label>
+                <label class="control-label col-sm-9">[WW]：生產週別</label>
+                <label class="control-label col-sm-9">[SN3]：3碼流水號 </label>
+                <label class="control-label col-sm-9">[SN4]：4碼流水號 </label>
+                <label class="control-label col-sm-9">[LOT3]：3碼生產批號 </label>
+                <label class="control-label col-sm-9">[LOT4]：4碼生產批號 </label>
+                <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">**如果非以上規則系統將無法判斷**</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" />
+            </div>
+
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+
+    <script type="text/javascript">
+        $(document).ready(function () {
+            var error = '@Html.ValidationMessage("error")';
+            if ($(error).text() != '') {
+                parent.hg.msg(error);
+            }
+        });
+    </script>
+
+}
+
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS033.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS033.cshtml
new file mode 100644
index 00000000..66840d06
--- /dev/null
+++ b/AMESCoreStudio.Web/Views/PCS/PCS033.cshtml
@@ -0,0 +1,260 @@
+@{
+    ViewData["Title"] = "樣本序號取得紀錄";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<div class="layui-card">
+    <div class="layui-card-header">
+        <div class="layui-form">
+            <div class="layui-form-item ">
+                <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-card-body">
+        <div class="layui-form" style="margin-bottom:5px;">
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">工單:</label>
+                        <input id="wipNo" style="width: 250px;" class="layui-input">
+                    </div>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">料號:</label>
+                        <input id="itemNo" style="width: 250px;" class="layui-input">
+                    </div>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">開單人員姓名:</label>
+                        <input id="userName" style="width: 250px;" class="layui-input">
+                    </div>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <div class="layui-col-sm10">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">日期:</label>
+                        <div class="layui-input-inline">
+                            <input id="dateStr" name="dateStr" autocomplete="off" class="layui-input">
+                        </div>
+                        <div class="layui-form-mid">～</div>
+                        <div class="layui-input-inline">
+                            <input id="dateEnd" name="dateEnd" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-sm2">
+                    <div class="layui-inline" style="margin-left: 0px;">
+                        <div class="layui-inline layui-show-xs-block">
+                            <button class="layui-btn layui-btn-sm layui-btn-normal" id="querysubmit" lay-filter="querysubmit">
+                                <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <table class="layui-hide" id="test" lay-filter="test"></table>
+    </div>
+</div>
+
+@section Scripts{
+    <script type="text/javascript">
+
+        layui.use(['form', 'layer', 'laydate'], function () {
+            form = layui.form;
+            laydate = layui.laydate;
+            laydate.render({
+                elem: '#dateStr'
+                , trigger: 'click'
+                , format: 'yyyy-MM-dd'
+                , theme: 'grid'
+                , isInitValue: true
+                , ready: function (date) {
+                    // $("#dateStrh").val($("#dateStrh").val());
+                }
+                , change: function (value, date, endDate) {
+                    $("#dateStrh").val(value);
+                }
+                , done: function (value, date, endDate) {
+                    $("#dateStrh").val(value);
+                }
+            });
+            laydate.render({
+                elem: '#dateEnd'
+                , trigger: 'click'
+                , format: 'yyyy-MM-dd'
+                , theme: 'grid'
+                , isInitValue: true
+                , ready: function (date) {
+                    //$("#dateEndh").val(value);
+                    //console.log(date.y);//  得到初始化的日期时间对象
+                }
+                , change: function (value, date, endDate) {
+                    $("#dateEndh").val(value);
+                }
+                , done: function (value, date, endDate) {
+                    $("#dateEndh").val(value);
+                }
+            });
+        });
+
+        var table;
+        $(function () {
+            tt();
+        });
+        var tableCols = [[
+            {
+                field: 'createDate',
+                sort: true,
+                title: '建立日期',
+                templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'sampleWipNo',
+                sort: true,
+                title: '工單'
+            },
+            {
+                field: 'itemNo',
+                sort: true,
+                title: '料號'
+            },
+            {
+                field: 'qty',
+                title: '數量'
+            },
+            {
+                field: 'createName',
+                title: '開單人員'
+            },
+            {
+                field: 'startNo',
+                title: '起始序號'
+            },
+            {
+                field: 'endNo',
+                title: '結束序號'
+            },
+            {
+                field: 'startDate',
+                title: '開工日期',
+                templet: '<div>{{ layui.util.toDateString(d.startDate, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'completedDate',
+                title: '完工日期',
+                templet: '<div>{{ layui.util.toDateString(d.completedDate, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'powerCord',
+                title: 'Power Cord'
+            },
+            {
+                field: 'ecn',
+                title: 'ECN'
+            },
+            {
+                field: 'bios',
+                title: 'BIOS'
+            },
+            {
+                field: 'ean',
+                title: 'EAN'
+            },
+            {
+                field: 'barcodeNo',
+                title: '內部序號'
+            }, 
+            //{
+            //    field: 'right',
+            //    width: 200,
+            //    title: '操作',
+            //    fixed: 'right',
+            //    templet: function (d) {
+            //        return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del" > 删除</a> '
+            //    }
+            //}
+        ]];
+        //通过行tool编辑，lay-event="edit"
+        function edit(obj) {
+            console.info(obj.data);
+            if (obj.data.serialRuleID) {
+                hg.open('修改樣本序號取得紀錄', '/PCS/PCS033U/' + obj.data.serialRuleID , 480,480);
+            }
+        }
+        //通过行tool删除，lay-event="del"
+        function del(obj) {
+            //alert(obj);
+            if (obj.data.materialOutfitID) {
+                hg.confirm("系統：" + obj.data.itemNo + "，確定要删除嗎？", function () {
+                    $.ajax({
+                        url: '/PCS/PCS033D',
+                        data: { id: obj.data.serialRuleID},
+                        type: 'POST',
+                        success: function (data) {
+                            if (data.success) {
+                                obj.del(); //只删本地数据
+                                hg.msghide("删除成功！");
+                            }
+                            else {
+                                hg.msg(data.msg);
+                            }
+                        },
+                        error: function () {
+                            hg.msg("網路請求失敗！");
+                        }
+                    });
+                });
+            }
+        }     
+        var toolbar = [{
+            text: '新增',
+            layuiicon: '&#xe608;',
+            class: 'layui-btn-normal',
+            handler: function () {
+                hg.open('新增樣本序號取得紀錄', '/PCS/PCS033C', 480, 480);
+
+            }
+        }
+        ];
+        ////搜索
+        $('#querysubmit').click(function () {
+            hg.msghide("刷新数据！");
+            tt();
+            return false;
+
+        });
+        //基本数据表格
+        function tt() {
+            var itemNo = "";
+            var wipNo = "";
+            var userName = "";
+            var Sdate = "";
+            var Edate = "";
+
+            itemNo = $("#itemNo").val();
+            wipNo = $("#wipNo").val();
+            userName = $("#userName").val();
+            Sdate = $("#dateStr").val();
+            Edate = $("#dateEnd").val();
+           
+            table = hg.table.datatable('test', '出貨序號編碼規則', '/PCS/GetSampleSipmentSNsByQuery?'
+                + 'itemNo=' + itemNo
+                + '&wipNo=' + wipNo
+                + '&userName=' + userName
+                + '&Sdate=' + Sdate
+                + '&Edate=' + Edate
+               , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+
+
+        };
+    </script>
+}
\ No newline at end of file
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS033C.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS033C.cshtml
new file mode 100644
index 00000000..265fb1e5
--- /dev/null
+++ b/AMESCoreStudio.Web/Views/PCS/PCS033C.cshtml
@@ -0,0 +1,129 @@
+@model AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN
+
+
+@{ ViewData["Title"] = "PCS033C";
+    Layout = "~/Views/Shared/_FormLayout.cshtml"; }
+
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+</style>
+
+<div class="row">
+    <div class="col-sm-12">
+        <form enctype="multipart/form-data" method="post" asp-action="PCS033CSave">
+            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+            <input type="hidden" asp-for="CreateUserID" value="@ViewBag.UserID" />
+            <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="StartNo" value="tt" />
+            <input type="hidden" asp-for="EndNo" value="tt" />
+
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="CreateName" class="control-label col-sm-3"></label>
+                <input asp-for="CreateName" value="@ViewBag.UserName" class="form-control col-sm-9" />
+                <span asp-validation-for="CreateName" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="SampleWipNo" class="control-label col-sm-3"></label>
+                <input id="WipNo" asp-for="SampleWipNo" class="form-control col-sm-9" />
+                <span asp-validation-for="SampleWipNo" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="ItemNo" class="control-label col-sm-3"></label>
+                <input id="ItemNo" asp-for="ItemNo" class="form-control col-sm-9" />
+                <span asp-validation-for="ItemNo" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="Qty" class="control-label col-sm-3"></label>
+                <input asp-for="Qty" class="form-control col-sm-9" />
+                <span asp-validation-for="Qty" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="StartDate" class="control-label col-sm-3"></label>
+                <input asp-for="StartDate" type="date" class="form-control col-sm-9" />
+                <span asp-validation-for="StartDate" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="CompletedDate" class="control-label col-sm-3"></label>
+                <input asp-for="CompletedDate" type="date" class="form-control col-sm-9" />
+                <span asp-validation-for="CompletedDate" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="PowerCord" class="control-label col-sm-3"></label>
+                <input asp-for="PowerCord" class="form-control col-sm-9" />
+                <span asp-validation-for="PowerCord" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="ECN" class="control-label col-sm-3"></label>
+                <input asp-for="ECN" class="form-control col-sm-9" />
+                <span asp-validation-for="ECN" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="EAN" class="control-label col-sm-3"></label>
+                <input asp-for="EAN" class="form-control col-sm-9" />
+                <span asp-validation-for="EAN" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="BIOS" class="control-label col-sm-3"></label>
+                <input asp-for="BIOS" class="form-control col-sm-9" />
+                <span asp-validation-for="BIOS" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="BarcodeNo" class="control-label col-sm-3"></label>
+                <input asp-for="BarcodeNo" class="form-control col-sm-9" />
+                <span asp-validation-for="BarcodeNo" 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" />
+            </div>
+
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+
+    <script type="text/javascript">
+        $(document).ready(function () {
+            var error = '@Html.ValidationMessage("error")';
+            if ($(error).text() != '') {
+                parent.hg.msg(error);
+            }
+        });
+        $('#WipNo').focusout(function () {
+            var data = $("#WipNo").val();
+            if (data) {
+                $.ajax({
+                    url: "/SPC/GetWipAtt",
+                    dataType: 'json',
+                    data: { id: data },
+                    contentType: "application/json",
+                    type: 'get',
+                    success: function (result) {
+                        if (result.data) {
+                            $("#ItemNo").val(result.data.itemNO);
+                        }
+                        else {
+                            $('#ItemNo').focus();
+                            return false;
+                        }
+                    },
+                    error: function () {
+                        $('#ItemNo').focus();
+                        return false;
+                    }
+                });
+            }
+
+        });
+    </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 3c6564cf..154fa5b1 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 34a68337..dcd2ff42 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.deps.json b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json
index 5d368154..1c4f4063 100644
--- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json
+++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json
@@ -311,6 +311,14 @@
         "runtime": {
           "AMESCoreStudio.Web.dll": {}
         },
+        "resources": {
+          "zh-CN/AMESCoreStudio.Web.resources.dll": {
+            "locale": "zh-CN"
+          },
+          "zh-TW/AMESCoreStudio.Web.resources.dll": {
+            "locale": "zh-TW"
+          }
+        },
         "compile": {
           "AMESCoreStudio.Web.dll": {}
         }
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll
index c781ff7a..8a85f440 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 86fa6e0a..117abea8 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 63e183fc..b4de95e9 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 b25385bf..38499cb8 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 60cccf56..094175aa 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 84334f6f..29eb02db 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 c85f7bad..556e22eb 100644
--- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
+++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
@@ -612,6 +612,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.CycleTimesController.GetCycleTimeByItemNo(System.String)">
+            <summary>
+            工單料號查詢
+            </summary>
+            <param name="id">工單料號</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.CycleTimesController.PutCycleTime(System.String,AMESCoreStudio.WebApi.Models.AMES.CycleTime)">
             <summary>
             
@@ -3325,9 +3332,57 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController">
+            <summary>
+            樣本序號取得紀錄基本資料檔Controller
+            </summary>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController.#ctor(AMESCoreStudio.WebApi.AMESContext)">
+            <summary>
+            建構式
+            </summary>
+            <param name="context"></param>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController.GetSampleSipmentSNs">
+            <summary>
+            查詢樣本序號取得紀錄資料檔
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController.GetSampleSipmentSN(System.String)">
+            <summary>
+            樣本序號取得紀錄基本資料檔 to SampleWipNo
+            </summary>
+            <param name="id">SampleSipmentSNID</param>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController.GetSampleSipmentSNByQurey(System.String,System.String,System.String,System.String,System.String)">
+            <summary>
+            取得樣本序號取得紀錄ByQurey
+            </summary>
+            <param name="itemNo">料號</param>
+            <param name="wipNo">工單</param>
+            <param name="userName">開單人員</param>
+            <param name="Sdate">開單日期</param>
+            <param name="Edate">開單日期</param>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController.PostSampleSipmentSN(AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN)">
+            <summary>
+            新增樣本序號取得紀錄資料檔
+            </summary>
+            <param name="SampleSipmentSN"></param>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController.PutSampleSipmentSN(System.Int32,AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN)">
+            <summary>
+            修改料號基本資料檔
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController">
             <summary>
-            料號基本資料檔Controller
+            出貨序號編碼規則基本資料檔Controller
             </summary>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.#ctor(AMESCoreStudio.WebApi.AMESContext)">
@@ -3338,15 +3393,22 @@
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSerialRule">
             <summary>
-            查詢料號基本資料檔
+            查詢出貨序號編碼規則資料檔
             </summary>
             <returns></returns>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSerialRule(System.Int32)">
             <summary>
-            料號基本資料檔 to ItemID
+            出貨序號編碼規則基本資料檔 to SerialRuleID
             </summary>
-            <param name="id">ItemID</param>
+            <param name="id">SerialRuleID</param>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSerialRuleByItemNo(System.String)">
+            <summary>
+            料號基本資料檔 to ItemNo
+            </summary>
+            <param name="ItemNo">ItemNo</param>
             <returns></returns>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSerialRuleByQurey(System.String,System.String)">
@@ -3387,7 +3449,7 @@
             <param name="SerialRule"></param>
             <returns></returns>
         </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.PutSerialRule(AMESCoreStudio.WebApi.Models.AMES.SerialRule)">
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.PutSerialRule(System.Int32,AMESCoreStudio.WebApi.Models.AMES.SerialRule)">
             <summary>
             修改料號基本資料檔
             </summary>
@@ -10718,6 +10780,91 @@
             維修原因狀態
             </summary>
         </member>
+        <member name="T:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN">
+            <summary>
+            樣本序號取得紀錄資料檔
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.SampleWipNo">
+            <summary>
+            工單
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.ItemNo">
+            <summary>
+            料號
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.Qty">
+            <summary>
+            年
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.StartDate">
+            <summary>
+            開工日期
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.CompletedDate">
+            <summary>
+            完工日期
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.PowerCord">
+            <summary>
+            PowerCord
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.ECN">
+            <summary>
+            ECN
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.BIOS">
+            <summary>
+            BIOS
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.EAN">
+            <summary>
+            EAN
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.BarcodeNo">
+            <summary>
+            內部序號
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.StartNo">
+            <summary>
+            起始序號
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.EndNo">
+            <summary>
+            結束序號
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.CreateName">
+            <summary>
+            更新UserID
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.CreateUserID">
+            <summary>
+            建立UserID
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.CreateDate">
+            <summary>
+            建立日期
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.UpdateDate">
+            <summary>
+            更新日期
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Models.AMES.SerialRule">
             <summary>
             料號出貨序號規則資料檔
@@ -12443,6 +12590,11 @@
             燒機時間
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipSystem.BI_OS">
+            <summary>
+            燒機軟體
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipSystem.BiMemo">
             <summary>
             燒機備註
@@ -15258,6 +15410,91 @@
             作業站名稱
             </summary>
         </member>
+        <member name="T:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto">
+            <summary>
+            WipQuery Select Dto
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.wipID">
+            <summary>
+            工單ID
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.wipNo">
+            <summary>
+            工單號碼
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.planQTY">
+            <summary>
+            工單數量
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.unitNo">
+            <summary>
+            生產單位
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.unitName">
+            <summary>
+            生產單位Name
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.lineID">
+            <summary>
+            線別ID
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.lineDesc">
+            <summary>
+            線別Name
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.itemNo">
+            <summary>
+            料號
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.statusNo">
+            <summary>
+            工單狀態
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.wipScheduleDate">
+            <summary>
+            預計開工日期
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.wipDueDate">
+            <summary>
+            預計完工日期
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.factoryNameCh">
+            <summary>
+            廠商中文廠名
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.description">
+            <summary>
+            工單描述
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.CreateDate">
+            <summary>
+            工單建立日期
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.workDate">
+            <summary>
+            開工日
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.fqcDate">
+            <summary>
+            檢驗日
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.DTO.AMES.WipSopDto">
             <summary>
             工單製程對應SOP資料檔 DTO
@@ -15708,6 +15945,11 @@
             H/W AT
             </summary>
         </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipSystemPMType.D">
+            <summary>
+            Other
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipSystemType">
             <summary>
             工單資訊 系統工程資訊 Type
@@ -15733,6 +15975,106 @@
             備註說明
             </summary>
         </member>
+        <member name="T:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipSystemDMIBIType">
+            <summary>
+            工單資訊 系統工程資訊 DMI燒入 Type
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipSystemDMIBIType.Y">
+            <summary>
+            YES
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipSystemDMIBIType.N">
+            <summary>
+            N/A
+            </summary>
+        </member>
+        <member name="T:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer">
+            <summary>
+            燒機時間
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.N">
+            <summary>
+            NA
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.A">
+            <summary>
+            室溫
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.B">
+            <summary>
+            -40~+85度
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.D">
+            <summary>
+            -20~+70度
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.E">
+            <summary>
+            50度
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.F">
+            <summary>
+            55度
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.G">
+            <summary>
+            40度
+            </summary>
+        </member>
+        <member name="T:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS">
+            <summary>
+            燒機軟體
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.N">
+            <summary>
+            NA
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.A">
+            <summary>
+            Memtest86
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.B">
+            <summary>
+            Burnin test
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.D">
+            <summary>
+            Memtest86+Burnin test
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.E">
+            <summary>
+            Power onoff+Burnin test
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.F">
+            <summary>
+            Android APP
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.G">
+            <summary>
+            QA Plus
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.H">
+            <summary>
+            Stress test
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipSopType">
             <summary>
             SOP Type
@@ -16587,6 +16929,11 @@
             燒機記錄資料表
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.AMESContext.SampleSipmentSNs">
+            <summary>
+            樣本序號取得記錄資料表
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Program">
             <summary>
             
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/appsettings.json b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/appsettings.json
index 7694543c..51b4cf49 100644
--- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/appsettings.json
+++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/appsettings.json
@@ -10,5 +10,7 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  // �w��w�� �u��򥻸�ƲΤ@���}�u�{��T
+  "WipSpecial": "Y"
 }
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/SampleSipmentSNsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/SampleSipmentSNsController.cs
new file mode 100644
index 00000000..bbd62e01
--- /dev/null
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/SampleSipmentSNsController.cs
@@ -0,0 +1,169 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.CommonTools.Result;
+using AMESCoreStudio.WebApi.DTO.AMES;
+
+namespace AMESCoreStudio.WebApi.Controllers.AMES
+{
+    /// <summary>
+    /// 樣本序號取得紀錄基本資料檔Controller
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    public class SampleSipmentSNsController : ControllerBase
+    {
+        private readonly AMESContext _context;
+
+        /// <summary>
+        /// 建構式
+        /// </summary>
+        /// <param name="context"></param>
+        public SampleSipmentSNsController(AMESContext context)
+        {
+            _context = context;
+        }
+
+        /// <summary>
+        /// 查詢樣本序號取得紀錄資料檔
+        /// </summary>
+        /// <returns></returns>
+        // GET: api/<SampleSipmentSNController>
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<SampleSipmentSN>>> GetSampleSipmentSNs()
+        {
+            IQueryable<SampleSipmentSN> q = _context.SampleSipmentSNs;
+            q = q.OrderBy(p => p.CreateDate);
+            var SampleSipmentSN = await q.ToListAsync();
+            return SampleSipmentSN;
+        }
+
+        /// <summary>
+        /// 樣本序號取得紀錄基本資料檔 to SampleWipNo
+        /// </summary>
+        /// <param name="id">SampleSipmentSNID</param>
+        /// <returns></returns>
+        [HttpGet("{id}")]
+        public async Task<ActionResult<IEnumerable<SampleSipmentSN>>> GetSampleSipmentSN(string id)
+        {
+            IQueryable<SampleSipmentSN> q = _context.SampleSipmentSNs;
+
+            var SampleSipmentSN = await q.Where(p => p.SampleWipNo == id).ToListAsync();
+            return SampleSipmentSN;
+        }
+
+        /// <summary>
+        /// 取得樣本序號取得紀錄ByQurey
+        /// </summary>
+        /// <param name="itemNo">料號</param>
+        /// <param name="wipNo">工單</param>
+        /// <param name="userName">開單人員</param>
+        /// <param name="Sdate">開單日期</param>
+        /// <param name="Edate">開單日期</param>
+        /// <returns></returns>
+        [HttpGet("ByQurey/{itemNo}/{wipNo}/{userName}/{Sdate}/{Edate}")]
+        public async Task<ActionResult<IEnumerable<SampleSipmentSN>>> GetSampleSipmentSNByQurey(string itemNo, string wipNo, string userName, string Sdate, string Edate)
+        {
+            IQueryable<SampleSipmentSN> q = _context.SampleSipmentSNs;
+            ResultModel<string> result = new ResultModel<string>();
+            if(!string.IsNullOrEmpty(itemNo) && itemNo!="*")
+                q =  q.Where(p => p.ItemNo == itemNo);
+            if (!string.IsNullOrEmpty(wipNo) && wipNo != "*")
+                q =  q.Where(p => p.SampleWipNo == wipNo);
+            if (!string.IsNullOrEmpty(userName) && userName != "*")
+                q =  q.Where(p => p.CreateName == userName);
+
+
+            DateTime dateValue;
+            if (!string.IsNullOrEmpty(Sdate) && Sdate != "*")
+            {
+
+                if (DateTime.TryParse(Sdate, out dateValue))
+                {
+                    q = q.Where(p => p.CreateDate >= DateTime.Parse(Sdate));
+                }
+            }
+            if (!string.IsNullOrEmpty(Edate) && Edate != "*")
+            {
+                if (DateTime.TryParse(Edate, out dateValue))
+                {
+                    q = q.Where(p => p.CreateDate <= DateTime.Parse(Edate));
+                }
+
+            }
+
+
+            var SampleSipmentSN = await q.ToListAsync();
+
+            return SampleSipmentSN;
+
+
+        }
+
+        /// <summary>
+        /// 新增樣本序號取得紀錄資料檔
+        /// </summary>
+        /// <param name="SampleSipmentSN"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<ResultModel<SampleSipmentSN>> PostSampleSipmentSN([FromBody] SampleSipmentSN SampleSipmentSN)        
+        {
+            ResultModel<SampleSipmentSN> result = new ResultModel<SampleSipmentSN>();
+            Helper helper = new Helper(_context);
+            //SampleSipmentSN.SampleSipmentSNID = helper.GetIDKey("SampleSipmentSN_ID").Result;
+            _context.SampleSipmentSNs.Add(SampleSipmentSN);
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
+        }
+
+
+        /// <summary>
+        /// 修改料號基本資料檔
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut("{id}")]
+        public async Task<ResultModel<SampleSipmentSN>> PutSampleSipmentSN(int id,[FromBody] SampleSipmentSN SampleSipmentSN)
+        {
+            ResultModel<SampleSipmentSN> result = new ResultModel<SampleSipmentSN>();
+            //_context.Attach(SampleSipmentSN);
+            // 指定更新某個欄位
+            //_context.Entry(SampleSipmentSN).Property(p => p.SampleSipmentSNID).IsModified = true;
+            _context.Entry(SampleSipmentSN).State = EntityState.Modified;
+
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
+        }
+
+
+        // DELETE api/<SampleSipmentSNController>/5
+        [HttpDelete("{id}")]
+        public void DeleteSampleSipmentSN(int id)
+        {
+        }
+    }
+}
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs
index 64f00343..60ef60ef 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs
@@ -12,7 +12,7 @@ using AMESCoreStudio.WebApi.DTO.AMES;
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
     /// <summary>
-    /// 料號基本資料檔Controller
+    /// 出貨序號編碼規則基本資料檔Controller
     /// </summary>
     [Route("api/[controller]")]
     [ApiController]
@@ -30,7 +30,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         }
 
         /// <summary>
-        /// 查詢料號基本資料檔
+        /// 查詢出貨序號編碼規則資料檔
         /// </summary>
         /// <returns></returns>
         // GET: api/<SerialRuleController>
@@ -43,20 +43,41 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return SerialRule;
         }
 
-
         /// <summary>
-        /// 料號基本資料檔 to ItemID
+        /// 出貨序號編碼規則基本資料檔 to SerialRuleID
         /// </summary>
-        /// <param name="id">ItemID</param>
+        /// <param name="id">SerialRuleID</param>
         /// <returns></returns>
         [HttpGet("{id}")]
-        public async Task<ResultModel<SerialRule>> GetSerialRule(int id)
+        public async Task<ActionResult<IEnumerable<SerialRule>>> GetSerialRule(int id)
         {
             IQueryable<SerialRule> q = _context.SerialRules;
 
-            ResultModel<SerialRule> result = new ResultModel<SerialRule>();
-            result.Data = await q.Where(p => p.SerialRuleID == id).ToListAsync();
-            return result;
+            var SerialRule = await q.Where(p => p.SerialRuleID == id).ToListAsync();
+            return SerialRule;
+        }
+
+        /// <summary>
+        /// 料號基本資料檔 to ItemNo
+        /// </summary>
+        /// <param name="ItemNo">ItemNo</param>
+        /// <returns></returns>
+        [HttpGet("ItemNo/{id}")]
+        public async Task<ActionResult<IEnumerable<SerialRule>>> GetSerialRuleByItemNo(string id)
+        {
+            IQueryable<SerialRule> q = _context.SerialRules;
+
+            q = q.Where(p => p.ItemNo == id);
+
+            var SerialRule = await q.ToListAsync();
+
+            if (SerialRule == null)
+            {
+                return NotFound();
+            }
+
+            return SerialRule;
+
         }
 
         /// <summary>
@@ -637,9 +658,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// 修改料號基本資料檔
         /// </summary>
         /// <returns></returns>
-        [HttpPut]
-
-        public async Task<ResultModel<SerialRule>> PutSerialRule([FromBody] SerialRule SerialRule)
+        [HttpPut("{id}")]
+        public async Task<ResultModel<SerialRule>> PutSerialRule(int id,[FromBody] SerialRule SerialRule)
         {
             ResultModel<SerialRule> result = new ResultModel<SerialRule>();
             //_context.Attach(SerialRule);
diff --git a/AMESCoreStudio.WebApi/Models/AMES/SampleSipmentSN.cs b/AMESCoreStudio.WebApi/Models/AMES/SampleSipmentSN.cs
new file mode 100644
index 00000000..a230badb
--- /dev/null
+++ b/AMESCoreStudio.WebApi/Models/AMES/SampleSipmentSN.cs
@@ -0,0 +1,167 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
+using System.Runtime.Serialization;
+#nullable disable
+
+namespace AMESCoreStudio.WebApi.Models.AMES
+{
+    /// <summary>
+    /// 樣本序號取得紀錄資料檔
+    /// </summary>
+    //[Keyless]
+    [Table("SAMPLE_SHIPMENT_SN", Schema = "JHAMES")]
+    //[Index(nameof(CreateDate), Name = "SAMPLE_SHIPMENT_SN_PK", IsUnique = true)]
+
+    public partial class SampleSipmentSN
+    {
+        /// <summary>
+        /// 工單
+        /// </summary>
+        [Required]
+        [Column("SAMPLE_WIP_NO")]
+        [StringLength(30)]
+        [Display(Name = "工單")]
+        [DataMember]
+        public string SampleWipNo { get; set; }
+
+        /// <summary>
+        /// 料號
+        /// </summary>
+        [Required]
+        [Column("ITEM_NO")]
+        [StringLength(20)]
+        [DataMember]
+        [Display(Name = "料號")]
+        public string ItemNo { get; set; }
+
+        /// <summary>
+        /// 年
+        /// </summary>
+        [Required]
+        [Column("QTY")]
+        [DataMember]
+        [Display(Name = "數量")]
+        public int Qty { get; set; }
+
+        /// <summary>
+        /// 開工日期
+        /// </summary>
+        [Required]
+        [Column("START_DATE")]
+        [DataMember]
+        [Display(Name = "開工日期")]
+        public DateTime StartDate { get; set; }
+
+        /// <summary>
+        /// 完工日期
+        /// </summary>
+        [Required]
+        [Column("COMPLETED_DATE")]
+        [DataMember]
+        [Display(Name = "完工日期")]
+        public DateTime CompletedDate { get; set; }
+
+
+        /// <summary>
+        /// PowerCord
+        /// </summary>
+        [Column("POWER_CORD")]
+        [DataMember]
+        [Display(Name = "Power Cord")]
+        [StringLength(20)]
+        public string PowerCord { get; set; }
+
+        /// <summary>
+        /// ECN
+        /// </summary>
+        [Column("ECN")]
+        [DataMember]
+        [Display(Name = "ECN")]
+        [StringLength(20)]
+        public string ECN { get; set; }
+
+        /// <summary>
+        /// BIOS
+        /// </summary>
+        [Column("BIOS")]
+        [DataMember]
+        [Display(Name = "BIOS")]
+        [StringLength(20)]
+        public string BIOS { get; set; }
+
+        /// <summary>
+        /// EAN
+        /// </summary>
+        [Column("EAN")]
+        [DataMember]
+        [Display(Name = "EAN")]
+        [StringLength(20)]
+        public string EAN { get; set; }
+
+        /// <summary>
+        /// 內部序號
+        /// </summary>
+        [Column("BARCODE_NO")]
+        [StringLength(30)]
+        [DataMember]
+        [Display(Name = "內部序號")]
+        public string BarcodeNo { get; set; }
+
+        /// <summary>
+        /// 起始序號
+        /// </summary>
+        [Required]
+        [Column("START_NO")]
+        [StringLength(30)]
+        [DataMember]
+        [Display(Name = "起始序號")]
+        public string StartNo { get; set; }
+
+        /// <summary>
+        /// 結束序號
+        /// </summary>
+        [Required]
+        [Column("END_NO")]
+        [StringLength(30)]
+        [DataMember]
+        [Display(Name = "結束序號")]
+        public string EndNo { get; set; }
+
+        /// <summary>
+        /// 更新UserID
+        /// </summary>
+        [Column("CREATE_NAME")]
+        [DataMember]
+        [Display(Name = "開單人員")]
+        public string CreateName { get; set; } 
+
+        /// <summary>
+        /// 建立UserID
+        /// </summary>
+        [Column("CREATE_USERID")]
+        [Required]
+        [DataMember]
+        public int CreateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 建立日期
+        /// </summary>
+        [Key]
+        [Required]
+        [Column("CREATE_DATE")]
+        [DataMember]
+        public DateTime CreateDate { get; set; } = DateTime.Now;
+
+
+        /// <summary>
+        /// 更新日期
+        /// </summary>
+        [Column("UPDATE_DATE")]
+        [DataMember]
+        public DateTime UpdateDate { get; set; } = DateTime.Now;
+
+    }
+}
diff --git a/AMESCoreStudio.WebApi/Models/AMES/SerialRule.cs b/AMESCoreStudio.WebApi/Models/AMES/SerialRule.cs
index 83914bff..f1e89ee8 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/SerialRule.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/SerialRule.cs
@@ -28,6 +28,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Required]
         [Column("ITEM_NO")]
         [StringLength(20)]
+        [Display(Name = "料號")]
         [DataMember]
         public string ItemNo { get; set; }
 
@@ -38,6 +39,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("RULE")]
         [StringLength(50)]
         [DataMember]
+        [Display(Name = "序號規則")]
         public string Rule { get; set; }
 
         /// <summary>
diff --git a/AMESCoreStudio.WebApi/Models/AMESContext.cs b/AMESCoreStudio.WebApi/Models/AMESContext.cs
index 2aa20813..67404a7e 100644
--- a/AMESCoreStudio.WebApi/Models/AMESContext.cs
+++ b/AMESCoreStudio.WebApi/Models/AMESContext.cs
@@ -764,6 +764,12 @@ namespace AMESCoreStudio.WebApi
         /// 燒機記錄資料表
         /// </summary>
         public virtual DbSet<BurnInfo> BurnInfos { get; set; }
+        
+        /// <summary>
+        /// 樣本序號取得記錄資料表
+        /// </summary>
+        public virtual DbSet<SampleSipmentSN> SampleSipmentSNs { get; set; }
+
 
         /// <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 63e183fc..b4de95e9 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 b25385bf..38499cb8 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 60cccf56..094175aa 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 84334f6f..29eb02db 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 c85f7bad..556e22eb 100644
--- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
+++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
@@ -612,6 +612,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.CycleTimesController.GetCycleTimeByItemNo(System.String)">
+            <summary>
+            工單料號查詢
+            </summary>
+            <param name="id">工單料號</param>
+            <returns></returns>
+        </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.CycleTimesController.PutCycleTime(System.String,AMESCoreStudio.WebApi.Models.AMES.CycleTime)">
             <summary>
             
@@ -3325,9 +3332,57 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController">
+            <summary>
+            樣本序號取得紀錄基本資料檔Controller
+            </summary>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController.#ctor(AMESCoreStudio.WebApi.AMESContext)">
+            <summary>
+            建構式
+            </summary>
+            <param name="context"></param>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController.GetSampleSipmentSNs">
+            <summary>
+            查詢樣本序號取得紀錄資料檔
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController.GetSampleSipmentSN(System.String)">
+            <summary>
+            樣本序號取得紀錄基本資料檔 to SampleWipNo
+            </summary>
+            <param name="id">SampleSipmentSNID</param>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController.GetSampleSipmentSNByQurey(System.String,System.String,System.String,System.String,System.String)">
+            <summary>
+            取得樣本序號取得紀錄ByQurey
+            </summary>
+            <param name="itemNo">料號</param>
+            <param name="wipNo">工單</param>
+            <param name="userName">開單人員</param>
+            <param name="Sdate">開單日期</param>
+            <param name="Edate">開單日期</param>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController.PostSampleSipmentSN(AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN)">
+            <summary>
+            新增樣本序號取得紀錄資料檔
+            </summary>
+            <param name="SampleSipmentSN"></param>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SampleSipmentSNsController.PutSampleSipmentSN(System.Int32,AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN)">
+            <summary>
+            修改料號基本資料檔
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController">
             <summary>
-            料號基本資料檔Controller
+            出貨序號編碼規則基本資料檔Controller
             </summary>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.#ctor(AMESCoreStudio.WebApi.AMESContext)">
@@ -3338,15 +3393,22 @@
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSerialRule">
             <summary>
-            查詢料號基本資料檔
+            查詢出貨序號編碼規則資料檔
             </summary>
             <returns></returns>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSerialRule(System.Int32)">
             <summary>
-            料號基本資料檔 to ItemID
+            出貨序號編碼規則基本資料檔 to SerialRuleID
             </summary>
-            <param name="id">ItemID</param>
+            <param name="id">SerialRuleID</param>
+            <returns></returns>
+        </member>
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSerialRuleByItemNo(System.String)">
+            <summary>
+            料號基本資料檔 to ItemNo
+            </summary>
+            <param name="ItemNo">ItemNo</param>
             <returns></returns>
         </member>
         <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.GetSerialRuleByQurey(System.String,System.String)">
@@ -3387,7 +3449,7 @@
             <param name="SerialRule"></param>
             <returns></returns>
         </member>
-        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.PutSerialRule(AMESCoreStudio.WebApi.Models.AMES.SerialRule)">
+        <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.SerialRulesController.PutSerialRule(System.Int32,AMESCoreStudio.WebApi.Models.AMES.SerialRule)">
             <summary>
             修改料號基本資料檔
             </summary>
@@ -10718,6 +10780,91 @@
             維修原因狀態
             </summary>
         </member>
+        <member name="T:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN">
+            <summary>
+            樣本序號取得紀錄資料檔
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.SampleWipNo">
+            <summary>
+            工單
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.ItemNo">
+            <summary>
+            料號
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.Qty">
+            <summary>
+            年
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.StartDate">
+            <summary>
+            開工日期
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.CompletedDate">
+            <summary>
+            完工日期
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.PowerCord">
+            <summary>
+            PowerCord
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.ECN">
+            <summary>
+            ECN
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.BIOS">
+            <summary>
+            BIOS
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.EAN">
+            <summary>
+            EAN
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.BarcodeNo">
+            <summary>
+            內部序號
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.StartNo">
+            <summary>
+            起始序號
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.EndNo">
+            <summary>
+            結束序號
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.CreateName">
+            <summary>
+            更新UserID
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.CreateUserID">
+            <summary>
+            建立UserID
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.CreateDate">
+            <summary>
+            建立日期
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.SampleSipmentSN.UpdateDate">
+            <summary>
+            更新日期
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Models.AMES.SerialRule">
             <summary>
             料號出貨序號規則資料檔
@@ -12443,6 +12590,11 @@
             燒機時間
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipSystem.BI_OS">
+            <summary>
+            燒機軟體
+            </summary>
+        </member>
         <member name="P:AMESCoreStudio.WebApi.Models.AMES.WipSystem.BiMemo">
             <summary>
             燒機備註
@@ -15258,6 +15410,91 @@
             作業站名稱
             </summary>
         </member>
+        <member name="T:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto">
+            <summary>
+            WipQuery Select Dto
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.wipID">
+            <summary>
+            工單ID
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.wipNo">
+            <summary>
+            工單號碼
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.planQTY">
+            <summary>
+            工單數量
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.unitNo">
+            <summary>
+            生產單位
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.unitName">
+            <summary>
+            生產單位Name
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.lineID">
+            <summary>
+            線別ID
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.lineDesc">
+            <summary>
+            線別Name
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.itemNo">
+            <summary>
+            料號
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.statusNo">
+            <summary>
+            工單狀態
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.wipScheduleDate">
+            <summary>
+            預計開工日期
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.wipDueDate">
+            <summary>
+            預計完工日期
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.factoryNameCh">
+            <summary>
+            廠商中文廠名
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.description">
+            <summary>
+            工單描述
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.CreateDate">
+            <summary>
+            工單建立日期
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.workDate">
+            <summary>
+            開工日
+            </summary>
+        </member>
+        <member name="P:AMESCoreStudio.WebApi.DTO.AMES.WipQueryDto.fqcDate">
+            <summary>
+            檢驗日
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.DTO.AMES.WipSopDto">
             <summary>
             工單製程對應SOP資料檔 DTO
@@ -15708,6 +15945,11 @@
             H/W AT
             </summary>
         </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipSystemPMType.D">
+            <summary>
+            Other
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipSystemType">
             <summary>
             工單資訊 系統工程資訊 Type
@@ -15733,6 +15975,106 @@
             備註說明
             </summary>
         </member>
+        <member name="T:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipSystemDMIBIType">
+            <summary>
+            工單資訊 系統工程資訊 DMI燒入 Type
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipSystemDMIBIType.Y">
+            <summary>
+            YES
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipSystemDMIBIType.N">
+            <summary>
+            N/A
+            </summary>
+        </member>
+        <member name="T:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer">
+            <summary>
+            燒機時間
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.N">
+            <summary>
+            NA
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.A">
+            <summary>
+            室溫
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.B">
+            <summary>
+            -40~+85度
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.D">
+            <summary>
+            -20~+70度
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.E">
+            <summary>
+            50度
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.F">
+            <summary>
+            55度
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBITemperatuer.G">
+            <summary>
+            40度
+            </summary>
+        </member>
+        <member name="T:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS">
+            <summary>
+            燒機軟體
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.N">
+            <summary>
+            NA
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.A">
+            <summary>
+            Memtest86
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.B">
+            <summary>
+            Burnin test
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.D">
+            <summary>
+            Memtest86+Burnin test
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.E">
+            <summary>
+            Power onoff+Burnin test
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.F">
+            <summary>
+            Android APP
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.G">
+            <summary>
+            QA Plus
+            </summary>
+        </member>
+        <member name="F:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipBI_OS.H">
+            <summary>
+            Stress test
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Enum.EnumPCS.EnumWipSopType">
             <summary>
             SOP Type
@@ -16587,6 +16929,11 @@
             燒機記錄資料表
             </summary>
         </member>
+        <member name="P:AMESCoreStudio.WebApi.AMESContext.SampleSipmentSNs">
+            <summary>
+            樣本序號取得記錄資料表
+            </summary>
+        </member>
         <member name="T:AMESCoreStudio.WebApi.Program">
             <summary>