1.

3 years ago · 15c639586f
3 changed files with 88 additions and 13 deletions
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@ -1537,6 +1537,7 @@ namespace AMESCoreStudio.Web.Controllers
            var model = new PCS021ViewModel();
            await GetFactoryUnit();
            await GetLineInfo();
+            await GetStations();
            return View(model);
        }

@ -1545,9 +1546,40 @@ namespace AMESCoreStudio.Web.Controllers
        {
            await GetFactoryUnit();
            await GetLineInfo();
-            model.WipNO = "WO0001A1";
+            await GetStations();
+
+
+            if (string.IsNullOrWhiteSpace(model.WipNO))
+            {
+                ModelState.AddModelError("error", "請輸入工單號碼");
+            }
+
+            if (string.IsNullOrWhiteSpace(model.UnitNO))
+            {
+                ModelState.AddModelError("error", "請選擇生產單位");
+            }
+
+            if (model.LineID == 0)
+            {
+                ModelState.AddModelError("error", "請選擇線別");
+            }
+
+            if (string.IsNullOrWhiteSpace(model.Station))
+            {
+                ModelState.AddModelError("error", "請選擇作業站");
+            }
+
+
+            //model.WipNO = "WO0001A1";
            var q = await _pcsApi.GetWipInfoByWipNO(model.WipNO);
+
+            if (q.Count() == 0)
+            {
+                ModelState.AddModelError("error", "找不到工單號碼");
+            }
+
            q = q.Where(w => w.UnitNO == model.UnitNO).ToList();
+
            if (q.Count != 0)
            {
                model.PlanQTY = q.FirstOrDefault().PlanQTY;
@ -1560,8 +1592,18 @@ namespace AMESCoreStudio.Web.Controllers
                if (model.MaterialItem != null)
                {
                    model.MaterialKps = await _pcsApi.GetMaterialKpByItemID(model.MaterialItem.ItemID);
-                    model.MaterialOutfits = await _pcsApi.GetMaterialOutfitByItemID(model.MaterialItem.ItemID);
                    model.MaterialStationsItems = await _pcsApi.GetMaterialStationsItemByItemID(model.MaterialItem.ItemID);
+                    var q1 = await _pcsApi.GetMaterialOutfitByItemID(model.MaterialItem.ItemID);
+                    foreach (var item in q1)
+                    {
+                        model.MaterialOutfits.Add(new MaterialOutfits
+                        {
+                            ItemID = item.ItemID,
+                            MaterialOutfitID = item.MaterialOutfitID,
+                            OutfitNo = item.OutfitNo
+                        }
+                       );
+                    }
                }

                var wipsop = await _pcsApi.GetWipSopLog(q.FirstOrDefault().WipID);
@ -1572,12 +1614,22 @@ namespace AMESCoreStudio.Web.Controllers

                model.Input = "1234";
            }
+
            return View("PCS021", model);
        }

        [HttpPost]
-        public IActionResult PCS021_Input(PCS021ViewModel model)
+        public async Task<IActionResult> PCS021_Input(PCS021ViewModel model)
        {
+            if (model.MaterialOutfits.Where(w => string.IsNullOrWhiteSpace(w.Inputs)).Any())
+                ModelState.AddModelError("error", "請刷入治具編號");
+
+            //model.Inputs = TempData["TmpData"] as List<string>;
+            var aa = TempData["TmpData"];
+            model.Inputs.Add(model.Input);
+            TempData["TmpData"] = model.Inputs;
+
+            //var aa = TempData["TmpData"];
            //await GetFactoryUnit();
            //await GetLineInfo();
            //model.WipInfo.WipNO = "WO0001A1";
--- a/AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs
+++ b/AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs
@ -31,7 +31,7 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
        public string UnitNO { get; set; } 

        /// <summary>
-        /// 作業暫
+        /// 作業站
        /// </summary>
        public string Station { get; set; }

@ -53,7 +53,8 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
        /// <summary>
        /// input
        /// </summary>
-        public List<string> Inputs { get; set; }
+
+        public List<string> Inputs { get; set; } = new List<string>();

        /// <summary>
        /// 料號相關資料 治具 工項 keyparts
@ -68,11 +69,16 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
        /// <summary>
        /// 料號治具資訊
        /// </summary>
-        public List<MaterialOutfit> MaterialOutfits { get; set; } = new List<MaterialOutfit>();
+        public List<MaterialOutfits> MaterialOutfits { get; set; } = new List<MaterialOutfits>();

        /// <summary>
        /// 站別工項資料檔
        /// </summary>
        public List<MaterialStationsItem> MaterialStationsItems { get; set; } = new List<MaterialStationsItem>();
    }
+
+    public class MaterialOutfits : MaterialOutfit
+    {
+        public string Inputs { get; set; }
+    }
 }
--- a/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
@ -70,7 +70,7 @@
                                            <input id="unitNo" type="hidden" name="unitNo" value="0" />
                                            <label class="layui-form-label">線別：</label>
                                            <div class="layui-input-inline" style="width:100px">
-                                                <select id="line" lay-filter="line" lay-verify="required" lay-submit>
+                                                <select id="line" lay-filter="line" lay-verify="required" asp-for="LineID" lay-submit>
                                                </select>
                                            </div>
                                            <input id="lineId" type="hidden" name="lineId" value="0" />
@ -79,11 +79,12 @@
                                    <div class="layui-form-item">

                                    </div>
+
                                    <div class="layui-form-item">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">作業站：</label>
                                            <div class="layui-input-inline" style="width:100px">
-                                                <select id="stations" lay-filter="stations" lay-verify="required" lay-submit>
+                                                <select id="stations" lay-filter="stations" lay-verify="required" asp-for="Station" lay-submit>
                                                </select>
                                            </div>
                                            <input id="stationsId" type="hidden" name="stationsId" value="0" />
@ -116,7 +117,7 @@
                                            <label class="layui-form-label">刷讀條碼：</label>
                                            <div class="layui-input-inline">
                                                <input type="text" onkeydown="input(event);" id="inpputtxt" asp-for="Input" class="layui-input" autocomplete="off" />
-                                                <span id="txtNamaPetugas"></span>
+                                                TmpData:@TempData["TmpData"]
                                            </div>
                                        </div>
                                    </div>
@ -124,6 +125,7 @@
                                <fieldset class="layui-elem-field layui-field-title">
                                    <legend style="color: #e18917">檢查項目</legend>
                                    <table id="MydataTable" class="layui-table">
+                                        @{ int i = 0;}
                                        <thead>
                                            <tr>
                                                <th>
@ -148,11 +150,13 @@
                                                        @index.StationsItemNo
                                                    </td>
                                                    <td>
-                                                        @index.StationsItemDesc
+                                                        <input asp-for="@index.StationsItemDesc" name="MaterialStationsItems[@i].StationsItemDesc" />
                                                    </td>
                                                </tr>
+                                                i++;
                                            }
                                        </tbody>
+
                                    </table>
                                </fieldset>
                                <fieldset class="layui-elem-field layui-field-title">
@ -214,6 +218,7 @@
                            </div>
                            <div class="layui-tab-item">
                                <table id="MydataTable" class="layui-table">
+                                    @{int j = 0;}
                                    <thead>
                                        <tr>
                                            <th>
@ -238,10 +243,13 @@
                                                    @index.StationType
                                                </td>
                                                <td>
+                                                    <input asp-for="@index.Inputs" name="MaterialOutfits[@j].Inputs" />
                                                </td>
                                            </tr>
+                                            j++;
                                        }
                                    </tbody>
+
                                </table>
                            </div>
                        </div>
@ -260,9 +268,18 @@
        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
    <script type="text/javascript" src="~/js/grids.min.js"></script>
    <script type="text/javascript">
+           $(document).ready(function () {
+        var error = '@Html.ValidationMessage("error")';
+        if ($(error).text() != '') {
+            parent.hg.msg(error);
+        }
+    });
+
        // Jquery 將兩邊DIV設定同高度
        jQuery(function ($) {
            $('.element').responsiveEqualHeightGrid();
+            getFlowRuleList($("#unit").val());
+            getStationsList($("#unit").val());
        });

        function getFlowRuleList(data)
@ -271,7 +288,7 @@
                {
                    url: "@Url.Action("GetUnitLineJson", "BAS")",
                    dataType: 'json',
-                    data: { "unit_no": $("#unitNo").val()},
+                    data: { "unit_no": $("#unit").val()},
                    type: 'post',
                    success: function (result)
                    {
@ -296,7 +313,7 @@
                {
                    url: "@Url.Action("GetStationsJson", "BAS")",
                    dataType: 'json',
-                    data: { "unit_no": $("#unitNo").val()},
+                    data: { "unit_no": $("#unit").val()},
                    type: 'post',
                    success: function (result)
                    {