1. 工單修改調整可以修改生產單位

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -87,6 +87,9 @@ namespace AMESCoreStudio.Web.Controllers
             if (string.IsNullOrWhiteSpace(model.wipInfo.UnitNO))
                 Msg += model.wipInfo.GetAttributeFrom<DisplayAttribute>(nameof(model.wipInfo.UnitNO)).Name + "，";
 
+            if (model.wipInfo.FlowRuleID == 0)
+                Msg += model.wipInfo.GetAttributeFrom<DisplayAttribute>(nameof(model.wipInfo.FlowRuleID)).Name + "，";
+
             if (model.wipInfo.WipDueDate == DateTime.MinValue)
                 Msg += model.wipInfo.GetAttributeFrom<DisplayAttribute>(nameof(model.wipInfo.WipDueDate)).Name + "，";
 
@@ -2613,39 +2616,40 @@ namespace AMESCoreStudio.Web.Controllers
                 wipDataViewModel.wipBarcodeOther = model.wipBarcodeOther;
                 var Msg = CheckWipInfoInsert(wipDataViewModel);
 
-                if (!string.IsNullOrWhiteSpace(Msg))
+                // 判斷是否有開重複工單+生產單位
+                var wipInfoQuery = await _pcsApi.GetWipInfoByWipNO(model.wipInfo.WipNO);
+                if (wipInfoQuery.Any())
                 {
-                    ModelState.AddModelError("error", Msg);
+                    if (wipInfoQuery.Where(w => w.UnitNO == model.wipInfo.UnitNO).Count() == 2)
-                    return View("PCS003", model);
+                    {
+                        Msg += "，同樣生產單位已建立相同工單了";
+                    }
                 }
 
                 // 判斷WipKp 順序是否重複
                 if (model.WipKps.Where(w => w.WipKpID != -1).GroupBy(g => g.KpSeq).Where(w => w.Count() > 1).Any())
                 {
-                    ModelState.AddModelError("error", "KeyParts 順序有重複");
+                    Msg += "，KeyParts 順序有重複 ";
-                    return View("PCS003", model);
+
                 }
 
                 // 判斷SOP是否沒填文件名稱
                 if (model.WipSops.Where(w => string.IsNullOrWhiteSpace(w.SOPName)).Any())
                 {
-                    ModelState.AddModelError("error", "SOP文件 請填寫SOP文件敘述");
+                    Msg += "，SOP文件 請填寫SOP文件敘述 ";
-                    return View("PCS003", model);
                 }
 
                 // 判斷MAC是否正確
                 var CheckMACMsg = CheckMACData(model);
                 if (!string.IsNullOrWhiteSpace(CheckMACMsg))
                 {
-                    ModelState.AddModelError("error", CheckMACMsg);
+                    Msg += "，" + CheckMACMsg;
-                    return View("PCS003", model);
                 }
 
                 // 判斷標籤 工單性質選擇 WipAttr非標96工單時，則旁邊欄位必填
                 if (model.wipLabel.WipAttr == "B" && string.IsNullOrWhiteSpace(model.wipLabel.NonstandardWoMemo))
                 {
-                    ModelState.AddModelError("error", "標籤:工單性質選擇非標96工單時，需填入資料");
+                    Msg += "，標籤:工單性質選擇非標96工單時，需填入資料";
-                    return View("PCS003", model);
                 }
 
                 // 判斷治具中生產單位與作業站吻合
@@ -2658,10 +2662,18 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (!RuleStation.Where(w => Outfits.StationID == w.StationID).Any())
                         {
-                            ModelState.AddModelError("error", "治具組合中生產單位與作業站不匹配");
+                            Msg += "，治具組合中生產單位與作業站不匹配";
-                            return View("PCS003", model);
+                        }
                     }
                 }
+
+                if (!string.IsNullOrWhiteSpace(Msg))
+                {
+                    if (Msg.StartsWith("，"))
+                        Msg = Msg.Substring(1, Msg.Length-1);
+
+                    ModelState.AddModelError("error", Msg);
+                    return View("PCS003", model);
                 }
 
                 // 修改工單數量大於原本數量

AMESCoreStudio.Web/Views/PCS/PCS001N.cshtml

@@ -532,9 +532,9 @@
                 , theme: 'grid'
             });
 
-            form.on('select(flow)', function (data) {
+            //form.on('select(flow)', function (data) {
-                RuleStation(data.value);
+            //    RuleStation(data.value);
-            });
+            //});
 
             form.on('select(unit)', function (data) {
                 $("#unitNo").val(data.value);

AMESCoreStudio.Web/Views/PCS/PCS003.cshtml

@@ -23,7 +23,6 @@
         <form id="formPCS003" enctype="multipart/form-data" method="post" asp-action="PCS003" class="layui-form">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <input asp-for="wipInfo.WipID" type="hidden" value="@Model.wipInfo.WipID" />
-            <input asp-for="wipInfo.UnitNO" type="hidden" value="@Model.wipInfo.UnitNO" />
             <input asp-for="wipInfo.WipNO" type="hidden" value="@Model.wipInfo.WipNO" />
             <input asp-for="wipAtt.ItemNO" type="hidden" value="@Model.wipAtt.ItemNO" />
             @*<input asp-for="wipInfo.FlowRuleID" type="hidden" value="@Model.wipInfo.FlowRuleID" />*@
@@ -107,7 +106,7 @@
                 <div class="layui-inline">
                     <label asp-for="wipInfo.UnitNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <select disabled lay-filter="unit" asp-for="wipInfo.UnitNO" asp-items="@ViewBag.FactoryUnitByWipNo" class=""></select>
+                        <select lay-filter="unit" asp-for="wipInfo.UnitNO" asp-items="@ViewBag.FactoryUnitByWipNo" class=""></select>
                     </div>
                     <input id="unitNo" type="hidden" asp-for="wipInfo.UnitNO" />
                     <label asp-for="wipInfo.LineID" class="layui-form-label"></label>
@@ -1155,7 +1154,7 @@
                 <text>$("#keyPartExcel").hide();</text>
             }
 
-            getLineInfoList($("#unitNo").val());
+            getLineInfoList($("#unit").val());
 
             // 產生條碼
             $('#GetBarCode').click(function () {
@@ -1354,7 +1353,18 @@
                 RuleStation(data.value);
             });
 
+            form.on('select(unit)', function (data) {
+                $("#unitNo").val(data.value);
+                var itemNo = $("#wipAtt_ItemNO").val();
+                getLineInfoList(data.value);
+                if (itemNo != '') {
+                    getFlowRuleList(data.value);
+                }
+            });
 
+            form.on('select(lind)', function (data) {
+                $("#lindId").val(data.value);
+            });
         });
 
         //通过行tool编辑，lay-event="show"