1. 修正顯示錯誤

AMESCoreStudio.Web/Controllers/PCBController.cs

@@ -169,7 +169,7 @@ namespace AMESCoreStudio.Web.Controllers
 
             if (result.Success)
             {
-                var _msg = model.SteelPlateID == 0 ? "新增成功！" : "修改成功！";
+                var _msg = "新增量測記錄成功！";
                 return RedirectToAction("Refresh", "Home", new { msg = _msg });
             }
             else
@@ -186,7 +186,12 @@ namespace AMESCoreStudio.Web.Controllers
             return View("PCB013A", model);
         }
 
-
+        /// <summary>
+        /// 鋼板量測紀錄 View
+        /// </summary>
+        /// <param name="steelPlateID"></param>
+        /// <param name="steelPlateNo"></param>
+        /// <returns></returns>
         [HttpGet]
         public IActionResult PCB013V(int steelPlateID, string steelPlateNo)
         {

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -5662,7 +5662,7 @@ namespace AMESCoreStudio.Web.Controllers
         /// <returns></returns>
         public async Task<IActionResult> PCS022QueryAsync(string wipNo, string productNo, string unit, string type, int lineID = 0, int page = 0, int limit = 10)
         {
-            IResultModel<BarcodeInfoDto> result = await _pcsApi.GetBarcodeItemByPCS022Query(wipNo: wipNo,
+            IResultModel<BarcodeInfoDto> result = await _pcsApi.GetBarcodeInfoesByPCS022Query(wipNo: wipNo,
                 itemNo: productNo, unit: unit, lineID, page: page, limit: limit);
 
             if (result.Data.Count() != 0)

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -336,7 +336,7 @@ namespace AMESCoreStudio.Web
         /// <param name="limit">筆數</param>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/BarcodeInfoes/BarcodeInfoByPCS022")]
-        ITask<ResultModel<BarcodeInfoDto>> GetBarcodeItemByPCS022Query(string wipNo = null, string itemNo = null,
+        ITask<ResultModel<BarcodeInfoDto>> GetBarcodeInfoesByPCS022Query(string wipNo = null, string itemNo = null,
           string unit = null, int lineID = 0, int page = 0, int limit = 10);
         #endregion
 

AMESCoreStudio.Web/Views/PCB/PCB013V.cshtml

@@ -59,13 +59,14 @@
                 sort: true
             },
             {
-                field: 'userName',
+                field: 'createUserName',
                 title: '量測人員',
                 sort: true
             },
             {
                 field: 'createDate',
                 title: '量測時間',
+                width: 140,
                 sort: true,
                 templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
             }]

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs

@@ -236,7 +236,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 // 查詢工單號碼
                 if (!string.IsNullOrWhiteSpace(wipNo))
                 {
-                    var wipID = _context.WipInfos.Where(w => w.WipNO == wipNo.Trim().ToUpper()).Select(s => s.WipID).ToList();
+                    var wipID = _context.WipInfos.Where(w => w.WipNO == wipNo.Trim().ToUpper() && w.StatusNO != "E").Select(s => s.WipID).ToList();
                     barcodeInfos = await _context.BarcodeInfoes.Where(w => wipID.Contains(w.WipID)).ToListAsync();
                 }
                 // 查詢料號
@@ -247,7 +247,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     barcodeInfos = await _context.BarcodeInfoes.Where(w => wipID.Contains(w.WipID)).ToListAsync();
                 }
 
-                var q = from q1 in barcodeInfos
+                var q = from q1 in barcodeInfos.Where(w => w.RuleStatus != "S" && w.GetRuleStation.StationID != 1000)
                         join q2 in _context.RuleStations on q1.RuleStationID equals q2.RuleStationID
                         join q3 in _context.WipInfos on q1.WipID equals q3.WipID
                         join q4 in _context.LineInfoes on q3.LineID equals q4.LineID

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs

@@ -340,7 +340,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 // 查詢組件代碼
                 if (!string.IsNullOrWhiteSpace(KPItemNo))
                 {
-                    q = q.Where(w => w.KpItemNo == KPItemNo).ToList();
+                    q = q.Where(w => w.ItemNo == KPItemNo).ToList();
                 }
 
 

AMESCoreStudio.WebApi/Controllers/AMES/SteelPlateMeasureController.cs

@@ -88,7 +88,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 q = q.Skip((page - 1) * limit).Take(limit);
             }
 
-            result.Data = await q.OrderBy(o => o.CreateDate).ToListAsync();
+            result.Data = await q.OrderByDescending(o => o.CreateDate).ToListAsync();
             result.Data.Select(s => s.Status
          = Enum.EnumPCB.GetDisplayName((Enum.EnumPCB.EnumSteelPlateStatus)System.Enum.Parse(typeof(Enum.EnumPCB.EnumSteelPlateStatus), s.Status))).ToList();
             if (result == null)