1. 工單標籤顯示問題修正

2. 工單修改查詢 排除完工(E)及刪除(C)狀態

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -956,12 +956,12 @@ namespace AMESCoreStudio.Web.Controllers
                 values = SelectedValue.Split(',').ToList();
             }
             var q = Enum.GetValues(typeof(EnumPCS.EnumApproveLogo)).Cast<EnumPCS.EnumApproveLogo>()
-       .Select(s => new SelectListItem
+               .Select(s => new SelectListItem
-       {
+               {
-           Text = EnumPCS.GetDisplayName(s).ToString(),
+                   Text = EnumPCS.GetDisplayName(s).ToString(),
-           Value = s.ToString(),
+                   Value = s.ToString(),
-           Selected = values.Where(v => v.Contains(s.ToString())).Count() != 0
+                   Selected = values.Where(v => v == s.ToString()).Count() != 0
-       }).ToList();
+               }).ToList();
 
             ViewBag.GetCheckboxApproveLogo = q;
         }
@@ -3921,6 +3921,8 @@ namespace AMESCoreStudio.Web.Controllers
                 , page: page
                 , limit: limit);
 
+            result.Data.Where(w => w.statusNo != "E" && w.statusNo != "C");
+
             if (result.Data != null)
             {
                 return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
@@ -4266,7 +4268,7 @@ namespace AMESCoreStudio.Web.Controllers
 
             if (result.Data != null)
             {
-                return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
+                return Json(new Table() { code = 0, msg = "", data = result.Data.Where(w => w.statusNo != "E" && w.statusNo != "C"), count = result.DataTotal });
             }
             return Json(new Table() { count = 0, data = null });
         }

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -1248,10 +1248,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             ResultModel<WipInfo> result = new ResultModel<WipInfo>();
 
-            var wipinfos = await _context.WipInfos.Where(w => w.WipID == id).ToListAsync();
+            var wipinfos = await _context.WipInfos.Where(w => w.WipID == id).FirstOrDefaultAsync();
-            var WiwipinfoByWipNo= await _context.WipInfos.Where(w => w.WipNO == wipinfos.FirstOrDefault().WipNO).ToListAsync();
+            var WiwipinfoByWipNo= await _context.WipInfos.Where(w => w.WipNO == wipinfos.WipNO).ToListAsync();
             _context.WipInfos.RemoveRange(wipinfos);
 
+            var wipBarcode = await _context.WipBarcodes.Where(w => w.WipNO == wipinfos.WipNO && w.UnitNO == wipinfos.UnitNO).ToListAsync();
+            _context.WipBarcodes.RemoveRange(wipBarcode);
+
             if (WiwipinfoByWipNo.Count() == 1)
             {
                 var WipNo = WiwipinfoByWipNo.FirstOrDefault().WipNO;
@@ -1270,9 +1273,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 var wipLabel = await _context.WipLabels.Where(w => w.WipNO == WipNo).ToListAsync();
                 _context.WipLabels.RemoveRange(wipLabel);
 
-                var wipBarcode = await _context.WipBarcodes.Where(w => w.WipNO == WipNo).ToListAsync();
-                _context.WipBarcodes.RemoveRange(wipBarcode);
-
                 var wipBarcodeOther = await _context.WipBarcodeOthers.Where(w => w.WipNO == WipNo).ToListAsync();
                 _context.WipBarcodeOthers.RemoveRange(wipBarcodeOther);