From 22f5ecb7903a67712d96919e604a30be0cb23902 Mon Sep 17 00:00:00 2001
From: Ray <raylin@aten.com>
Date: Tue, 7 Feb 2023 14:18:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=B7=A5=E5=96=AE=E6=A8=99=E7=B1=A4?=
 =?UTF-8?q?=E9=A1=AF=E7=A4=BA=E5=95=8F=E9=A1=8C=E4=BF=AE=E6=AD=A3=202.=20?=
 =?UTF-8?q?=E5=B7=A5=E5=96=AE=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=A9=A2=20?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=AE=8C=E5=B7=A5(E)=E5=8F=8A=E5=88=AA?=
 =?UTF-8?q?=E9=99=A4(C)=E7=8B=80=E6=85=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Controllers/PCSController.cs  | 16 +++++++++-------
 .../Controllers/AMES/WipInfosController.cs       | 10 +++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 7c63890a..393822af 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/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
-       {
-           Text = EnumPCS.GetDisplayName(s).ToString(),
-           Value = s.ToString(),
-           Selected = values.Where(v => v.Contains(s.ToString())).Count() != 0
-       }).ToList();
+               .Select(s => new SelectListItem
+               {
+                   Text = EnumPCS.GetDisplayName(s).ToString(),
+                   Value = s.ToString(),
+                   Selected = values.Where(v => v == s.ToString()).Count() != 0
+               }).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 });
         }
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index 11067edf..2d079be6 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/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 WiwipinfoByWipNo= await _context.WipInfos.Where(w => w.WipNO == wipinfos.FirstOrDefault().WipNO).ToListAsync();
+            var wipinfos = await _context.WipInfos.Where(w => w.WipID == id).FirstOrDefaultAsync();
+            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);