1. 上傳

AMESCoreStudio.Web/Controllers/BASController.cs

@@ -192,6 +192,48 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(new { data = item });
         }
 
+        [HttpPost]
+        public async Task<JsonResult> GetUnitLineJson(string unit_no)
+        {
+            var result = await _basApi.GetLineInfoByUnit(unit_no);
+
+            var item = new List<SelectListItem>();
+
+            for (int i = 0; i < result.Count; i++)
+            {
+                item.Add(new SelectListItem(result[i].LineDesc, result[i].LineID.ToString()));
+            }
+
+            if (item.Count == 0)
+            {
+                item.Add(new SelectListItem("N/A", ""));
+            }
+
+            //将数据Json化并传到前台视图
+            return Json(new { data = item });
+        }
+
+        [HttpPost]
+        public async Task<JsonResult> GetStationsJson(string unit_no)
+        {
+            var result = await _basApi.GetStationsByUnit(unit_no);
+
+            var item = new List<SelectListItem>();
+
+            for (int i = 0; i < result.Count; i++)
+            {
+                item.Add(new SelectListItem(result[i].StationName, result[i].StationID.ToString()));
+            }
+
+            if (item.Count == 0)
+            {
+                item.Add(new SelectListItem("N/A", ""));
+            }
+
+            //将数据Json化并传到前台视图
+            return Json(new { data = item });
+        }
+
         #endregion
 
         #region BAS001工廠资料维护相关

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -51,6 +51,12 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 ProductTypes.Add(new SelectListItem(result[i].ProductTypeNO + "-" + result[i].ProductTypeName, result[i].ProductTypeID.ToString()));
             }
+
+            if (ProductTypes.Count == 0)
+            {
+                ProductTypes.Add(new SelectListItem("N/A", null));
+            }
+
             ViewBag.ProductTypesList = ProductTypes;
         }
 
@@ -67,6 +73,12 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 LineInfo.Add(new SelectListItem(result[i].LineID + "-" + result[i].LineDesc, result[i].LineID.ToString()));
             }
+
+            if (LineInfo.Count == 0)
+            {
+                LineInfo.Add(new SelectListItem("N/A", null));
+            }
+
             ViewBag.LineInfoList = LineInfo;
         }
 
@@ -83,6 +95,12 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 FactoryInfo.Add(new SelectListItem(result[i].FactoryNo + "-" + result[i].FactoryNameCh, result[i].FactoryID.ToString()));
             }
+
+            if (FactoryInfo.Count == 0)
+            {
+                FactoryInfo.Add(new SelectListItem("N/A", null));
+            }
+
             ViewBag.FactoryInfoList = FactoryInfo;
         }
 
@@ -92,13 +110,19 @@ namespace AMESCoreStudio.Web.Controllers
         /// <returns></returns>
         private async Task GetFactoryUnit()
         {
-            var result = await _pcsApi.GetFactoryUnit();
+            var result = await _basApi.GetFactoryUnits();
 
             var FactoryUnit = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
             {
                 FactoryUnit.Add(new SelectListItem(result[i].UnitName, result[i].UnitNo.ToString()));
             }
+
+            if (FactoryUnit.Count == 0)
+            {
+                FactoryUnit.Add(new SelectListItem("N/A", null));
+            }
+
             ViewBag.FactoryUnitList = FactoryUnit;
         }
 
@@ -115,6 +139,12 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 MFGType.Add(new SelectListItem(result[i].MFGTypeName, result[i].MFGTypeNO.ToString()));
             }
+
+            if (MFGType.Count == 0)
+            {
+                MFGType.Add(new SelectListItem("N/A", null));
+            }
+
             ViewBag.MFGTypeList = MFGType;
         }
 
@@ -131,6 +161,12 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 ProcessType.Add(new SelectListItem(result[i].ProcessTypeName, result[i].ProcessTypeNO.ToString()));
             }
+
+            if (ProcessType.Count == 0)
+            {
+                ProcessType.Add(new SelectListItem("N/A", null));
+            }
+
             ViewBag.ProcessTypeList = ProcessType;
         }
 
@@ -161,6 +197,12 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 Stations.Add(new SelectListItem(result[i].StationName, result[i].StationID.ToString()));
             }
+
+            if (Stations.Count == 0)
+            {
+                Stations.Add(new SelectListItem("N/A", null));
+            }
+
             ViewBag.GetStationsList = Stations;
         }
 
@@ -173,11 +215,16 @@ namespace AMESCoreStudio.Web.Controllers
             var result = await _basApi.GetFlowRules();
 
             var FlowRuleItems = new List<SelectListItem>();
-            FlowRuleItems.Add(new SelectListItem("N/A", "0"));
             for (int i = 0; i < result.Count; i++)
             {
                 FlowRuleItems.Add(new SelectListItem(result[i].UnitNo + result[i].FlowRuleName, result[i].FlowRuleID.ToString()));
             }
+
+            if (FlowRuleItems.Count == 0)
+            {
+                FlowRuleItems.Add(new SelectListItem("N/A", null));
+            }
+
             ViewBag.FlowRuleList = FlowRuleItems;
         }
 
@@ -560,7 +607,7 @@ namespace AMESCoreStudio.Web.Controllers
 
 
         #region PCS001 工單資料維護
-        public async Task<IActionResult> PCS001()
+        public async Task<IActionResult> PCS001(WipAllViewModel model = null)
         {
             await GetProductType();
             await GetFactoryInfo();
@@ -584,12 +631,12 @@ namespace AMESCoreStudio.Web.Controllers
 
             //var result = new WipAllViewModel();
             //return View(result);
-            return View();
+            return View(model);
         }
 
         //頁面提交，id=0 添加，id>0 修改
         [HttpPost]
-        public async Task<IActionResult> PCS001SaveAsync(WipAllViewModel model)
+        public async Task<IActionResult> PCS001Async(WipAllViewModel model)
         {
             IResultModel result;
             // Checkbox轉換
@@ -621,28 +668,23 @@ namespace AMESCoreStudio.Web.Controllers
                 result = await _pcsApi.PostWipInfo(JsonConvert.SerializeObject(model.WipInfo));
             }
 
-            //if (!result.Success)
+            if (!result.Success)
-            //{
+            {
-            //    var _msg = model.WipInfo.WipID == 0 ? "添加成功！" : "修改成功！";
+                var _msg = model.WipInfo.WipID == 0 ? "添加成功！" : "修改成功！";
-            //    return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                return RedirectToAction("Refresh", "Home", new { msg = _msg });
-            //}
+            }
-            //else
+            else
-            //{
+            {
-            //    if (result.Errors.Count > 0)
+                if (result.Errors.Count > 0)
-            //    {
+                {
-            //        ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
+                    ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
-            //    }
+                }
-            //    else
+                else
-            //    {
-            //        ModelState.AddModelError("error", result.Msg);
-            //    }
-            //}
-            //}
-            if (model.WipInfo.WipID == 0)
                 {
-                return View("PCS001", model);
+                    ModelState.AddModelError("error", result.Msg);
+                }
             }
-            return View("PCS001", model);
+            return View();
         }
 
         public async Task<IActionResult> PCS001R(string id)
@@ -702,11 +744,11 @@ namespace AMESCoreStudio.Web.Controllers
         /// <returns></returns>
         public async Task<IActionResult> PCS004QueryAsync(string unitno, string wipno)
         {
-            var result = await _pcsApi.GetWipInfoSelectParameter(unitno, wipno);
+            IResultModel<dynamic> result = await _pcsApi.GetWipInfoSelectParameter(unitno, wipno);
-
+            var aa = Json(new Table() { code = 0, msg = "", data = result.Data, count = 0 });
-            if (result.Count > 0)
+            if (result.Data != null)
             {
-                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+                return Json(new Table() { code = 0, msg = "", data = result.Data, count = 0 });
             }
             return Json(new Table() { count = 0, data = null });
         }
@@ -802,17 +844,17 @@ namespace AMESCoreStudio.Web.Controllers
         public async Task<IActionResult> PCS006QueryAsync()
         {
             // 工單基本資料
-            var result_Info = await _pcsApi.GetWipInfoSelectParameter();
+            IResultModel<dynamic> result = await _pcsApi.GetWipInfoSelectParameter();
             // 工單狀態
             var result_StatusType = await _ppsApi.GetWipStatus();
-            List<dynamic> result = new List<dynamic>();
+            List<dynamic> result_dy = new List<dynamic>();
-            foreach (var item in result_Info)
+            foreach (var item in result.Data)
             {
                 // 判斷是否開線資料
                 var result_LineInfo = await _pcsApi.GetLineInfoByWipID(item.WipID);
                 // 用工單ID抓最新一筆Log紀錄
                 var result_Log = await _pcsApi.GetWipLog(item.WipID);
-                result.Add(new
+                result_dy.Add(new
                 {
                     item.WipID,
                     item.WipNO,
@@ -826,9 +868,9 @@ namespace AMESCoreStudio.Web.Controllers
             }
 
 
-            if (result.Count > 0)
+            if (result_dy.Count > 0)
             {
-                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+                return Json(new Table() { code = 0, msg = "", data = result, count = result_dy.Count });
             }
             return Json(new Table() { count = 0, data = null });
         }
@@ -935,6 +977,18 @@ namespace AMESCoreStudio.Web.Controllers
         }
         #endregion
 
+
+        #region PCS021 條碼輸入作業
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> PCS021()
+        {
+            await GetFactoryUnit();
+            await GetLineInfo();
+            return View();
+        }
+        #endregion
+
         [HttpPost]
         public JsonResult TestFunc(string number)
         {

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using WebApiClient;
 using WebApiClient.Attributes;
 using AMESCoreStudio.WebApi;
@@ -63,7 +64,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpPost("api/WipInfos")]
-        ITask<ResultModel<string>> PostWipInfo([FromBody, RawJsonContent] string model);
+        ITask<ResultModel<WipInfo>> PostWipInfo([FromBody, RawJsonContent] string model);
 
         /// <summary>
         /// 查詢工單基本資料
@@ -79,7 +80,8 @@ namespace AMESCoreStudio.Web
         /// <param name="wipno">工單號碼</param>
         /// <returns></returns>
         [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);
 
         /// <summary>
         /// 查詢工單基本資料-WipID

AMESCoreStudio.Web/ViewModels/WipAllViewModel.cs

@@ -14,5 +14,9 @@ namespace AMESCoreStudio.Web.ViewModels
 
         public WipBarcode WipBarcode { get; set; }
 
+        public LineInfo LineInfo { get; set; }
+
+        public FactoryUnit FactoryUnit { get; set; }
+
     }
 }

AMESCoreStudio.Web/Views/Home/Framework.cshtml

@@ -208,6 +208,9 @@
                             <li class="sub-tab" hg-title="工單對應站別鎖定" hg-nav="/PCS/PCS010">
                                 <a><i class="fa fa-comment-o fa-fw"></i><cite>工單對應站別鎖定</cite></a>
                             </li>
+                            <li class="sub-tab" hg-title="條碼輸入作業" hg-nav="/PCS/PCS021">
+                                <a><i class="fa fa-comment-o fa-fw"></i><cite>條碼輸入作業</cite></a>
+                            </li>
                         </ul>
                     </li>
                 </ul>

AMESCoreStudio.Web/Views/PCS/PCS001.cshtml

@@ -16,7 +16,7 @@
 
 <div class="layui-card">
     <div class="col-sm-12">
-        <form enctype="multipart/form-data" method="post" asp-action="PCS001Save" class="layui-form">
+        <form enctype="multipart/form-data" method="post" asp-action="PCS001" 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="判斷前製程是否已經投入" />
@@ -91,12 +91,18 @@
                 <div class="layui-inline">
                     <label asp-for="WipInfo.UnitNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <select asp-for="WipInfo.UnitNO" asp-items="@ViewBag.FactoryUnitList" class=""></select>
+                        <select lay-filter="unit" asp-for="WipInfo.UnitNO" asp-items="@ViewBag.FactoryUnitList" class=""></select>
                     </div>
+                    <input id="unitNo" type="hidden" name="unitNo" value="0" />
                     <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=""></select>
+                        <select lay-filter="lind" asp-for="WipInfo.LineID" asp-items="@ViewBag.LineInfoList" class="">
+                        </select>
+                        <span asp-validation-for="WipInfo.LineID" class="layui-bg-red"></span>
                     </div>
+
+                    <input id="lindID" type="hidden" name="lindID" value="" />
+
                     <label asp-for="WipInfo.RelatedWONO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <input asp-for="WipInfo.RelatedWONO" class="layui-input" placeholder="請輸入關聯工單/客戶工單" />
@@ -216,8 +222,9 @@
                             <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" class=""></select>
+                                    <select lay-filter="flow" asp-for="WipInfo.FlowRuleID" asp-items="@ViewBag.FlowRuleList" class=""></select>
                                 </div>
+                                <input id="flowId" type="hidden" name="flowId" value="" />
                             </div>
                         </div>
                     </div>
@@ -781,6 +788,56 @@
         await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
 
     <script type="text/javascript">
+           function getFlowRuleList(data)
+        {
+            $.ajax(
+                {
+                    url: "@Url.Action("GetFlowRuleJson", "BAS")",
+                    dataType: 'json',
+                    data: { "unit_no": $("#unitNo").val()},
+                    type: 'post',
+                    success: function (result)
+                    {
+                        console.info(result.data);
+                        $("#WipInfo_FlowRuleID").empty();//清空下拉框的值
+                        $.each(result.data, function (index, item) {
+                            $("#WipInfo_FlowRuleID").append($("<option>").text(item.text).val(item.value))
+                        });
+
+                        layui.form.render("select");//重新渲染 固定写法
+                    },
+                    error: function (result)
+                    {
+                        alert(result);
+                    }
+                });
+        };
+
+    function getLineInfoList(data)
+        {
+            $.ajax(
+                {
+                    url: "@Url.Action("GetUnitLineJson", "BAS")",
+                    dataType: 'json',
+                    data: { "unit_no": $("#unitNo").val()},
+                    type: 'post',
+                    success: function (result)
+                    {
+                        console.info(result.data);
+                        $("#WipInfo_LineID").empty();//清空下拉框的值
+                        $.each(result.data, function (index, item) {
+                            $("#WipInfo_LineID").append($("<option>").text(item.text).val(item.value))
+                        });
+                        $("#WipInfo_LineID option:eq(1)").attr("selected", 'selected'); //默认选择第一个选项
+                        layui.form.render("select");//重新渲染 固定写法
+                    },
+                    error: function (result)
+                    {
+                        alert(result);
+                    }
+                });
+        };
+
             layui.use(['form','laydate'], function () {
             var form = layui.form,
                 laydate = layui.laydate;
@@ -798,6 +855,21 @@
                 , format: 'yyyy/MM/dd'
                 , theme: 'grid'
             });
+
+                form.on('select(unit)', function (data) {
+                    $("#unitNo").val(data.value);
+                    getFlowRuleList(data.value);
+                    getLineInfoList(data.value);
+                });
+
+                form.on('select(flow)', function (data) {
+                    $("#flowId").val(data.value);
+                });
+
+                form.on('select(lind)', function (data) {
+                    $("#lindId").val(data.value);
+                });
+
             });
             $(document).ready(function () {
             var error = '@Html.ValidationMessage("error")';

AMESCoreStudio.Web/Views/PCS/PCS004.cshtml

@@ -34,7 +34,8 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">生產單位:</label>
                     <div class="layui-input-inline">
-                        <select id="unit" lay-filter="unit" lay-verify="required" lay-submit asp-items="@ViewBag.FactoryUnitList">
+                        <select id="unit" lay-filter="unit" lay-submit asp-items="@ViewBag.FactoryUnitList">
+                            <option value="">全部</option>
                         </select>
                         <input id="unitNo" type="hidden" name="unitNo" value="0" />
                     </div>

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.WebApi.DTO.AMES;
+using AMESCoreStudio.CommonTools.Result;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -91,9 +92,26 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <returns></returns>
         [Route("[action]")]
         [HttpGet]
-        public async Task<ActionResult<IEnumerable<WipInfo>>> GetWipInfoSelectParameter([FromQuery] WipInfoDto value)
+        public async Task<ResultModel<dynamic>> GetWipInfoSelectParameter([FromQuery] WipInfoDto value)
         {
-            IQueryable<WipInfo> q = _context.WipInfos;
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+            var q = from q1 in _context.WipInfos
+                    join q2 in _context.WipAtts on q1.WipNO equals q2.WipNO
+                    join q3 in _context.LineInfoes on q1.LineID equals q3.LineID
+                    join q4 in _context.FactoryUnits on q1.UnitNO equals q4.UnitNo
+                    select new
+                    {
+                        q1.WipID,
+                        q1.WipNO,
+                        q1.PlanQTY,
+                        q1.UnitNO,
+                        q1.LineID,
+                        q1.StatusNO,
+                        q1.CreateDate,
+                        q2.ItemNO,
+                        q3.LineDesc,
+                        q4.UnitName
+                    };
 
             if (!string.IsNullOrWhiteSpace(value.unitno))
             {
@@ -105,14 +123,38 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 q = q.Where(w => w.WipNO == value.wipno);
             }
 
-            var WipInfo = await q.ToListAsync();
+            if (value.lineid != 0)
+            {
+                q = q.Where(w => w.LineID == value.lineid);
+            }
 
-            if (WipInfo == null)
+            if (value.date_str != null)
             {
-                return NotFound();
+                q = q.Where(w => w.CreateDate >= value.date_str);
             }
 
-            return WipInfo;
+            if (value.date_end != null)
+            {
+                q = q.Where(w => w.CreateDate <= value.date_end);
+            }
+
+            if (value.itemno != null)
+            {
+                q = q.Where(w => w.ItemNO == value.itemno);
+            }
+
+           result.Data = await q.ToListAsync();
+
+            if (result == null)
+            {
+                result.Msg = "查無資料";
+                result.Success = false;
+                return result;
+            }
+
+            result.Success = true;
+            result.Msg = "OK";
+            return result;
         }
 
         /// <summary>

AMESCoreStudio.WebApi/Controllers/BAS/StationsesController.cs

@@ -106,7 +106,6 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
         }
 
 
-
         /// <summary>
         /// 更新站別资料
         /// </summary>

AMESCoreStudio.WebApi/DTO/AMES/WipInfoDto.cs

@@ -20,6 +20,24 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// </summary>
         public string unitno { get; set; }
 
+        /// <summary>
+        /// 線別ID
+        /// </summary>
+        public int lineid { get; set; } = 0;
+
+        /// <summary>
+        /// 日期查詢開始
+        /// </summary>
+        public DateTime? date_str { get; set; }
 
+        /// <summary>
+        /// 日期查詢結束
+        /// </summary>
+        public DateTime? date_end { get; set; }
+
+        /// <summary>
+        /// 料號
+        /// </summary>
+        public string itemno { get; set; }
     }
 }

AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs

@@ -54,8 +54,9 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("LINE_ID")]
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
+        [Range(1, int.MaxValue)]
         [Display(Name = "線別ID")]
-        public decimal LineID { get; set; }
+        public int? LineID { get; set; }
 
         /// <summary>
         /// 生產單位
@@ -73,7 +74,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "產品別")]
-        public decimal ProductTypeID { get; set; } = 1;
+        public int ProductTypeID { get; set; } = 1;
 
         /// <summary>
         /// 業務

AMESCoreStudio.WebApi/Models/AMESContext.cs

@@ -245,6 +245,15 @@ namespace AMESCoreStudio.WebApi
         public DbSet<WipLog> WipLogs { get; set; }
 
 
+        /// <summary>
+        /// 工單投產纪錄資料文件
+        /// </summary>
+        public DbSet<NGGroup> NGGroups { get; set; }
+
+        /// <summary>
+        /// 工單投產纪錄資料文件
+        /// </summary>
+        public DbSet<NGClass> NGClasses { get; set; }
     }
 
 }

AMESCoreStudio.WebApi/Models/BAS/FlowRule.cs

@@ -78,16 +78,6 @@ namespace AMESCoreStudio.WebApi.Models.BAS
         [DataMember]
         public string FlowType { get; set; }
 
-        /// <summary>
-        /// 工單屬性
-        /// </summary>
-        [Column("PROCESS_TYPE_NO")]
-        [DataMember]
-        [Display(Name = "工單屬性")]
-        [Required(ErrorMessage = "{0},不能空白")]
-        [StringLength(1, ErrorMessage = "{0},不能大于{1}")]
-        public string ProcessTypeNo { get; set; }
-
         /// <summary>
         /// 建立人員
         /// </summary>