1. 更新LayUi 版本

2. 新增&更新 製成模組相關程式

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.Web.ViewModels;
+using System.Linq;
 
 namespace AMESCoreStudio.Web.Controllers
 {
@@ -16,11 +17,13 @@ namespace AMESCoreStudio.Web.Controllers
         private readonly ILogger<PCSController> _logger;
         public readonly ISYS _sysApi;
         public readonly IPCS _pcsApi;
-        public PCSController(ILogger<PCSController> logger, ISYS sysApi, IPCS pcsApi)
+        public readonly IBAS _basApi;
+        public PCSController(ILogger<PCSController> logger, ISYS sysApi, IPCS pcsApi, IBAS basApi)
         {
             _logger = logger;
             _sysApi = sysApi;
             _pcsApi = pcsApi;
+            _basApi = basApi;
             //if (Request.Cookies["_AMESCookie"] != null)
             //{
             //    HttpContext.Request.Cookies.TryGetValue("UserID", out userID);
@@ -88,7 +91,7 @@ namespace AMESCoreStudio.Web.Controllers
             var FactoryUnit = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
             {
-                FactoryUnit.Add(new SelectListItem(result[i].UnitName,result[i].UnitNo.ToString()));
+                FactoryUnit.Add(new SelectListItem(result[i].UnitName, result[i].UnitNo.ToString()));
             }
             ViewBag.FactoryUnitList = FactoryUnit;
         }
@@ -139,6 +142,22 @@ namespace AMESCoreStudio.Web.Controllers
             ViewBag.WipSEQTypeList = WipSEQType;
         }
 
+        /// <summary>
+        /// 站別
+        /// </summary>
+        /// <returns></returns>
+        private async Task GetStations()
+        {
+            var result = await _basApi.GetStationses();
+
+            var Stations = new List<SelectListItem>();
+            for (int i = 0; i < result.Count; i++)
+            {
+                Stations.Add(new SelectListItem(result[i].StationName, result[i].StationID.ToString()));
+            }
+            ViewBag.GetStationsList = Stations;
+        }
+
         /// <summary>
         /// 工單狀態
         /// </summary>
@@ -425,7 +444,7 @@ namespace AMESCoreStudio.Web.Controllers
         }
 
         /// <summary>
-        /// SOP相關下班
+        /// PCS001 SOP相關下拉
         /// </summary>
         private void GetPCSOPList()
         {
@@ -458,17 +477,66 @@ namespace AMESCoreStudio.Web.Controllers
 
             ViewBag.PCSOPList = PCSOPList;
         }
-        #endregion
 
+        /// <summary>
+        /// 工單鎖定-鎖定類型
+        /// </summary>
+        private void GetLockType()
+        {
+            var LockType = new List<SelectListItem>(){
+                new SelectListItem() {
+                    Text = "WIP",
+                    Value = "WIP",
+                }
+            };
+
+            ViewBag.GetLockTypeList = LockType;
+        }
 
-        public async Task<IActionResult> PCS001U()
+        /// <summary>
+        /// 工單鎖定-鎖定原因類別
+        /// </summary>
+        private void GetLockReasonType()
         {
-            await GetProductType();
+            var LockReasonType = new List<SelectListItem>(){
-            GetWipType();
+                new SelectListItem() {
-            return View();
+                    Text = "3C認證工單",
+                    Value = "0",
+                },
+                new SelectListItem
+                {
+                    Text = "驗證工單",
+                    Value = "1",
+                },
+                new SelectListItem
+                {
+                    Text = "維修換料待分析",
+                    Value = "3",
+                }
+            };
+
+            //TempData["GetLockReasonTypeList"] = LockReasonType;
+            ViewBag.GetLockReasonTypeList = LockReasonType;
         }
+        #endregion
 
-        public async Task<IActionResult> PCS001C()
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> GetWipInfoAsync()
+        {
+            var result = await _pcsApi.GetWipInfo();
+
+            if (result.Count > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+            }
+            return Json(new Table() { count = 0, data = null });
+        }
+
+
+
+        #region PCS001 工單資料維護
+        public async Task<IActionResult> PCS001()
         {
             await GetProductType();
             await GetFactoryInfo();
@@ -495,10 +563,8 @@ namespace AMESCoreStudio.Web.Controllers
 
         //頁面提交，id=0 添加，id>0 修改
         [HttpPost]
-        public async Task<IActionResult> PCS001CSaveAsync(WipAllViewModel model)
+        public async Task<IActionResult> PCS001SaveAsync(WipAllViewModel model)
         {
-            //if (ModelState.IsValid)
-            //{
             IResultModel result;
             if (model.WipInfo.WipID == 0)
             {
@@ -511,6 +577,13 @@ namespace AMESCoreStudio.Web.Controllers
                 result = await _pcsApi.PostWipInfo(JsonConvert.SerializeObject(model.WipInfo));
                 model.WipAtt.WipNO = model.WipInfo.WipNO;
                 result = await _pcsApi.PostWipAtt(JsonConvert.SerializeObject(model.WipAtt));
+                if (!string.IsNullOrWhiteSpace(model.WipBarcode.StartNO))
+                {
+                    model.WipBarcode.WipID = model.WipInfo.WipID;
+                    model.WipBarcode.WipNO = model.WipInfo.WipNO;
+                    model.WipBarcode.UnitNO = model.WipInfo.UnitNO;
+                    result = await _pcsApi.PostWipBarcode(JsonConvert.SerializeObject(model.WipBarcode));
+                }
             }
             else
             {
@@ -536,9 +609,104 @@ namespace AMESCoreStudio.Web.Controllers
             //}
             if (model.WipInfo.WipID == 0)
             {
-                return View("PCS001C", model);
+                return View("PCS001", model);
             }
-            return View("PCS001C", model);
+            return View("PCS001", model);
         }
+
+        #endregion
+
+        #region PCS004 工單條碼區間設定
+        public async Task<IActionResult> PCS004()
+        {
+            await GetFactoryUnit();
+            return View();
+        }
+
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> GetPCS004Async(string roleID)
+        {
+            var result = await _pcsApi.GetWipInfoByUnitNO(roleID);
+
+            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
+
+        #region PCS005 工單資料查詢
+        public IActionResult PCS005()
+        {
+            return View();
+        }
+        #endregion
+
+        #region PCS010 工單對應站別鎖定
+        public async Task<IActionResult> PCS010()
+        {
+            await GetStations();
+            GetLockReasonType();
+            GetLockType();
+            //var result = new WipAllViewModel();
+            //return View(result);
+            return View();
+        }
+
+        //頁面提交，id=0 添加，id>0 修改
+        [HttpPost]
+        public async Task<IActionResult> PCS010SaveAsync(WipLock model)
+        {
+            await GetStations();
+            GetLockReasonType();
+            GetLockType();
+
+            var Check = await _pcsApi.GetWipLockByWipNO(model.WipNO);
+
+            if (Check.Where(w => w.LockStatus == "0").Count() != 0)
+            {
+                ModelState.AddModelError("error", "目前此工單號碼尚未解鎖定");
+                return View("PCS010", model);
+            }
+
+            if (ModelState.IsValid)
+            {
+                IResultModel result;
+                if (model.WipLockID == 0)
+                {
+                    result = await _pcsApi.PostWipLock(JsonConvert.SerializeObject(model));
+                }
+                else
+                {
+                    result = await _pcsApi.PostWipLock(JsonConvert.SerializeObject(model));
+                }
+
+                if (!result.Success)
+                {
+                    var _msg = model.WipLockID == 0 ? "添加成功！" : "修改成功！";
+                    return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                }
+                else
+                {
+                    if (result.Errors.Count > 0)
+                    {
+                        ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
+                    }
+                    else
+                    {
+                        ModelState.AddModelError("error", result.Msg);
+                    }
+                }
+            }
+            //if (model.WipInfo.WipID == 0)
+            //{
+            //    return View("PCS001C", model);
+            //}
+            return View("PCS010", model);
+        }
+        #endregion
     }
 }

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -57,17 +57,59 @@ namespace AMESCoreStudio.Web
         #endregion
 
         /// <summary>
-        /// 新增系統
+        /// 新增工單基本資料
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpPost("api/WipInfos")]
         ITask<ResultModel<WipInfo>> PostWipInfo([FromBody, RawJsonContent] string model);
 
+        /// <summary>
+        /// 查詢工單基本資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/WipInfos")]
+        ITask<List<WipInfo>> GetWipInfo();
+
+        /// <summary>
+        /// 根据角色ID獲取角色模组資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/WipInfos/{id}")]
+        ITask<List<WipInfo>> GetWipInfoByUnitNO(string id);
+
         /// <summary>
         /// 新增系統
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpPost("api/WipAtts")]
         ITask<ResultModel<WipAtt>> PostWipAtt([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 新增工單條碼起迄資料檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/WipBarcode")]
+        ITask<ResultModel<WipBarcode>> PostWipBarcode([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 新增工單鎖定資料檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/WipLock")]
+        ITask<ResultModel<WipLock>> PostWipLock([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 工單鎖定資料檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/WipLock")]
+        ITask<List<WipLock>> GetWipLock();
+
+        /// <summary>
+        /// 工單號碼 by 工單鎖定資料檔
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/WipLock/{id}")]
+        ITask<List<WipLock>> GetWipLockByWipNO(string WipNO);
     }
 }

AMESCoreStudio.Web/ViewModels/WipAllViewModel.cs

@@ -12,5 +12,7 @@ namespace AMESCoreStudio.Web.ViewModels
         public WipInfo WipInfo { get; set; }
         public WipAtt WipAtt { get; set; }
 
+        public WipBarcode WipBarcode { get; set; }
+
     }
 }

AMESCoreStudio.Web/Views/Home/Framework.cshtml

@@ -184,12 +184,18 @@
                             <i class="fa fa-folder-o fa-fw"></i><cite>製程控管模組</cite><i class="fa fa-angle-up fa-fw nav_right"></i>
                         </a>
                         <ul class="sub-menu">
-                            <li class="sub-tab" hg-title="工單資料維護" hg-nav="/PCS/PCS001C">
+                            <li class="sub-tab" hg-title="工單資料維護" hg-nav="/PCS/PCS001">
                                 <a><i class="fa fa-comment-o fa-fw"></i><cite>工單資料維護</cite></a>
                             </li>
+                            <li class="sub-tab" hg-title="工單資料查詢" hg-nav="/PCS/PCS005">
+                                <a><i class="fa fa-comment-o fa-fw"></i><cite>工單資料查詢</cite></a>
+                            </li>
                             <li class="sub-tab" hg-title="工單條碼區間設定" hg-nav="/PCS/PCS004">
                                 <a><i class="fa fa-comment-o fa-fw"></i><cite>工單條碼區間設定</cite></a>
                             </li>
+                            <li class="sub-tab" hg-title="工單對應站別鎖定" hg-nav="/PCS/PCS010">
+                                <a><i class="fa fa-comment-o fa-fw"></i><cite>工單對應站別鎖定</cite></a>
+                            </li>
                         </ul>
                     </li>
                 </ul>

AMESCoreStudio.Web/Views/PCS/PCS001C.cshtml → AMESCoreStudio.Web/Views/PCS/PCS001.cshtml

@@ -8,11 +8,15 @@
     .control-label {
         justify-content: flex-end !important;
     }
+
+    .text-error {
+        color: #dc3545 !important;
+    }
 </style>
 
 <div class="layui-card">
     <div class="col-sm-12">
-        <form enctype="multipart/form-data" method="post" asp-action="PCS001CSave" class="layui-form">
+        <form enctype="multipart/form-data" method="post" asp-action="PCS001Save" class="layui-form">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <div class="layui-form-item">
                 <input asp-for="WipInfo.InputFlag" type="checkbox" title="判斷前製程是否已經投入" />
@@ -23,7 +27,7 @@
                     <label asp-for="WipInfo.WipNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入工單號碼" />
-                        <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                        <span asp-validation-for="WipInfo.WipNO" class="layui-bg-red"></span>
                     </div>
                     <label asp-for="WipInfo.WipSEQ" class="layui-form-label"></label>
                     <div class="layui-input-inline">
@@ -31,13 +35,13 @@
                     </div>
                     <label asp-for="WipAtt.ItemNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入料號" />
+                        <input asp-for="WipAtt.ItemNO" class="layui-input" autocomplete="off" placeholder="請輸入料號" />
-                        <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                        <span asp-validation-for="WipAtt.ItemNO" class="layui-bg-red"></span>
                     </div>
                     <label asp-for="WipInfo.PlanQTY" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="WipInfo.PlanQTY" class="layui-input" placeholder="請輸入計劃數量" />
+                        <input asp-for="WipInfo.PlanQTY" class="layui-input" autocomplete="off" placeholder="請輸入計劃數量" />
-                        <span asp-validation-for="WipInfo.PlanQTY" class="text-danger"></span>
+                        <span asp-validation-for="WipInfo.PlanQTY" class="layui-bg-red"></span>
                     </div>
                 </div>
             </div>
@@ -58,8 +62,8 @@
                     </div>
                     <label asp-for="WipInfo.WerksNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="WipInfo.WerksNO" class="layui-input" placeholder="請輸入委外廠編號" />
+                        <input asp-for="WipInfo.WerksNO" class="layui-input" autocomplete="off" placeholder="請輸入委外廠編號" />
-                        <span asp-validation-for="WipInfo.WerksNO" class="text-danger"></span>
+                        <span asp-validation-for="WipInfo.WerksNO" class="layui-bg-red"></span>
                     </div>
 
                 </div>
@@ -73,12 +77,12 @@
                     </div>
                     <label asp-for="WipInfo.CustomerNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="WipInfo.CustomerNO" class="layui-input" placeholder="請輸入客戶名稱" />
+                        <input asp-for="WipInfo.CustomerNO" class="layui-input" autocomplete="off" placeholder="請輸入客戶名稱" />
-                        <span asp-validation-for="WipInfo.CustomerNO" class="text-danger"></span>
+                        <span asp-validation-for="WipInfo.CustomerNO" class="layui-bg-red"></span>
                     </div>
                     <label asp-for="WipInfo.CustomerItemNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="WipInfo.CustomerItemNO" class="layui-input" placeholder="請輸入客戶料號" />
+                        <input asp-for="WipInfo.CustomerItemNO" class="layui-input" autocomplete="off" placeholder="請輸入客戶料號" />
                     </div>
                 </div>
             </div>
@@ -96,7 +100,7 @@
                     <label asp-for="WipInfo.RelatedWONO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <input asp-for="WipInfo.RelatedWONO" class="layui-input" placeholder="請輸入關聯工單/客戶工單" />
-                        <span asp-validation-for="WipInfo.RelatedWONO" class="text-danger"></span>
+                        <span asp-validation-for="WipInfo.RelatedWONO" class="layui-bg-red"></span>
                     </div>
 
                 </div>
@@ -158,12 +162,12 @@
                                 <label asp-for="WipAtt.Boards" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
                                     <input asp-for="WipAtt.Boards" class="layui-input" placeholder="請輸入聯板數" />
-                                    <span asp-validation-for="WipAtt.Boards" class="text-danger offset-sm-3 my-sm-1"></span>
+                                    <span asp-validation-for="WipAtt.Boards" class="layui-bg-red"></span>
                                 </div>
                                 <label asp-for="WipInfo.BoxCNT" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
                                     <input asp-for="WipInfo.BoxCNT" class="layui-input" placeholder="請輸入包裝單箱數量" />
-                                    <span asp-validation-for="WipInfo.BoxCNT" class="text-danger"></span>
+                                    <span asp-validation-for="WipInfo.BoxCNT" class="layui-bg-red"></span>
                                 </div>
                             </div>
                         </div>
@@ -193,13 +197,13 @@
                             <div class="layui-inline">
                                 <label asp-for="WipInfo.WipScheduleDate" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipScheduleDate" class="layui-input" />
+                                    <input asp-for="WipInfo.WipScheduleDate" class="layui-input" placeholder="請輸入預計開工日" />
-                                    <span asp-validation-for="WipInfo.WipScheduleDate" class="text-danger"></span>
+                                    <span asp-validation-for="WipInfo.WipScheduleDate" class="layui-bg-red"></span>
                                 </div>
                                 <label asp-for="WipInfo.WipDueDate" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipDueDate" class="layui-input" />
+                                    <input asp-for="WipInfo.WipDueDate" class="layui-input" placeholder="請輸入預計完工日" />
-                                    <span asp-validation-for="WipInfo.WipDueDate" class="text-danger"></span>
+                                    <span asp-validation-for="WipInfo.WipDueDate" class="layui-bg-red"></span>
                                 </div>
                             </div>
                         </div>
@@ -213,7 +217,7 @@
                                 <label asp-for="WipInfo.FlowRuleID" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
                                     <input asp-for="WipInfo.FlowRuleID" class="layui-input" placeholder="請輸入流程ID" />
-                                    <span asp-validation-for="WipInfo.FlowRuleID" class="text-danger"></span>
+                                    <span asp-validation-for="WipInfo.FlowRuleID" class="layui-bg-red"></span>
                                 </div>
                             </div>
                         </div>
@@ -221,20 +225,35 @@
 
                     @* 序號編碼sheet *@
                     <div class="layui-tab-item">
+                        <div class="layui-form-item">
+                            <div class="layui-inline">
+                                <label class="layui-form-label">條碼</label>
+                                <div class="layui-input-inline">
+                                    <input asp-for="WipBarcode.StartNO" class="layui-input" />
+                                </div>
+                                <div class="layui-form-mid">-</div>
+                                <div class="layui-input-inline">
+                                    <input asp-for="WipBarcode.EndNO" class="layui-input" />
+                                </div>
+                                <div class="layui-input-inline">
+                                    <input id="GetBarCode" class="layui-btn layui-btn-primary layui-border-blue layui-btn-sm" type="button" value="產生條碼" />
+                                </div>
+                            </div>
+                        </div>
+
                         <div class="layui-form-item">
                             <div class="layui-inline">
                                 <label class="layui-form-label">工單序號</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" placeholder="請輸入工單序號" />
+                                    <input class="layui-input" placeholder="請輸入工單序號" />
                                 </div>
                                 <label class="layui-form-label">出貨序號</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" placeholder="請輸入出貨序號" />
+                                    <input class="layui-input" placeholder="請輸入出貨序號" />
                                 </div>
                             </div>
                         </div>
                     </div>
-
                     @* Keypart組合sheet *@
                     <div class="layui-tab-item">
                     </div>
@@ -243,26 +262,26 @@
                     <div class="layui-tab-item">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.ProductTypeID" class="layui-form-label">工程負責人員</label>
+                                <label class="layui-form-label">工程負責人員</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入工號" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入工號" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
 
-                                <label asp-for="WipInfo.WipSEQ" class="layui-form-label">姓名</label>
+                                <label class="layui-form-label">姓名</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="" />
+                                    <input class="layui-input" autocomplete="off" placeholder="" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.WipType" class="layui-form-label">Power Mode</label>
+                                <label class="layui-form-label">Power Mode</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="" />
+                                    <input class="layui-input" autocomplete="off" placeholder="" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
@@ -271,13 +290,13 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">PLM參考</label>
                             <div class="layui-input-block">
-                                <input asp-for="WipInfo.WipNO" class="layui-input" />
+                                <input class="layui-input" />
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">SMD點膠</label>
+                                <label class="layui-form-label">SMD點膠</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.GetSMDTypeList" class=""></select>
                                 </div>
@@ -286,7 +305,7 @@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">DIP</label>
+                                <label class="layui-form-label">DIP</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.GetDIPTypeList" class=""></select>
                                 </div>
@@ -295,7 +314,7 @@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">燒錄</label>
+                                <label class="layui-form-label">燒錄</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.GetBurnTypeList" class=""></select>
                                 </div>
@@ -304,7 +323,7 @@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">零件烘烤</label>
+                                <label class="layui-form-label">零件烘烤</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.GetPartsBakeTypeList" class=""></select>
                                 </div>
@@ -313,7 +332,7 @@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">PCB烘烤</label>
+                                <label class="layui-form-label">PCB烘烤</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.GetPCBBakeTypeList" class=""></select>
                                 </div>
@@ -322,7 +341,7 @@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">PCB加工</label>
+                                <label class="layui-form-label">PCB加工</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.GetPCBWorkingTypeList" class=""></select>
                                 </div>
@@ -331,7 +350,7 @@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">錫膏</label>
+                                <label class="layui-form-label">錫膏</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.GetSolderPasteList" class=""></select>
                                 </div>
@@ -340,90 +359,90 @@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipAtt.ItemNO" class="layui-form-label">B/I</label>
+                                <label class="layui-form-label">B/I</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請B/I" />
+                                    <input class="layui-input" placeholder="請B/I" />
-                                    <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                                    <span class="text-danger"></span>
                                 </div>
-                                <label asp-for="WipInfo.BoxCNT" class="layui-form-label">溫度</label>
+                                <label class="layui-form-label">溫度</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.BoxCNT" class="layui-input" placeholder="%" />
+                                    <input class="layui-input" placeholder="%" />
-                                    <span asp-validation-for="WipInfo.BoxCNT" class="text-danger"></span>
+                                    <span class="text-danger"></span>
                                 </div>
-                                <label asp-for="WipInfo.BoxCNT" class="layui-form-label">時間</label>
+                                <label class="layui-form-label">時間</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.BoxCNT" class="layui-input" />
+                                    <input class="layui-input" />
-                                    <span asp-validation-for="WipInfo.BoxCNT" class="text-danger"></span>
+                                    <span class="text-danger"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipAtt.ItemNO" class="layui-form-label">BIOS</label>
+                                <label class="layui-form-label">BIOS</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入BIOS" />
+                                    <input class="layui-input" placeholder="請輸入BIOS" />
-                                    <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                                    <span class="text-danger"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipAtt.ItemNO" class="layui-form-label">Checksum</label>
+                                <label class="layui-form-label">Checksum</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入Checksum" />
+                                    <input class="layui-input" placeholder="請輸入Checksum" />
-                                    <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                                    <span class="text-danger"></span>
                                 </div>
                             </div>
                         </div>
 
                         @*<div class="layui-form-item">
-                            <div class="layui-inline">
+                                <div class="layui-inline">
-                                <label asp-for="WipAtt.ItemNO" class="layui-form-label">OS</label>
+                                    <label asp-for="WipAtt.ItemNO" class="layui-form-label">OS</label>
-                                <div class="layui-input-inline">
+                                    <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入OS" />
+                                        <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入OS" />
-                                    <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                                        <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
 
-                        <div class="layui-form-item">
+                            <div class="layui-form-item">
-                            <div class="layui-inline">
+                                <div class="layui-inline">
-                                <label asp-for="WipAtt.ItemNO" class="layui-form-label">CPU</label>
+                                    <label asp-for="WipAtt.ItemNO" class="layui-form-label">CPU</label>
-                                <div class="layui-input-inline">
+                                    <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入CPU" />
+                                        <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入CPU" />
-                                    <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                                        <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
 
-                        <div class="layui-form-item">
+                            <div class="layui-form-item">
-                            <div class="layui-inline">
+                                <div class="layui-inline">
-                                <label asp-for="WipAtt.ItemNO" class="layui-form-label">RAM</label>
+                                    <label asp-for="WipAtt.ItemNO" class="layui-form-label">RAM</label>
-                                <div class="layui-input-inline">
+                                    <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入RAM" />
+                                        <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入RAM" />
-                                    <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                                        <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                                    </div>
                                 </div>
-                            </div>
+                            </div>*@
-                        </div>*@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipAtt.ItemNO" class="layui-form-label">ME FW</label>
+                                <label class="layui-form-label">ME FW</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入ME FW" />
+                                    <input class="layui-input" placeholder="請輸入ME FW" />
-                                    <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                                    <span class="text-danger"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipAtt.ItemNO" class="layui-form-label">LAN ID</label>
+                                <label class="layui-form-label">LAN ID</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請輸入LAN ID" />
+                                    <input class="layui-input" placeholder="請輸入LAN ID" />
-                                    <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                                    <span class="text-danger"></span>
                                 </div>
                             </div>
                         </div>
@@ -431,7 +450,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">備註</label>
                             <div class="layui-input-block">
-                                <input asp-for="WipInfo.WipNO" class="layui-input" placeholder="請輸入備註" />
+                                <input class="layui-input" placeholder="請輸入備註" />
                             </div>
                         </div>
                     </div>
@@ -440,26 +459,26 @@
                     <div class="layui-tab-item">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.ProductTypeID" class="layui-form-label">工程負責人員</label>
+                                <label class="layui-form-label">工程負責人員</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入工號" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入工號" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
 
-                                <label asp-for="WipInfo.WipSEQ" class="layui-form-label">姓名</label>
+                                <label class="layui-form-label">姓名</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="" />
+                                    <input class="layui-input" autocomplete="off" placeholder="" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.WipType" class="layui-form-label">Power Mode</label>
+                                <label class="layui-form-label">Power Mode</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="" />
+                                    <input class="layui-input" autocomplete="off" placeholder="" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
@@ -467,181 +486,181 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">PLM參考</label>
                             <div class="layui-input-block">
-                                <input asp-for="WipInfo.WipNO" class="layui-input" placeholder="請輸入工單號碼" />
+                                <input class="layui-input" placeholder="請輸入工單號碼" />
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">BIOS</label>
+                                <label class="layui-form-label">BIOS</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.PCSList1" class=""></select>
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入BIOS" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入BIOS" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入BIOS" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入BIOS" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.WipType" class="layui-form-label">Checksum</label>
+                                <label class="layui-form-label">Checksum</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="Checksum" />
+                                    <input class="layui-input" autocomplete="off" placeholder="Checksum" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">EC</label>
+                                <label class="layui-form-label">EC</label>
                                 <div class="layui-input-inline">
-                                    <select asp-items="@ViewBag.PCSList1" class=""></select>
+                                    <select class=""></select>
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入EC" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入EC" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入EC" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入EC" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">FW</label>
+                                <label class="layui-form-label">FW</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.PCSList1" class=""></select>
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入FW" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入FW" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入FW" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入FW" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">FW1</label>
+                                <label class="layui-form-label">FW1</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.PCSList1" class=""></select>
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入FW1" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入FW1" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入FW1" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入FW1" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">FW2</label>
+                                <label class="layui-form-label">FW2</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.PCSList1" class=""></select>
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入FW2" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入FW2" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入FW2" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入FW2" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">OS</label>
+                                <label class="layui-form-label">OS</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.PCSList1" class=""></select>
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入OS" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入OS" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
 
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入OS" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入OS" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.WipType" class="layui-form-label">CPU</label>
+                                <label class="layui-form-label">CPU</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="CPU" />
+                                    <input class="layui-input" autocomplete="off" placeholder="CPU" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.WipType" class="layui-form-label">RAM</label>
+                                <label class="layui-form-label">RAM</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="RAM" />
+                                    <input class="layui-input" autocomplete="off" placeholder="RAM" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
-                            <input asp-for="WipInfo.InputFlag" type="checkbox" title="SFIS途程確認" />
+                            <input type="checkbox" title="SFIS途程確認" />
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipAtt.ItemNO" class="layui-form-label">B/I</label>
+                                <label class="layui-form-label">B/I</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipAtt.ItemNO" class="layui-input" placeholder="請B/I" />
+                                    <input class="layui-input" placeholder="請B/I" />
-                                    <span asp-validation-for="WipAtt.ItemNO" class="text-danger"></span>
+                                    <span class="text-danger"></span>
                                 </div>
-                                <label asp-for="WipInfo.BoxCNT" class="layui-form-label">溫度</label>
+                                <label class="layui-form-label">溫度</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.BoxCNT" class="layui-input" placeholder="%" />
+                                    <input class="layui-input" placeholder="%" />
-                                    <span asp-validation-for="WipInfo.BoxCNT" class="text-danger"></span>
+                                    <span class="text-danger"></span>
                                 </div>
                                 <label asp-for="WipInfo.BoxCNT" class="layui-form-label">時間</label>
                                 <div class="layui-input-inline">
                                     <input asp-for="WipInfo.BoxCNT" class="layui-input" />
-                                    <span asp-validation-for="WipInfo.BoxCNT" class="text-danger"></span>
+                                    <span class="text-danger"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">DMI燒入</label>
+                                <label class="layui-form-label">DMI燒入</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.GetDIPTypeList" class=""></select>
                                 </div>
@@ -650,91 +669,91 @@
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">生產SOP</label>
+                                <label class="layui-form-label">生產SOP</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.PCSOPList" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入生產SOP" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入生產SOP" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">單板包裝SOP</label>
+                                <label class="layui-form-label">單板包裝SOP</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.PCSOPList" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入單板包裝SOP" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入單板包裝SOP" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">組裝SOP</label>
+                                <label class="layui-form-label">組裝SOP</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.PCSOPList" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入組裝SOP" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入組裝SOP" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">測試SOP</label>
+                                <label class="layui-form-label">測試SOP</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.PCSOPList" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入測試SOP" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入測試SOP" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">系統包裝SOP</label>
+                                <label class="layui-form-label">系統包裝SOP</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.PCSOPList" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入系統包裝SOP" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入系統包裝SOP" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">其他參考SOP</label>
+                                <label class="layui-form-label">其他參考SOP</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.PCSOPList" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入其他參考SOP" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入其他參考SOP" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="WipInfo.PlanQTY" class="layui-form-label">Jumper設定說明</label>
+                                <label class="layui-form-label">Jumper設定說明</label>
                                 <div class="layui-input-inline">
                                     <select asp-items="@ViewBag.PCSOPList" class=""></select>
                                 </div>
                                 <div class="layui-input-inline">
-                                    <input asp-for="WipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入Jumper設定說明" />
+                                    <input class="layui-input" autocomplete="off" placeholder="請輸入Jumper設定說明" />
-                                    <span asp-validation-for="WipInfo.WipNO" style="color: #dc3545 !important;"></span>
+                                    <span style="color: #dc3545 !important;"></span>
                                 </div>
                             </div>
                         </div>
@@ -742,7 +761,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">備註</label>
                             <div class="layui-input-block">
-                                <input asp-for="WipInfo.WipNO" class="layui-input" placeholder="請輸入備註" />
+                                <input class="layui-input" placeholder="請輸入備註" />
                             </div>
                         </div>
                     </div>
@@ -769,14 +788,35 @@
     <script type="text/javascript">
         layui.use(['form'], function () {
             form = layui.form;
+        });
 
         $(document).ready(function () {
             var error = '@Html.ValidationMessage("error")';
             if ($(error).text() != '') {
                 parent.hg.msg(error);
             }
-        });
 
+            $('#GetBarCode').click(function () {
+                var wipNO = $('#WipInfo_WipNO').val();
+                var planQTY = $('#WipInfo_PlanQTY').val();
+                if (wipNO == '' || !wipNO) {
+                    parent.hg.msg("請輸入工單號碼");
+                    return;
+                }
+                if (planQTY == '' || !planQTY || planQTY == 0) {
+                    parent.hg.msg("請確認計畫計畫數量");
+                    return;
+                }
+
+                $("#WipBarcode_StartNO").val(wipNO + PrefixInteger(1, 4));
+                $("#WipBarcode_EndNO").val(wipNO + PrefixInteger(planQTY, 4));
+
+            });
+
+            function PrefixInteger(num, length) {
+                return (Array(length).join('0') + num).slice(-length);
+            };
+        });
     </script>
 
 

AMESCoreStudio.Web/Views/PCS/PCS004.cshtml

@@ -31,21 +31,29 @@
         <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 class="layui-form-item layui-layout-left">
                 <div class="layui-inline">
-                    <label class="layui-form-label">請選擇製程</label>
+                    <label class="layui-form-label">生產單位:</label>
-                    <div class="layui-form-item layui-layout-left" style="width:300px;">
+                    <div class="layui-input-inline">
                         <select id="unit" lay-filter="unit" lay-verify="required" lay-submit asp-items="@ViewBag.FactoryUnitList">
                         </select>
+                        <input id="unitNo" type="hidden" name="unitNo" value="0" />
                     </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">工單號碼:</label>
+                    <div class="layui-input-inline">
+                        <input id="wipNO" autocomplete="off" lay-verify="required" lay-reqtext="請輸入工單號碼查詢" class="layui-input" placeholder="請輸入工單號碼">
+                    </div>
+                </div>
+            </div>
+            @*<div class="layui-inline">
+                 
                     <input id="unitNo" type="hidden" name="unitNo" value="0" />
                     <label class="layui-form-label">備註</label>
                     <div class="layui-input-block">
                         <input id="wipNO" class="layui-input" name="wipNO" placeholder="請輸入備註" />
                     </div>
-                </div>
+                </div>*@
-            </div>
             <div class="layui-form-item layui-layout-right">
                 <div class="layui-inline layui-show-xs-block">
                     <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">

AMESCoreStudio.Web/Views/PCS/PCS005.cshtml

@@ -0,0 +1,94 @@
+@{
+    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">
+        <table class="layui-hide" id="test" lay-filter="test"></table>
+    </div>
+</div>
+
+@section Scripts{
+    <script type="text/javascript">
+        //监听表单提交事件
+        hg.form.onsubmit('querysubmit', function (data) {
+            table && table.reload(data);
+        });
+        var tableCols = [[
+            {
+                field: 'wipNO',
+                width: 200,
+                title: '工單號碼'
+            },
+            {
+                field: 'lineID',
+                title: '線別'
+            },
+            {
+                field: 'planQTY',
+                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) {
+            if (obj.data.statusNo) {
+                hg.open('修改條碼狀態', '/PPS/PPS002U/' + obj.data.statusNo, 640,320);
+            }
+        }
+
+        //通过行tool删除，lay-event="del"
+        function del(obj) {
+            if (obj.data.statusNo) {
+                hg.confirm("條碼狀態：" + obj.data.statusDesc + "，确定要删除吗？", function () {
+                    $.ajax({
+                        url: '/PPS/PPS002D',
+                        data: { id: obj.data.statusNo },
+                        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/PCS001', 800, 600);
+                
+            }
+        }
+        ];
+        //基本数据表格
+        var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/GetWipInfo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+    </script>
+}

AMESCoreStudio.Web/Views/PCS/PCS010.cshtml

@@ -0,0 +1,90 @@
+@model AMESCoreStudio.WebApi.Models.AMES.WipLock
+
+
+@{ ViewData["Title"] = "PCS010";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+</style>
+
+<div class="layui-card">
+    <div class="col-sm-12">
+        <form enctype="multipart/form-data" method="post" asp-action="PCS010Save" class="layui-form">
+            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="LockType" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="LockType" asp-items="@ViewBag.GetLockTypeList" class=""></select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="StationID" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="StationID" asp-items="@ViewBag.GetStationsList"></select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="LockReasonType" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="LockReasonType" asp-items="@ViewBag.GetLockReasonTypeList"></select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipNO" class="layui-input" placeholder="請輸入工單/條碼" />
+                        <span asp-validation-for="WipNO" class="text-danger"></span>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="LockReason" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="LockReason" class="layui-input" placeholder="請輸入鎖定原因" />
+                        <span asp-validation-for="LockReason" class="text-danger"></span>
+                    </div>
+                </div>
+            </div>
+
+            <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <input type="submit" value="保存" class="layui-btn" />
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+
+    <script type="text/javascript">
+        layui.use(['form'], function () {
+            form = layui.form;
+        });
+    $(document).ready(function () {
+        var error = '@Html.ValidationMessage("error")';
+        if ($(error).text() != '') {
+            parent.hg.msg(error);
+        }
+    });
+    </script>
+}
+

AMESCoreStudio.Web/wwwroot/lib/layui/css/modules/code.css

@@ -1,2 +1 @@
-/** layui-v2.5.5 MIT License By https://www.layui.com */
+html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #eee;border-left-width:6px;background-color:#FAFAFA;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:40px;line-height:40px;border-bottom:1px solid #eee}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 10px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view .layui-code-ol li:first-child{padding-top:10px}.layui-code-view .layui-code-ol li:last-child{padding-bottom:10px}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}.layui-code-demo .layui-code{visibility:visible!important;margin:-15px;border-top:none;border-right:none;border-bottom:none}.layui-code-demo .layui-tab-content{padding:15px;border-top:none}
- html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #e2e2e2;border-left-width:6px;background-color:#F2F2F2;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:32px;line-height:32px;border-bottom:1px solid #e2e2e2}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 5px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}

AMESCoreStudio.WebApi/Code/Helper.cs

@@ -71,5 +71,20 @@ namespace AMESCoreStudio.WebApi
 
             return key;
         }
+
+        /// <summary>
+        /// 抓IDKey最新值不更新
+        /// </summary>
+        /// <param name="idName"></param>
+        /// <returns></returns>
+        public async Task<int> GetIDKeyNoPost(string idName)
+        {
+            int key = -1;
+            var idkey = await _context.IDKeys.Where(m => m.IDName == idName).FirstOrDefaultAsync();
+            if (idkey == null)
+                return key;
+            else
+                return key = (int)idkey.CurrentNum;
+        }
     }
 }

AMESCoreStudio.WebApi/Controllers/AMES/WipBarcodeController.cs

@@ -0,0 +1,50 @@
+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;
+namespace AMESCoreStudio.WebApi.Controllers.AMES
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    public class WipBarcodeController : Controller
+    {
+        private readonly AMESContext _context;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="context"></param>
+        public WipBarcodeController(AMESContext context)
+        {
+            _context = context;
+        }
+
+        /// <summary>
+        /// 新增工單資料-條碼
+        /// </summary>
+        /// <param name="wipBarcode"></param>
+        /// <returns></returns>
+        // POST: api/SystemInfoes
+        // To protect from overposting attacks, enable the specific properties you want to bind to, for
+        // more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
+        [HttpPost]
+        public async Task<ActionResult<WipBarcode>> PostWipBarcode([FromBody] WipBarcode wipBarcode)
+        {
+            Helper helper = new Helper(_context);
+            wipBarcode.WipID = wipBarcode.WipID == 0 ? helper.GetIDKey("WIP_ID").Result : wipBarcode.WipID;
+            wipBarcode.CreateUserID = 0;
+
+            _context.WipBarcodes.Add(wipBarcode);
+            await _context.SaveChangesAsync();
+
+            return CreatedAtAction("PostWipBarcode", new { id = wipBarcode.WipID }, wipBarcode);
+        }
+    }
+}

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -48,6 +48,42 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return WipInfo;
         }
 
+        /// <summary>
+        /// 獲取產品別資料
+        /// </summary>
+        /// <param name="UnitNO"></param>
+        /// <returns></returns>
+        // GET: api/RoleModules/Role/5
+        [HttpGet("{id}")]
+        public async Task<ActionResult<IEnumerable<WipInfo>>> GetWipInfoByUnitNO(string UnitNO)
+        {
+            //IQueryable<RoleModule> q = _context.RoleModules.Include(r=>r.Module);
+            IQueryable<WipInfo> q = _context.WipInfos;
+
+
+            //if (UnitNO > 0)
+            //{
+            //    q = q.Where(p => p.UnitNO.Equals(UnitNO));
+            //}
+            //q.OrderBy(p => p.ModuleID);
+
+            var WipInfo = await q.ToListAsync();
+
+            foreach (var data in WipInfo)
+            {
+                //data.ModuleName = _context.ModuleInfoes.Find(data.ModuleID).ModuleName;
+                //data.Module = _context.ModuleInfoes.Where(p1 => p1.ModuleID.Equals(data.ModuleID)).FirstOrDefault();
+
+            }
+
+            if (WipInfo == null)
+            {
+                return NotFound();
+            }
+
+            return WipInfo;
+        }
+
         /// <summary>
         /// 新增工單資料
         /// </summary>

AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs

@@ -0,0 +1,91 @@
+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;
+
+namespace AMESCoreStudio.WebApi.Controllers.AMES
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    public class WipLockController : Controller
+    {
+        private readonly AMESContext _context;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="context"></param>
+        public WipLockController(AMESContext context)
+        {
+            _context = context;
+        }
+
+        /// <summary>
+        /// 工單鎖定資料
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<WipLock>>> GetWipLock()
+        {
+            IQueryable<WipLock> q = _context.WipLocks;
+            q = q.OrderBy(p => p.WipNO);
+            var WipLock = await q.ToListAsync();
+            return WipLock;
+        }
+
+        /// <summary>
+        /// 工單鎖定資料 to WipNO
+        /// </summary>
+        /// <param name="WipNO">工單編號</param>
+        /// <returns></returns>
+        // GET: api/RolePrograms/5
+        [HttpGet("{id}")]
+        public async Task<ActionResult<IEnumerable<WipLock>>> GetWipLock(string WipNO)
+        {
+            IQueryable<WipLock> q = _context.WipLocks;
+
+            q = q.Where(p => p.WipNO == WipNO);
+
+            var WipLock = await q.ToListAsync();
+
+            if (WipLock == null)
+            {
+                return NotFound();
+            }
+
+            return WipLock;
+        }
+
+        /// <summary>
+        /// 新增工單鎖定資料檔
+        /// </summary>
+        /// <param name="wiplock"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<ActionResult<WipLock>> PostWipLock([FromBody] WipLock wiplock)
+        {
+            Helper helper = new Helper(_context);
+            wiplock.WipLockID = helper.GetIDKey("WIP_LOCK_ID").Result;
+            wiplock.UnLockUserID = 0;
+
+            _context.WipLocks.Add(wiplock);
+            try
+            {
+                await _context.SaveChangesAsync();
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return CreatedAtAction("GetWipLock", new { WipNO = wiplock.WipNO }, wiplock);
+            //return ;
+        }
+    }
+}

AMESCoreStudio.WebApi/Models/AMES/WipLock.cs

@@ -65,12 +65,12 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public decimal StationID { get; set; } = 0;
 
         /// <summary>
-        /// 
+        /// 鎖定類型
         /// </summary>
         [Column("LOCK_TYPE")]
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
-        [Display(Name = "")]
+        [Display(Name = "鎖定類型")]
         public string LockType { get; set; } = "WIP";
 
         /// <summary>
@@ -80,7 +80,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "鎖定原因類別")]
-        public string LOCK_REASON_TYPE { get; set; } = "0";
+        public string LockReasonType { get; set; } = "0";
 
         /// <summary>
         /// 鎖定人員

AMESCoreStudio.WebApi/Models/AMESContext.cs

@@ -214,6 +214,16 @@ namespace AMESCoreStudio.WebApi
         /// </summary>
         public DbSet<AMESCoreStudio.WebApi.Models.AMES.WipStatus> WipStatus { get; set; }
 
+        /// <summary>
+        /// 工單鎖定資料檔
+        /// </summary>
+        public DbSet<WipLock> WipLocks { get; set; }
+
+        /// <summary>
+        /// 工單條碼起迄資料檔
+        /// </summary>
+        public DbSet<WipBarcode> WipBarcodes { get; set; }
+
     }
 
 }