1. 設備領用 新增測試桌號及工單料號顯示

AMESCoreStudio.Web/Controllers/JIGController.cs

@@ -179,6 +179,38 @@ namespace AMESCoreStudio.Web.Controllers
             ViewBag.OutfitFactoryList = GroupList;
         }
 
+        /// <summary>
+        /// 測試桌號
+        /// </summary>
+        /// <returns></returns>
+        private void GetTableNo()
+        {
+            var GroupList = new List<SelectListItem>();
+            GroupList.Add(new SelectListItem("Other", "Other"));
+            for (int i = 1; i <= 56; i++)
+            {
+                GroupList.Add(new SelectListItem("T" + i.ToString(), "T" + i.ToString()));
+            }
+            ViewBag.OutfitTableNo = GroupList;
+        }
+
+        /// <summary>
+        /// 工單號碼取工單號碼
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<JsonResult> getItemNo(string wipNo)
+        {
+            var result = await _pcsApi.GetWipAtt(wipNo);
+            //将数据Json化并传到前台视图
+            if (result == null)
+                return Json(new { data = "" });
+            else
+
+                return Json(new { data = result.ItemNO});
+        }
+
         //yiru add end
         #endregion
 
@@ -240,7 +272,8 @@ namespace AMESCoreStudio.Web.Controllers
 
                 }
             }
-            else {
+            else
+            {
 
                 ModelState.AddModelError("error", "缺少必填資料");
                 return View("JIG001C", model);
@@ -901,6 +934,7 @@ namespace AMESCoreStudio.Web.Controllers
             var result = await _jigApi.GetOutfitInfo(id);
             await GetDeptList();
             await GetUserInfo();
+            GetTableNo();
             ViewBag.OutfitID = id;
             ViewBag.OutfitNo = result[0].OutfitNo;
             ViewBag.QANo = result[0].QANo;
@@ -976,6 +1010,7 @@ namespace AMESCoreStudio.Web.Controllers
             var tt = await _jigApi.GetOutfitInfo(model.OutfitID);
             await GetDeptList();
             await GetUserInfo();
+            GetTableNo();
             ViewBag.StatusDate = System.DateTime.Now.ToString("yyyy-MM-dd");
             ViewBag.OutfitID = model.OutfitID;
             ViewBag.OutfitNo = tt[0].OutfitNo;
@@ -1045,6 +1080,7 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(new Table() { count = 0, data = null });
         }
 
+    
         #endregion
 
         #region JIG006設備送修/報廢相關

AMESCoreStudio.Web/Views/JIG/JIG005.cshtml

@@ -134,7 +134,7 @@
         //通过行tool编辑，lay-event="edit"
         function edit(obj) {
             if (obj.data.outfitID) {
-                hg.open('領用設備', '/JIG/JIG005B/' + obj.data.outfitID, 640, 480);
+                hg.open('領用設備', '/JIG/JIG005B/' + obj.data.outfitID, 640, 550);
             }
         }
 

AMESCoreStudio.Web/Views/JIG/JIG005B.cshtml

@@ -1,8 +1,10 @@
 @model AMESCoreStudio.WebApi.Models.AMES.OutfitStatusLog
 
 
-@{ ViewData["Title"] = "SPC005B";
-    Layout = "~/Views/Shared/_FormLayout.cshtml"; }
+@{
+    ViewData["Title"] = "SPC005B";
+    Layout = "~/Views/Shared/_FormLayout.cshtml";
+}
 
 
 <style>
@@ -40,6 +42,13 @@
                 </select>
                 <span asp-validation-for="StatusUserID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
+            <div class="form-group form-inline my-sm-1">
+                <label class="control-label col-sm-3">測試桌號</label>
+                <select id="StatusUserID" asp-for="TableNo" asp-items="@ViewBag.OutfitTableNo" class="custom-select col-sm-9">
+                    <option value="">請選擇</option>
+                </select>
+                <span asp-validation-for="StatusUserID" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
             <div class="form-group form-inline my-sm-1">
                 <label class="control-label col-sm-3">預計歸還日期</label>
                 <input asp-for="StatusDate" type="date" class="form-control col-sm-9" />
@@ -47,9 +56,13 @@
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="WipNo" class="control-label col-sm-3"></label>
-                <input asp-for="WipNo" class="form-control col-sm-9" />
+                <input asp-for="WipNo" class="form-control col-sm-9" onkeypress="if( event.keyCode == 13 ) { return false; }" onchange="getItemNo(this);" />
                 <span asp-validation-for="WipNo" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
+            <div class="form-group form-inline my-sm-1">
+                <label class="control-label col-sm-3">工程編號</label>
+                <input id="ItemNo" name="ItemNo" class="form-control col-sm-9" readonly="" />
+            </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="Remark" class="control-label col-sm-3"></label>
                 <input asp-for="Remark" class="form-control col-sm-9" />
@@ -65,8 +78,10 @@
 </div>
 
 @section Scripts {
-    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
-        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+    @{
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial");
+    }
 
     <script type="text/javascript">
         $(document).ready(function () {
@@ -112,6 +127,28 @@
             });
         };
 
+        //工程編號
+        function getItemNo(val) {
+            if (val.value.length != 0) {
+                $.ajax(
+                    {
+                        url: "@Url.Action("getItemNo", "JIG")",
+                        dataType: 'json',
+                        data: { "wipNo": val.value },
+                        type: 'post',
+                        success: function (result) {
+                            $("#ItemNo").val(result.data);
+                        },
+                        error: function (result) {
+                            alert(result);
+                        }
+                    });
+            }
+            else
+            {
+                $("#ItemNo").val('');
+            }
+        };
     </script>
 
 

AMESCoreStudio.WebApi/Models/AMES/OutfitStatusLog.cs

@@ -114,6 +114,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "工單")]
         public string WipNo { get; set; }
 
+        /// <summary>
+        /// 測試桌號
+        /// </summary>
+        [Column("TABLE_NO")]
+        [DataMember]
+        [Display(Name = "測試桌號")]
+        public string TableNo { get; set; }
+
         /// <summary>
         /// 創建者ID
         /// </summary>