1. PCS018

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -3023,7 +3023,7 @@ namespace AMESCoreStudio.Web.Controllers
         }
         #endregion
 
-        #region PCS004 工單條碼區間設定
+        #region PCS004 工單內部條碼區間設定
         [ResponseCache(Duration = 0)]
         [HttpGet]
         public async Task<IActionResult> PCS004()
@@ -3231,6 +3231,7 @@ namespace AMESCoreStudio.Web.Controllers
                 model.WipAtt = await _pcsApi.GetWipAtt(model.WipInfo.WipNO);
                 model.WipBarcodes = await _pcsApi.GetWipBarcode(model.WipInfo.WipNO);
                 model.RuleStation = await _basApi.GetRuleStationsByFlow(model.WipInfo.FlowRuleID);
+                model.WipInfo.WipType = model.WipInfo.WipType == "S" ? "標準工單" : "重工工單";
                 //model.RuleStation = model.RuleStation.OrderBy(o => o.Sequence);
             }
             return View(model);
@@ -3248,6 +3249,7 @@ namespace AMESCoreStudio.Web.Controllers
                 model.WipAtt = await _pcsApi.GetWipAtt(model.WipInfo.WipNO);
                 model.WipBarcodes = await _pcsApi.GetWipBarcode(model.WipInfo.WipNO);
                 model.RuleStation = await _basApi.GetRuleStationsByFlow(model.WipInfo.FlowRuleID);
+                model.WipInfo.WipType = model.WipInfo.WipType == "S" ? "標準工單" : "重工工單";
                 //model.RuleStation = model.RuleStation.OrderBy(o => o.Sequence);
             }
             return View(model);
@@ -3811,7 +3813,7 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 // 判斷是否在BarcodeChange 有被置換過
                 var result_BarcodeChangeData = await _pcsApi.GetBarcodeChangeByBarcodeNo(model.BarCodeNo ?? model.ExtraBarCodeNo ?? "A");
-                
+
                 // 判斷查詢是內部還是出貨條碼
                 if (!string.IsNullOrWhiteSpace(model.BarCodeNo))
                     result_BarcodeChangeData = result_BarcodeChangeData.Where(w => w.ChangeType == "P").ToList();
@@ -4564,6 +4566,357 @@ namespace AMESCoreStudio.Web.Controllers
         }
         #endregion
 
+        #region PCS017 工單出貨條碼區間設定
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> PCS017()
+        {
+            await GetFactoryUnit();
+            return View();
+        }
+
+        /// <summary>
+        /// PCS018 Query
+        /// </summary>
+        /// <param name="unitno">生產單位</param>
+        /// <param name="wipno">工單號碼</param>
+        /// <returns></returns>
+        public async Task<IActionResult> PCS017QueryAsync(string unitno, string wipno, int page = 0, int limit = 10)
+        {
+            IResultModel<dynamic> result = await _pcsApi.GetWipInfoSelectParameter(unitno: unitno
+                , wipno: wipno
+                , page: page
+                , limit: limit);
+
+            if (result.Data != null)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
+            }
+            return Json(new Table() { count = 0, data = null });
+        }
+
+
+        [HttpPost]
+        public async Task<IActionResult> PCS017CAsync(PCS004CViewModel model)
+        {
+            await GetLineInfo();
+            await GetFlowRuleList();
+
+            var aa = GetBarcodeOther(model.WipAtt.ItemNO, model.WipInfo.Werks.Substring(2, 2), model.WipInfo.PlanQTY, model.WipInfo.WipNO);
+
+            IResultModel result;
+            model.WipBarcode.WipNO = model.WipInfo.WipNO;
+            //model.WipBarcode.WipID = model.WipInfo.WipID;
+            //model.WipBarcode.UnitNO = model.WipInfo.UnitNO;
+
+            result = await _pcsApi.PostWipBarcode(JsonConvert.SerializeObject(model.WipBarcode));
+
+            if (!result.Success)
+            {
+                var _msg = "新增成功！";
+                return RedirectToAction("PCS018C", "PCS", new { id = model.WipInfo.WipID, msg = _msg });
+            }
+            else
+            {
+                if (result.Errors.Count > 0)
+                {
+                    ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
+                }
+                else
+                {
+                    ModelState.AddModelError("error", result.Msg);
+                }
+            }
+
+            return RedirectToAction("PCS018C", "PCS", new { id = model.WipInfo.WipID });
+        }
+
+        public async Task<IActionResult> PCS017C(int id, string msg = null)
+        {
+            ViewBag.Msg = msg;
+            await GetLineInfo();
+            await GetFlowRuleList();
+            PCS004CViewModel model = new PCS004CViewModel();
+            var q = await _pcsApi.GetWipInfo(id);
+            if (q.Count != 0)
+            {
+                model.WipInfo = q.FirstOrDefault();
+                model.WipAtt = await _pcsApi.GetWipAtt(model.WipInfo.WipNO);
+                model.WipBarcodeOther = await _pcsApi.GetWipBarcodeOther(model.WipInfo.WipNO);
+                model.RuleStation = await _basApi.GetRuleStationsByFlow(model.WipInfo.FlowRuleID);
+                model.WipInfo.WipType = model.WipInfo.WipType == "S" ? "標準工單" : "重工工單";
+                //model.RuleStation = model.RuleStation.OrderBy(o => o.Sequence);
+            }
+            return View(model);
+        }
+
+        public async Task<IActionResult> PCS017R(int id)
+        {
+            await GetLineInfo();
+            await GetFlowRuleList();
+            PCS004CViewModel model = new PCS004CViewModel();
+            var q = await _pcsApi.GetWipInfo(id);
+            if (q.Count != 0)
+            {
+                model.WipInfo = q.FirstOrDefault();
+                model.WipAtt = await _pcsApi.GetWipAtt(model.WipInfo.WipNO);
+                model.WipBarcodes = await _pcsApi.GetWipBarcode(model.WipInfo.WipNO);
+                model.RuleStation = await _basApi.GetRuleStationsByFlow(model.WipInfo.FlowRuleID);
+                model.WipInfo.WipType = model.WipInfo.WipType == "S" ? "標準工單" : "重工工單";
+                //model.RuleStation = model.RuleStation.OrderBy(o => o.Sequence);
+            }
+            return View(model);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> PCS017D(string WipNo, string StrNo, string EndNo)
+        {
+            //var result = await _pcsApi.de(WipNo, StrNo, EndNo);
+            return Json(new Result() { success = true, msg = "" });
+        }
+        #endregion
+
+        #region PCS018 重工工單內部條碼區間設定
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> PCS018()
+        {
+            await GetFactoryUnit();
+            return View();
+        }
+
+        /// <summary>
+        /// PCS018 Query
+        /// </summary>
+        /// <param name="unitno">生產單位</param>
+        /// <param name="wipno">工單號碼</param>
+        /// <returns></returns>
+        public async Task<IActionResult> PCS018QueryAsync(string unitno, string wipno, int page = 0, int limit = 10)
+        {
+            IResultModel<dynamic> result = await _pcsApi.GetWipInfoSelectParameter(unitno: unitno
+                , wipno: wipno
+                , wipType: "R"
+                , page: page
+                , limit: limit);
+
+            if (result.Data != null)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
+            }
+            return Json(new Table() { count = 0, data = null });
+        }
+
+        //頁面提交，id=0 添加，id>0 修改
+        [HttpPost]
+        public async Task<IActionResult> PCS018CAsync(PCS004CViewModel model)
+        {
+            await GetLineInfo();
+            await GetFlowRuleList();
+
+            // 起訖序號沒填寫 或者 綁定序號沒填寫
+            if ((string.IsNullOrWhiteSpace(model.WipBarcode.StartNO) || string.IsNullOrWhiteSpace(model.WipBarcode.EndNO))
+                && string.IsNullOrWhiteSpace(model.BarcodeNo))
+            {
+                ModelState.AddModelError("error", "請確認新增的條碼是否有填寫?");
+                return View(model);
+            }
+
+            if ((!string.IsNullOrWhiteSpace(model.WipBarcode.StartNO) || !string.IsNullOrWhiteSpace(model.WipBarcode.EndNO))
+             && !string.IsNullOrWhiteSpace(model.BarcodeNo))
+            {
+                ModelState.AddModelError("error", "請則一選擇要新增條碼的方式?");
+                return View(model);
+            }
+
+            // 既有序號綁定
+            if (!string.IsNullOrWhiteSpace(model.BarcodeNo))
+            {
+                // 內部序號
+                if (model.Type == "SN")
+                {
+                    if (_pcsApi.GetBarcodeInfoesByNo(model.BarcodeNo).InvokeAsync().Result.Count() == 0)
+                    {
+                        ModelState.AddModelError("error", "綁定序號【" + model.BarcodeNo + "】，找不到已綁定的內部序號");
+                        return View(model);
+                    }
+                }
+                // 出貨序號
+                else if (model.Type == "SSN")
+                {
+                    var resultExtraNo = await _pcsApi.GetBarcodeInfoesByExtraNo(model.BarcodeNo);
+                    if (resultExtraNo.Count() == 0)
+                    {
+                        ModelState.AddModelError("error", "綁定序號【" + model.BarcodeNo + "】，找不到已綁定的出貨序號");
+                        return View(model);
+                    }
+                    else
+                        model.BarcodeNo = resultExtraNo.FirstOrDefault().BarcodeNo;
+                }
+
+                model.WipBarcode.StartNO = model.BarcodeNo;
+                model.WipBarcode.EndNO = model.BarcodeNo;
+            }
+
+
+            // 流水碼預設長度
+            string _msg = string.Empty;
+            int WipQty = model.WipInfo.PlanQTY;
+            string InputStartNo = model.WipBarcode.StartNO.Trim();
+            string InputEndNo = model.WipBarcode.EndNO.Trim();
+
+            if (model.WipBarcodes == null)
+            {
+                model.WipBarcodes = new List<WipBarcode>();
+            }
+
+            if (InputStartNo.Length <= NoLength || InputEndNo.Length <= NoLength)
+            {
+                _msg += "條碼區間號碼長度不能小於" + (NoLength + 1);
+                ModelState.AddModelError("error", _msg);
+                return View(model);
+            }
+
+            if (InputStartNo.Length != InputEndNo.Length)
+            {
+                _msg += "起始條碼與結束條碼字串長度不一致";
+                ModelState.AddModelError("error", _msg);
+                return View(model);
+            }
+
+            if (InputStartNo.Substring(0, InputStartNo.Length - NoLength) !=
+                InputEndNo.Substring(0, InputEndNo.Length - NoLength))
+            {
+                _msg += "條碼區間前置號碼不一樣";
+                ModelState.AddModelError("error", _msg);
+                return View(model);
+            }
+
+
+            if (!int.TryParse(InputStartNo.Substring(InputStartNo.Length - NoLength, NoLength), out _) ||
+                !int.TryParse(InputEndNo.Substring(InputEndNo.Length - NoLength, NoLength), out _))
+            {
+                _msg += "條碼區間流水碼格式錯誤";
+                ModelState.AddModelError("error", _msg);
+                return View(model);
+            }
+
+            // 計算設定條碼區間是否有大於工單數
+            int sum = 0;
+            // 起始流水碼
+            int InputStrNoQty = int.Parse(InputStartNo.Substring(InputStartNo.Length - NoLength, NoLength));
+            // 結束流水碼
+            int InputEndNoQty = int.Parse(InputEndNo.Substring(InputEndNo.Length - NoLength, NoLength));
+
+            if (InputEndNoQty < InputStrNoQty)
+            {
+                _msg += "結束流水碼不可以小於起始流水碼";
+                ModelState.AddModelError("error", _msg);
+                return View(model);
+            }
+
+            if (model.WipBarcodes != null)
+            {
+                // 計算目前已經使用的條碼區間數量
+                foreach (var item in model.WipBarcodes)
+                {
+                    int OldStrNo = int.Parse(item.StartNO.Substring(item.StartNO.Length - NoLength, NoLength));
+                    int OldEndNo = int.Parse(item.EndNO.Substring(item.EndNO.Length - NoLength, NoLength));
+
+                    // 判斷是否有設定重複區間
+                    if (item.StartNO.Substring(0, item.StartNO.Length - NoLength) ==
+                        InputStartNo.Substring(0, InputStartNo.Length - NoLength))
+                    {
+                        if ((OldStrNo <= InputStrNoQty && InputStrNoQty <= OldEndNo) ||
+                            (OldStrNo <= InputEndNoQty && InputEndNoQty <= OldEndNo))
+                        {
+                            _msg += "設定條碼區間有重複，請確認！";
+                            ModelState.AddModelError("error", _msg);
+                            return View(model);
+                        }
+                    }
+                    sum = OldEndNo - OldStrNo - +1;
+                }
+            }
+
+            if (WipQty < sum + (InputEndNoQty - InputStrNoQty + 1))
+            {
+                _msg += "工單號碼【" + model.WipInfo.WipNO + "】 設定條碼區間數量已超過工單數量，請確認！";
+                ModelState.AddModelError("error", _msg);
+                return View(model);
+            }
+
+            IResultModel result;
+            model.WipBarcode.WipNO = model.WipInfo.WipNO;
+            //model.WipBarcode.WipID = model.WipInfo.WipID;
+            //model.WipBarcode.UnitNO = model.WipInfo.UnitNO;
+
+            result = await _pcsApi.PostWipBarcode(JsonConvert.SerializeObject(model.WipBarcode));
+
+            if (!result.Success)
+            {
+                _msg = "新增成功！";
+                return RedirectToAction("PCS018C", "PCS", new { id = model.WipInfo.WipID, msg = _msg });
+            }
+            else
+            {
+                if (result.Errors.Count > 0)
+                {
+                    ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
+                }
+                else
+                {
+                    ModelState.AddModelError("error", result.Msg);
+                }
+            }
+
+            return RedirectToAction("PCS018C", "PCS", new { id = model.WipInfo.WipID });
+        }
+
+        public async Task<IActionResult> PCS018C(int id, string msg = null)
+        {
+            ViewBag.Msg = msg;
+            await GetLineInfo();
+            await GetFlowRuleList();
+            PCS004CViewModel model = new PCS004CViewModel();
+            var q = await _pcsApi.GetWipInfo(id);
+            if (q.Count != 0)
+            {
+                model.WipInfo = q.FirstOrDefault();
+                model.WipAtt = await _pcsApi.GetWipAtt(model.WipInfo.WipNO);
+                model.WipBarcodes = await _pcsApi.GetWipBarcode(model.WipInfo.WipNO);
+                model.RuleStation = await _basApi.GetRuleStationsByFlow(model.WipInfo.FlowRuleID);
+                model.WipInfo.WipType = model.WipInfo.WipType == "S" ? "標準工單" : "重工工單";
+                //model.RuleStation = model.RuleStation.OrderBy(o => o.Sequence);
+            }
+            return View(model);
+        }
+
+        public async Task<IActionResult> PCS018R(int id)
+        {
+            await GetLineInfo();
+            await GetFlowRuleList();
+            PCS004CViewModel model = new PCS004CViewModel();
+            var q = await _pcsApi.GetWipInfo(id);
+            if (q.Count != 0)
+            {
+                model.WipInfo = q.FirstOrDefault();
+                model.WipAtt = await _pcsApi.GetWipAtt(model.WipInfo.WipNO);
+                model.WipBarcodes = await _pcsApi.GetWipBarcode(model.WipInfo.WipNO);
+                model.RuleStation = await _basApi.GetRuleStationsByFlow(model.WipInfo.FlowRuleID);
+                model.WipInfo.WipType = model.WipInfo.WipType == "S" ? "標準工單" : "重工工單";
+                //model.RuleStation = model.RuleStation.OrderBy(o => o.Sequence);
+            }
+            return View(model);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> PCS018D(string WipNo, string StrNo, string EndNo)
+        {
+            var result = await _pcsApi.DeleteWipBarcode(WipNo, StrNo, EndNo);
+            return Json(new Result() { success = true, msg = "" });
+        }
+        #endregion
+
         #region PCS019 條碼遺漏查詢
         [ResponseCache(Duration = 0)]
         [HttpGet]

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -89,7 +89,7 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/WipInfos/GetWipInfoSelectParameter")]
         //ITask<List<WipInfo>> GetWipInfoSelectParameter(string unitno = null, string wipno = null);
         ITask<ResultModel<dynamic>> GetWipInfoSelectParameter(string unitno = null, string wipno = null, int lineid = 0
-            , string itemno = null, DateTime? date_str = null, DateTime? date_end = null, int page = 0, int limit = 10);
+            , string itemno = null, DateTime? date_str = null, DateTime? date_end = null , string wipType = null, int page = 0, int limit = 10);
 
         /// <summary>
         /// 查詢工單基本資料+是否已過站
@@ -287,7 +287,7 @@ namespace AMESCoreStudio.Web
         ITask<ResultModel<string>> DeleteWipBarcode(string wipno, string strno, string endno);
         #endregion
 
-        #region WipBarcodeOthers 工單條碼區間設定檔（除内部SN） PCS001
+        #region WipBarcodeOthers 工單出貨條碼區間設定檔 PCS017
         [WebApiClient.Attributes.HttpGet("api/WipBarcodeOther/WipNo/{id}")]
         ITask<WipBarcodeOther> GetWipBarcodeOther(string id);
 
@@ -296,6 +296,13 @@ namespace AMESCoreStudio.Web
 
         [WebApiClient.Attributes.HttpPut("api/WipBarcodeOther")]
         ITask<ResultModel<WipBarcodeOther>> PutWipBarcodeOther([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 刪除工單出貨條碼區間
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpDelete("api/WipBarcodeOther/{wipno}/{strno}/{endno}")]
+        ITask<ResultModel<string>> DeleteWipBarcodeOther(string wipno, string strno, string endno);
         #endregion
 
         #region BarCodeInfo 條碼資料檔 PCS021

AMESCoreStudio.Web/ViewModels/PCS/PCS004CViewModel.cs

@@ -15,10 +15,14 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
 
         public WipBarcode WipBarcode { get; set; }
 
+        public WipBarcodeOther WipBarcodeOther { get; set; }
+
         public IEnumerable<WipBarcode> WipBarcodes { get; set; }
 
         public IEnumerable<RuleStation> RuleStation { get; set; }
 
+        public IEnumerable<WipBarcodeOther> WipBarcodeOthers { get; set; }
+
         // 序號綁定 Type SN:內部序號 SSN:出貨序號
         public string Type { get; set; }
 

AMESCoreStudio.Web/Views/PCS/PCS004.cshtml

@@ -1,5 +1,5 @@
 @{
-    ViewData["Title"] = "工單條碼區間設定";
+    ViewData["Title"] = "工單內部條碼區間設定";
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
 }
 
@@ -136,14 +136,14 @@
         //通过行tool编辑，lay-event="edit"
         function edit(obj) {
             if (obj.data.wipID) {
-                hg.open('修改工單條碼區間', '/PCS/PCS004C/' + obj.data.wipID, '', '', true);
+                hg.open('修改工單內部條碼', '/PCS/PCS004C/' + obj.data.wipID, '', '', true);
             }
         }
 
         //通过行tool编辑，lay-event="edit"
         function detail(obj) {
             if (obj.data.wipID) {
-                hg.open('檢視工單條碼區間', '/PCS/PCS004R/' + obj.data.wipID, '', '', true);
+                hg.open('檢視工單內部條碼', '/PCS/PCS004R/' + obj.data.wipID, '', '', true);
             }
         }
 

AMESCoreStudio.Web/Views/PCS/PCS004C.cshtml

@@ -105,22 +105,26 @@
                     <div class="layui-input-inline">
                         <input asp-for="WipAtt.ECN" class="layui-input" readonly="readonly" />
                     </div>
+                    <label asp-for="WipInfo.WipType" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input  asp-for="WipInfo.WipType" class="layui-input" readonly="readonly" />
+                    </div>
                 </div>
             </div>
         </fieldset>
 
         <fieldset class="layui-elem-field layui-field-title">
-            <legend>條碼資料</legend>
+            <legend>內部條碼資料</legend>
             <table id="MydataTable" class="layui-table" style="width:50%">
                 @{ int i = 0;}
                 <thead>
                     <tr>
                         <th>
-                            起始生產序號
+                            起始生產條碼
                         </th>
 
                         <th>
-                            結束生產序號
+                            結束生產條碼
                         </th>
                         <th>
 
@@ -150,7 +154,7 @@
         </fieldset>
 
         <fieldset class="layui-elem-field layui-field-title">
-            <legend>新增條碼</legend>
+            <legend>新增內部條碼</legend>
             <div class="layui-form-item">
                 <div class="layui-inline">
                     <label asp-for="WipBarcode.StartNO" class="layui-form-label"></label>
@@ -167,10 +171,10 @@
             </div>
 
             <div class="layui-form-item">
-                <label class="layui-form-label">既有序號綁定</label>
+                <label class="layui-form-label">既有條碼綁定內部條碼</label>
                 <div class="layui-input-inline" style="width:220px">
-                    <input type="radio" name="Type" value="SN" title="內部序號" checked>
+                    <input type="radio" name="Type" value="SN" title="內部條碼" checked>
-                    <input type="radio" name="Type" value="SSN" title="出貨序號">
+                    <input type="radio" name="Type" value="SSN" title="出貨條碼">
                 </div>
                 <div class="layui-input-inline">
                     <input asp-for="BarcodeNo" class="layui-input" />
@@ -195,7 +199,7 @@
 
         // Table 刪除
         function Remove(button,StrNo,EndNo) {
-            hg.confirm("起始生產序號：" + StrNo + "，結束生產序號：" + EndNo + "，确定要删除嗎？", function () {
+            hg.confirm("起始生產條碼：" + StrNo + "，結束生產條碼：" + EndNo + "，确定要删除嗎？", function () {
 
                   $.ajax({
                         url: '@Url.Action("PCS004D", "PCS")',

AMESCoreStudio.Web/Views/PCS/PCS004R.cshtml

@@ -105,6 +105,10 @@
                     <div class="layui-input-inline">
                         <input asp-for="WipAtt.ECN" class="layui-input" readonly="readonly" />
                     </div>
+                    <label asp-for="WipInfo.WipType" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.WipType" class="layui-input" readonly="readonly" />
+                    </div>
                 </div>
             </div>
 
@@ -112,16 +116,16 @@
         </fieldset>
 
         <fieldset class="layui-elem-field layui-field-title">
-            <legend>條碼資料</legend>
+            <legend>內部條碼資料</legend>
             <table id="MydataTable" class="layui-table" style="width:50%">
                 <thead>
                     <tr>
                         <th>
-                            起始生產序號
+                            起始生產內部
                         </th>
 
                         <th>
-                            結束生產序號
+                            結束生產內部
                         </th>
                     </tr>
                 </thead>

AMESCoreStudio.Web/Views/PCS/PCS017.cshtml

@@ -0,0 +1,154 @@
+@{
+    ViewData["Title"] = "工單出貨條碼設定";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<style type="text/css">
+    .layui-table-main .layui-table-cell {
+        /*height: auto !important;*/
+        white-space: normal;
+    }
+
+    .layui-table img {
+        max-width: 60px;
+        max-height: 28px;
+    }
+
+    .layui-tree-main {
+        cursor: pointer;
+        padding-right: 10px;
+        float: left;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #e6e6e6;
+        margin: 10px 0;
+    }
+</style>
+
+
+<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 class="layui-inline">
+                    <label class="layui-form-label">生產單位:</label>
+                    <div class="layui-input-inline">
+                        <select id="unit" lay-filter="unit" lay-submit asp-items="@ViewBag.FactoryUnitList">
+                            <option value="">全部</option>
+                        </select>
+                        <input id="unitNo" type="hidden" name="unitNo" value="" />
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">工單號碼:</label>
+                    <div class="layui-input-inline">
+                        <input id="wipNo" name="wipNo" autocomplete="off" class="layui-input" placeholder="請輸入工單號碼">
+                    </div>
+                </div>
+                <div class="layui-inline layui-show-xs-block">
+                    <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
+                        <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                    </button>
+                </div>
+            </div>
+            <div class="layui-form-item">
+    
+            </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) {
+            hg.msghide("重新載入資料..");
+            table && table.reload(data);
+        });
+
+        layui.use(['form', 'layer'], function () {
+            form = layui.form;
+
+            form.on('select(unit)', function (data) {
+                $("#unitNo").val(data.value);
+                //roleName = data.elem[data.elem.selectedIndex].text;
+                var qs = $('button[lay-filter="querysubmit"]');
+                qs.click();
+
+                //hg.msghide("刷新数据！");
+                //table && table.reload();
+            });
+        });
+
+        //alert(roleId.value);
+
+        /*
+        hg.form.on('select(role)', function (data) {
+            alert(data.value);
+        });
+        */
+
+      
+
+        var tableCols = [[
+            {
+                field: 'wipNo',
+                width: 200,
+                title: '工單號碼',
+                sort: true
+            },
+            {
+                field: 'itemNo',
+                title: '料號',
+                width: 200,
+                sort: true
+            },
+            {
+                field: 'lineDesc',
+                title: '線別',
+                width: 200,
+                sort: true
+            },
+            {
+                field: 'unitName',
+                title: '生產單位',
+                width: 200,
+                sort: true
+            },
+            {
+                field: 'planQTY',
+                title: '工單數'
+            },
+            {
+                field: 'right',
+                width: 200,
+                title: '操作',
+                fixed: 'right',
+                templet: function (d) {
+                    return '<a class="layui-btn layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-warm layui-icon layui-icon-list layui-btn-xs" lay-event="detail">檢視</a>'
+                }
+            }]
+        ];
+        //通过行tool编辑，lay-event="edit"
+        function edit(obj) {
+            if (obj.data.wipID) {
+                hg.open('修改工單出貨條碼', '/PCS/PCS017C/' + obj.data.wipID, '', '', true);
+            }
+        }
+
+        //通过行tool编辑，lay-event="edit"
+        function detail(obj) {
+            if (obj.data.wipID) {
+                hg.open('檢視工單出貨條碼', '/PCS/PCS017R/' + obj.data.wipID, '', '', true);
+            }
+        }
+
+        //基本数据表格
+        var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/PCS004Query', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+       // var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/GetWipInfo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+    </script>
+}

AMESCoreStudio.Web/Views/PCS/PCS017C.cshtml

@@ -0,0 +1,240 @@
+@model AMESCoreStudio.Web.ViewModels.PCS.PCS004CViewModel
+
+
+@{
+    Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+</style>
+
+<div class="layui-card">
+    <form enctype="multipart/form-data" method="post" asp-action="PCS004C" class="layui-form">
+        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+        <input type="hidden" asp-for="WipInfo.WipID" />
+        <input type="hidden" asp-for="WipInfo.UnitNO" />
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>基本資料</legend>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <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" readonly="readonly" />
+                        <span asp-validation-for="WipInfo.WipNO" class="layui-bg-red"></span>
+                    </div>
+                    <label asp-for="WipInfo.LineID" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="WipInfo.LineID" asp-items="@ViewBag.LineInfoList" class="" disabled></select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.PlanQTY" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.PlanQTY" class="layui-input" autocomplete="off" readonly="readonly" />
+
+                    </div>
+                    <label class="layui-form-label">完成數量</label>
+                    <div class="layui-input-inline">
+                        <input class="layui-input" autocomplete="off" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.FlowRuleID" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="WipInfo.FlowRuleID" asp-items="@ViewBag.FlowRuleList" disabled class=""></select>
+                    </div>
+                    <label asp-for="WipInfo.StatusNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.StatusNO" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.OrderNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.OrderNO" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipInfo.WipSEQ" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.WipSEQ" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.CNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.CNO" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipInfo.BoxCNT" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.BoxCNT" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipAtt.ItemNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipAtt.ItemNO" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipAtt.ModelNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipAtt.ModelNO" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipAtt.ECN" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipAtt.ECN" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipInfo.WipType" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.WipType" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+        </fieldset>
+
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>出貨條碼資料</legend>
+            <table id="MydataTable" class="layui-table" style="width:50%">
+                @{ int i = 0;}
+                <thead>
+                    <tr>
+                        <th>
+                            起始出貨條碼
+                        </th>
+
+                        <th>
+                            結束出貨條碼
+                        </th>
+                        <th>
+
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @if (Model.WipBarcodeOthers != null)
+                    {
+                        <tr>
+                            <td>
+                                <input type="text" class="layui-input" asp-for="@Model.WipBarcodeOther.StartNO" readonly="readonly" />
+
+                            </td>
+                            <td>
+                                <input type="text" class="layui-input" asp-for="@Model.WipBarcodeOther.EndNO" readonly="readonly" />
+
+                            </td>
+                            <td>
+                                <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this, '@Model.WipBarcodeOther.StartNO', '@Model.WipBarcodeOther.EndNO');">刪除</a>
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </fieldset>
+
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>新增出貨條碼</legend>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipBarcode.StartNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipBarcode.StartNO" class="layui-input" />
+                        @*<span asp-validation-for="WipBarcode.StartNO" class="layui-bg-red"></span>*@
+                    </div>
+                    <label asp-for="WipBarcode.EndNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipBarcode.EndNO" class="layui-input" />
+                        @*<span asp-validation-for="WipBarcode.EndNO" class="layui-bg-red"></span>*@
+                    </div>
+                </div>
+            </div>
+
+            @*<div class="layui-form-item">
+                <label class="layui-form-label">既有條碼綁定內部條碼</label>
+                <div class="layui-input-inline" style="width:220px">
+                    <input type="radio" name="Type" value="SN" title="內部條碼" checked>
+                    <input type="radio" name="Type" value="SSN" title="出貨條碼">
+                </div>
+                <div class="layui-input-inline">
+                    <input asp-for="BarcodeNo" class="layui-input" />
+                </div>
+            </div>*@
+        </fieldset>
+
+        <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 id="InsertBarCode" type="submit" value="新增" class="layui-btn" />
+            </div>
+        </div>
+    </form>
+</div>
+
+@section Scripts {
+    <script type="text/javascript">
+        layui.use(['form'], function () {
+            var form = layui.form;
+        });
+
+        // Table 刪除
+        function Remove(button,StrNo,EndNo) {
+            hg.confirm("起始出貨條碼：" + StrNo + "，結束出貨條碼：" + EndNo + "，确定要删除嗎？", function () {
+
+                  $.ajax({
+                        url: '@Url.Action("PCS004D", "PCS")',
+                        dataType:'json',
+                      data: { "WipNo": $("#WipInfo_WipNO").val(), "StrNo": StrNo, "EndNo": EndNo},
+                        cache: false,
+                        type: "POST",
+                        success: function (data) {
+                          if (data.success) {
+                              hg.msg("删除成功！");
+                              var row = $(button).closest("TR");
+                              var table = $("#MydataTable")[0];
+                              table.deleteRow(row[0].rowIndex);
+                          }
+
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            hg.msg("Found error when using Ajax!!");
+                        }
+                        });
+            });
+        };
+
+    $(document).ready(function () {
+        var error = '@Html.ValidationMessage("error")';
+        if ($(error).text() != '') {
+            parent.hg.msg(error);
+        }
+            //关闭弹出层
+        if ('@ViewBag.Msg' != '') {
+        //hg.close();
+        hg.msg('@ViewBag.Msg');
+        }
+    });
+    </script>
+
+
+}
+

AMESCoreStudio.Web/Views/PCS/PCS017R.cshtml

@@ -0,0 +1,177 @@
+@model AMESCoreStudio.Web.ViewModels.PCS.PCS004CViewModel
+
+
+@{ ViewData["Title"] = "PCS001C";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+</style>
+
+<div class="layui-card">
+    <form enctype="multipart/form-data" method="post" asp-action="PCS004C" class="layui-form">
+        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+        <input type="hidden" asp-for="WipInfo.WipID" />
+        <input type="hidden" asp-for="WipInfo.UnitNO" />
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>基本資料</legend>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <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" readonly="readonly" />
+                        <span asp-validation-for="WipInfo.WipNO" class="layui-bg-red"></span>
+                    </div>
+                    <label asp-for="WipInfo.LineID" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="WipInfo.LineID" asp-items="@ViewBag.LineInfoList" class="" disabled></select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.PlanQTY" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.PlanQTY" class="layui-input" autocomplete="off" readonly="readonly" />
+
+                    </div>
+                    <label class="layui-form-label">完成數量</label>
+                    <div class="layui-input-inline">
+                        <input class="layui-input" autocomplete="off" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.FlowRuleID" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="WipInfo.FlowRuleID" asp-items="@ViewBag.FlowRuleList" disabled class=""></select>
+                    </div>
+                    <label asp-for="WipInfo.StatusNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.StatusNO" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.OrderNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.OrderNO" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipInfo.WipSEQ" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.WipSEQ" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.CNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.CNO" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipInfo.BoxCNT" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.BoxCNT" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipAtt.ItemNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipAtt.ItemNO" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipAtt.ModelNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipAtt.ModelNO" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipAtt.ECN" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipAtt.ECN" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipInfo.WipType" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.WipType" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+
+        </fieldset>
+
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>出貨條碼資料</legend>
+            <table id="MydataTable" class="layui-table" style="width:50%">
+                <thead>
+                    <tr>
+                        <th>
+                            起始出貨條碼
+                        </th>
+
+                        <th>
+                            結束出貨條碼
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (var index in Model.WipBarcodeOthers)
+                    {
+                        <tr>
+                            <td>
+                                @index.StartNO
+                            </td>
+                            <td>
+                                @index.EndNO
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </fieldset>
+
+        <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+    </form>
+</div>
+
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+
+    <script type="text/javascript">
+        layui.use(['form'], function () {
+            var form = layui.form;
+        });
+
+
+    $(document).ready(function () {
+        var error = '@Html.ValidationMessage("error")';
+        if ($(error).text() != '') {
+            parent.hg.msg(error);
+        }
+            //关闭弹出层
+        if ('@ViewBag.Msg' != '') {
+        //hg.close();
+        hg.msg('@ViewBag.Msg');
+        }
+    });
+    </script>
+
+
+}
+

AMESCoreStudio.Web/Views/PCS/PCS018.cshtml

@@ -0,0 +1,154 @@
+@{
+    ViewData["Title"] = "重工內部條碼區間設定";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<style type="text/css">
+    .layui-table-main .layui-table-cell {
+        /*height: auto !important;*/
+        white-space: normal;
+    }
+
+    .layui-table img {
+        max-width: 60px;
+        max-height: 28px;
+    }
+
+    .layui-tree-main {
+        cursor: pointer;
+        padding-right: 10px;
+        float: left;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #e6e6e6;
+        margin: 10px 0;
+    }
+</style>
+
+
+<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 class="layui-inline">
+                    <label class="layui-form-label">生產單位:</label>
+                    <div class="layui-input-inline">
+                        <select id="unit" lay-filter="unit" lay-submit asp-items="@ViewBag.FactoryUnitList">
+                            <option value="">全部</option>
+                        </select>
+                        <input id="unitNo" type="hidden" name="unitNo" value="" />
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">工單號碼:</label>
+                    <div class="layui-input-inline">
+                        <input id="wipNo" name="wipNo" autocomplete="off" class="layui-input" placeholder="請輸入工單號碼">
+                    </div>
+                </div>
+                <div class="layui-inline layui-show-xs-block">
+                    <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
+                        <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                    </button>
+                </div>
+            </div>
+            <div class="layui-form-item">
+    
+            </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) {
+            hg.msghide("重新載入資料..");
+            table && table.reload(data);
+        });
+
+        layui.use(['form', 'layer'], function () {
+            form = layui.form;
+
+            form.on('select(unit)', function (data) {
+                $("#unitNo").val(data.value);
+                //roleName = data.elem[data.elem.selectedIndex].text;
+                var qs = $('button[lay-filter="querysubmit"]');
+                qs.click();
+
+                //hg.msghide("刷新数据！");
+                //table && table.reload();
+            });
+        });
+
+        //alert(roleId.value);
+
+        /*
+        hg.form.on('select(role)', function (data) {
+            alert(data.value);
+        });
+        */
+
+      
+
+        var tableCols = [[
+            {
+                field: 'wipNo',
+                width: 200,
+                title: '工單號碼',
+                sort: true
+            },
+            {
+                field: 'itemNo',
+                title: '料號',
+                width: 200,
+                sort: true
+            },
+            {
+                field: 'lineDesc',
+                title: '線別',
+                width: 200,
+                sort: true
+            },
+            {
+                field: 'unitName',
+                title: '生產單位',
+                width: 200,
+                sort: true
+            },
+            {
+                field: 'planQTY',
+                title: '工單數'
+            },
+            {
+                field: 'right',
+                width: 200,
+                title: '操作',
+                fixed: 'right',
+                templet: function (d) {
+                    return '<a class="layui-btn layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-warm layui-icon layui-icon-list layui-btn-xs" lay-event="detail">檢視</a>'
+                }
+            }]
+        ];
+        //通过行tool编辑，lay-event="edit"
+        function edit(obj) {
+            if (obj.data.wipID) {
+                hg.open('修改重工內部條碼', '/PCS/PCS018C/' + obj.data.wipID, '', '', true);
+            }
+        }
+
+        //通过行tool编辑，lay-event="edit"
+        function detail(obj) {
+            if (obj.data.wipID) {
+                hg.open('檢視重工內部條碼', '/PCS/PCS018R/' + obj.data.wipID, '', '', true);
+            }
+        }
+
+        //基本数据表格
+        var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/PCS018Query', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+       // var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/GetWipInfo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+    </script>
+}

AMESCoreStudio.Web/Views/PCS/PCS018C.cshtml

@@ -0,0 +1,241 @@
+@model AMESCoreStudio.Web.ViewModels.PCS.PCS004CViewModel
+
+
+@{
+    Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+</style>
+
+<div class="layui-card">
+    <form enctype="multipart/form-data" method="post" asp-action="PCS004C" class="layui-form">
+        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+        <input type="hidden" asp-for="WipInfo.WipID" />
+        <input type="hidden" asp-for="WipInfo.UnitNO" />
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>基本資料</legend>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <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" readonly="readonly" />
+                        <span asp-validation-for="WipInfo.WipNO" class="layui-bg-red"></span>
+                    </div>
+                    <label asp-for="WipInfo.LineID" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="WipInfo.LineID" asp-items="@ViewBag.LineInfoList" class="" disabled></select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.PlanQTY" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.PlanQTY" class="layui-input" autocomplete="off" readonly="readonly" />
+
+                    </div>
+                    <label class="layui-form-label">完成數量</label>
+                    <div class="layui-input-inline">
+                        <input class="layui-input" autocomplete="off" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.FlowRuleID" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="WipInfo.FlowRuleID" asp-items="@ViewBag.FlowRuleList" disabled class=""></select>
+                    </div>
+                    <label asp-for="WipInfo.StatusNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.StatusNO" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.OrderNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.OrderNO" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipInfo.WipSEQ" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.WipSEQ" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.CNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.CNO" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipInfo.BoxCNT" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.BoxCNT" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipAtt.ItemNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipAtt.ItemNO" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipAtt.ModelNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipAtt.ModelNO" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipAtt.ECN" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipAtt.ECN" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipInfo.WipType" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.WipType" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+        </fieldset>
+
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>內部條碼資料</legend>
+            <table id="MydataTable" class="layui-table" style="width:50%">
+                @{ int i = 0;}
+                <thead>
+                    <tr>
+                        <th>
+                            起始生產條碼
+                        </th>
+
+                        <th>
+                            結束生產條碼
+                        </th>
+                        <th>
+
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (var index in Model.WipBarcodes)
+                    {
+                        <tr>
+                            <td>
+                                <input type="text" class="layui-input" asp-for="@index.StartNO" name="WipBarcodes[@i].StartNO" readonly="readonly" />
+
+                            </td>
+                            <td>
+                                <input type="text" class="layui-input" asp-for="@index.EndNO" name="WipBarcodes[@i].EndNO" readonly="readonly" />
+
+                            </td>
+                            <td>
+                                <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this, '@index.StartNO', '@index.EndNO');">刪除</a>
+                            </td>
+                        </tr>
+                        i++;
+                    }
+                </tbody>
+            </table>
+        </fieldset>
+
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>新增內部條碼</legend>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipBarcode.StartNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipBarcode.StartNO" class="layui-input" />
+                        @*<span asp-validation-for="WipBarcode.StartNO" class="layui-bg-red"></span>*@
+                    </div>
+                    <label asp-for="WipBarcode.EndNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipBarcode.EndNO" class="layui-input" />
+                        @*<span asp-validation-for="WipBarcode.EndNO" class="layui-bg-red"></span>*@
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">既有條碼綁定內部條碼</label>
+                <div class="layui-input-inline" style="width:220px">
+                    <input type="radio" name="Type" value="SN" title="內部條碼" checked>
+                    <input type="radio" name="Type" value="SSN" title="出貨條碼">
+                </div>
+                <div class="layui-input-inline">
+                    <input asp-for="BarcodeNo" class="layui-input" />
+                </div>
+            </div>
+        </fieldset>
+
+        <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 id="InsertBarCode" type="submit" value="新增" class="layui-btn" />
+            </div>
+        </div>
+    </form>
+</div>
+
+@section Scripts {
+    <script type="text/javascript">
+        layui.use(['form'], function () {
+            var form = layui.form;
+        });
+
+        // Table 刪除
+        function Remove(button,StrNo,EndNo) {
+            hg.confirm("起始生產條碼：" + StrNo + "，結束生產條碼：" + EndNo + "，确定要删除嗎？", function () {
+
+                  $.ajax({
+                        url: '@Url.Action("PCS018D", "PCS")',
+                        dataType:'json',
+                      data: { "WipNo": $("#WipInfo_WipNO").val(), "StrNo": StrNo, "EndNo": EndNo},
+                        cache: false,
+                        type: "POST",
+                        success: function (data) {
+                          if (data.success) {
+                              hg.msg("删除成功！");
+                              var row = $(button).closest("TR");
+                              var table = $("#MydataTable")[0];
+                              table.deleteRow(row[0].rowIndex);
+                          }
+
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            hg.msg("Found error when using Ajax!!");
+                        }
+                        });
+            });
+        };
+
+    $(document).ready(function () {
+        var error = '@Html.ValidationMessage("error")';
+        if ($(error).text() != '') {
+            parent.hg.msg(error);
+        }
+            //关闭弹出层
+        if ('@ViewBag.Msg' != '') {
+        //hg.close();
+        hg.msg('@ViewBag.Msg');
+        }
+    });
+    </script>
+
+
+}
+

AMESCoreStudio.Web/Views/PCS/PCS018R.cshtml

@@ -0,0 +1,177 @@
+@model AMESCoreStudio.Web.ViewModels.PCS.PCS004CViewModel
+
+
+@{ ViewData["Title"] = "PCS001C";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+</style>
+
+<div class="layui-card">
+    <form enctype="multipart/form-data" method="post" asp-action="PCS004C" class="layui-form">
+        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+        <input type="hidden" asp-for="WipInfo.WipID" />
+        <input type="hidden" asp-for="WipInfo.UnitNO" />
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>基本資料</legend>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <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" readonly="readonly" />
+                        <span asp-validation-for="WipInfo.WipNO" class="layui-bg-red"></span>
+                    </div>
+                    <label asp-for="WipInfo.LineID" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="WipInfo.LineID" asp-items="@ViewBag.LineInfoList" class="" disabled></select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.PlanQTY" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.PlanQTY" class="layui-input" autocomplete="off" readonly="readonly" />
+
+                    </div>
+                    <label class="layui-form-label">完成數量</label>
+                    <div class="layui-input-inline">
+                        <input class="layui-input" autocomplete="off" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.FlowRuleID" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="WipInfo.FlowRuleID" asp-items="@ViewBag.FlowRuleList" disabled class=""></select>
+                    </div>
+                    <label asp-for="WipInfo.StatusNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.StatusNO" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.OrderNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.OrderNO" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipInfo.WipSEQ" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.WipSEQ" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipInfo.CNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.CNO" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipInfo.BoxCNT" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.BoxCNT" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipAtt.ItemNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipAtt.ItemNO" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipAtt.ModelNO" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipAtt.ModelNO" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label asp-for="WipAtt.ECN" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipAtt.ECN" class="layui-input" readonly="readonly" />
+                    </div>
+                    <label asp-for="WipInfo.WipType" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <input asp-for="WipInfo.WipType" class="layui-input" readonly="readonly" />
+                    </div>
+                </div>
+            </div>
+
+
+        </fieldset>
+
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>內部條碼資料</legend>
+            <table id="MydataTable" class="layui-table" style="width:50%">
+                <thead>
+                    <tr>
+                        <th>
+                            起始生產條碼
+                        </th>
+
+                        <th>
+                            結束生產條碼
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (var index in Model.WipBarcodes)
+                    {
+                        <tr>
+                            <td>
+                                @index.StartNO
+                            </td>
+                            <td>
+                                @index.EndNO
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </fieldset>
+
+        <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+    </form>
+</div>
+
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+
+    <script type="text/javascript">
+        layui.use(['form'], function () {
+            var form = layui.form;
+        });
+
+
+    $(document).ready(function () {
+        var error = '@Html.ValidationMessage("error")';
+        if ($(error).text() != '') {
+            parent.hg.msg(error);
+        }
+            //关闭弹出层
+        if ('@ViewBag.Msg' != '') {
+        //hg.close();
+        hg.msg('@ViewBag.Msg');
+        }
+    });
+    </script>
+
+
+}
+

AMESCoreStudio.WebApi/Controllers/AMES/WipBarcodeOthersController.cs

@@ -89,7 +89,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         }
 
         /// <summary>
-        /// 新增工單條碼區間設定檔
+        /// 新增工單出貨條碼區間設定檔
         /// </summary>
         /// <param name="wipBarcodeOther"></param>
         /// <returns></returns>
@@ -116,7 +116,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         }
 
         /// <summary>
-        /// 更新工單條碼區間設定檔
+        /// 更新工單出貨條碼區間設定檔
         /// </summary>
         /// <param name="wipBarcodeOther"></param>
         /// <returns></returns>
@@ -150,5 +150,29 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return result;
         }
 
+        /// <summary>
+        /// 刪除工單出貨條碼區間
+        /// </summary>
+        /// <param name="wipno">工單號碼</param>
+        /// <param name="strno">起始區間</param>
+        /// <param name="endno">結束區間</param>
+        /// <returns></returns>
+        [HttpDelete("{wipno}/{strno}/{endno}")]
+        public async Task<ActionResult<WipBarcodeOther>> DeleteWipBarcodeOther(string wipno, string strno, string endno)
+        {
+            //var repairResponsibleUnits = await _context.BarcodeInfoes.FindAsync(id);
+            var wipBarcodeOther = await _context.WipBarcodeOthers.Where(m => m.WipNO == wipno
+                             && m.StartNO == strno
+                             && m.EndNO == endno).FirstOrDefaultAsync();
+            if (wipBarcodeOther == null)
+            {
+                return NotFound();
+            }
+
+            _context.WipBarcodeOthers.Remove(wipBarcodeOther);
+            await _context.SaveChangesAsync();
+
+            return wipBarcodeOther;
+        }
     }
 }

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -257,7 +257,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         CreateDate = q1.CreateDate,
                         itemNo = q2.ItemNO,
                         lineDesc = q3.LineDesc,
-                        unitName = q4.UnitName
+                        unitName = q4.UnitName,
+                        wipType = q1.WipType
                     };
 
 
@@ -292,6 +293,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 q = q.Where(w => w.itemNo == value.itemno);
             }
 
+            if (!string.IsNullOrWhiteSpace(value.wipType))
+            {
+                q = q.Where(w => w.wipType == value.wipType);
+            }
+
             // 紀錄筆數
             result.DataTotal = q.Count();
 

AMESCoreStudio.WebApi/DTO/AMES/WipInfoDto.cs

@@ -39,5 +39,10 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// 料號
         /// </summary>
         public string itemno { get; set; }
+
+        /// <summary>
+        /// 工單類型
+        /// </summary>
+        public string wipType { get; set; }
     }
 }

AMESCoreStudio.WebApi/DTO/AMES/WipQueryDto.cs

@@ -89,5 +89,10 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// 檢驗日
         /// </summary>
         public string fqcDate { get; set; }
+
+        /// <summary>
+        /// 工單類型
+        /// </summary>
+        public string wipType { get; set; }
     }
 }