1. 修正工單治具顯示

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -2071,6 +2071,7 @@ namespace AMESCoreStudio.Web.Controllers
                 {
                     item.WipNo = model.wipInfo.WipNO;
                     item.ItemNo = model.wipAtt.ItemNO;
+                    item.OutfitNo = ".";
                     if (item.WipOutfitID == 0)
                         await _pcsApi.PostWipOutfit(JsonConvert.SerializeObject(item));
                     else
@@ -3476,6 +3477,7 @@ namespace AMESCoreStudio.Web.Controllers
                         {
                             OutfitNo = item.OutfitNo,
                             PartNo = item.PartNo,
+                            PartNoName = item.PartNoName,
                             StationName = item.StationName,
                             UnitNoName = item.UnitNoName
                         }
@@ -3501,6 +3503,9 @@ namespace AMESCoreStudio.Web.Controllers
             string Msg = string.Empty;
             bool Success = true;
             string Data = model.Input;
+            // 刷入條碼+異常欄位
+            if (!string.IsNullOrWhiteSpace(model.InputNo))
+                Data += "＠" + model.InputNo;
 
             string ExtNo = string.Empty;
 
@@ -3909,7 +3914,7 @@ namespace AMESCoreStudio.Web.Controllers
                 // await _pcsApi.CheckWipNoBarCodeAllClost(model.WipNO, model.UnitNO, model.RuleStation);
             }
 
-            return Json(new Result() { success = Success, msg = Msg, data = Data + "＠" + model.InputNo }); // 刷入條碼+異常欄位
+            return Json(new Result() { success = Success, msg = Msg, data = Data });
         }
         #endregion
 

AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml

@@ -822,10 +822,7 @@
                         <thead>
                             <tr>
                                 <th>
-                                    設備編碼
+                                    治具種類
-                                </th>
-                                <th>
-                                    設備名稱
                                 </th>
                                 <th>
                                     生產單位
@@ -839,10 +836,6 @@
                             @foreach (var index in Model.WipOutfits)
                             {
                             <tr>
-                                <td>
-
-                                    @index.OutfitNo
-                                </td>
                                 <td>
                                     @index.PartNoName
                                 </td>

AMESCoreStudio.Web/Views/PCS/PCS003.cshtml

@@ -898,10 +898,7 @@
                             <thead>
                                 <tr>
                                     <th>
-                                        設備編碼
+                                        治具種類
-                                    </th>
-                                    <th>
-                                        設備名稱
                                     </th>
                                     <th>
                                         生產單位
@@ -918,11 +915,9 @@
                                 @foreach (var index in Model.WipOutfits)
                                 {
                                     <tr>
+
                                         <td>
                                             <input name="WipOutfits[@l].WipOutfitID" type="hidden" value="@index.WipOutfitID" />
-                                            <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.OutfitNo" name="WipOutfits[@l].OutfitNo" />
-                                        </td>
-                                        <td>
                                             <select asp-for="@index.PartNo" name="WipOutfits[@l].PartNo" asp-items="@ViewBag.OutfitCommodityInfo" class=""></select>
                                         </td>
                                         <td>
@@ -1425,9 +1420,7 @@
 
 
             var contactdiv = '<tr>' +
-                '<td><input type="hidden" value="" name="WipOutfits[' + No + '].WipOutfitID" />' +
+                '<td><input type="hidden" value="" name="WipOutfits[' + No + '].WipOutfitID" />'+ SelectPartNo+'</td>'+
-                '<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipOutfits[' + No + '].OutfitNo" /></td>' +
-                '<td>' + SelectPartNo+'</td>' +
                 '<td>' + Select + '</td>' +
                 '<td>' + SelectStation + '</td>' +
                 '<td><a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a></td>' +

AMESCoreStudio.Web/Views/PCS/PCS021.cshtml

@@ -250,10 +250,7 @@
                                     <thead>
                                         <tr>
                                             <th>
-                                                設備編碼
+                                                治具種類
-                                            </th>
-                                            <th>
-                                                設備名稱
                                             </th>
                                             <th>
                                                 生產單位
@@ -270,13 +267,8 @@
                                         @foreach (var index in Model.wipOutfits)
                                         {
                                             <tr>
-
                                                 <td>
-                                                    <input type="text" class="layui-input" asp-for="@index.OutfitNo" name="wipOutfits[@k].OutfitNo" readonly="readonly" />
+                                                    <input type="text" class="layui-input" asp-for="@index.PartNoName" name="wipOutfits[@k].PartNoName" readonly="readonly" />
-                                                </td>
-                                                <td>
-
-                                                    <input type="text" class="layui-input" asp-for="@index.PartNo" name="wipOutfits[@k].PartNo" readonly="readonly" />
                                                 </td>
                                                 <td>
                                                     <input type="text" class="layui-input" asp-for="@index.UnitNoName" name="wipOutfits[@k].UnitNoName" readonly="readonly" />

AMESCoreStudio.WebApi/Models/AMES/WipOutfit.cs

@@ -43,11 +43,10 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 設備編碼
         /// </summary>
-        [Required]
         [Column("OUTFIT_NO")]
         [StringLength(15)]
         [DataMember]
-        public string OutfitNo { get; set; }
+        public string OutfitNo { get; set; } = ".";
 
         /// <summary>
         /// 設備名稱