1. 修改工單刪除判斷

AMESCoreStudio.Web/Views/PCS/PCS002.cshtml

@@ -170,7 +170,7 @@
             hg.confirm("確定要删除工單號碼【" + obj.data.wipNo + "】嗎？", function () {
                 $.ajax({
                     url: '/PCS/PCS005D',
-                    data: { id: obj.data.wipNo },
+                    data: { id: obj.data.wipID },
                     type: 'POST',
                     success: function (data) {
                         if (data.success) {

AMESCoreStudio.Web/Views/PCS/PCS005.cshtml

@@ -190,7 +190,7 @@
             hg.confirm("確定要删除工單號碼【" + obj.data.wipNO + "】嗎？", function () {
                 $.ajax({
                     url: '/PCS/PCS005D',
-                    data: { id: obj.data.wipNO },
+                    data: { id: obj.data.wipID },
                     type: 'POST',
                     success: function (data) {
                         if (data.success) {

AMESCoreStudio.Web/Views/PCS/PCS035.cshtml

@@ -191,7 +191,7 @@
             hg.confirm("確定要删除工單號碼【" + obj.data.wipNO + "】嗎？", function () {
                 $.ajax({
                     url: '/PCS/PCS005D',
-                    data: { id: obj.data.wipNO },
+                    data: { id: obj.data.wipID },
                     type: 'POST',
                     success: function (data) {
                         if (data.success) {

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -1244,46 +1244,50 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <param name="id">工單號碼</param>
         /// <returns></returns>
         [HttpDelete("{id}")]
-        public async Task<ResultModel<WipInfo>> DeleteWipinfo(string id)
+        public async Task<ResultModel<WipInfo>> DeleteWipinfo(int id)
         {
             ResultModel<WipInfo> result = new ResultModel<WipInfo>();
 
-            var wipinfos = await _context.WipInfos.Where(w => w.WipNO == id).ToListAsync();
+            var wipinfos = await _context.WipInfos.Where(w => w.WipID == id).ToListAsync();
+            var WiwipinfoByWipNo= await _context.WipInfos.Where(w => w.WipNO == wipinfos.FirstOrDefault().WipNO).ToListAsync();
             _context.WipInfos.RemoveRange(wipinfos);
 
-            var wipAtt = await _context.WipAtts.Where(w => w.WipNO == id).ToListAsync();
+            if (WiwipinfoByWipNo.Count() == 1)
+            {
+                var WipNo = WiwipinfoByWipNo.FirstOrDefault().WipNO;
+                var wipAtt = await _context.WipAtts.Where(w => w.WipNO == WipNo).ToListAsync();
                 _context.WipAtts.RemoveRange(wipAtt);
 
-            var wipKp = await _context.WipKps.Where(w => w.WipNo == id).ToListAsync();
+                var wipKp = await _context.WipKps.Where(w => w.WipNo == WipNo).ToListAsync();
                 _context.WipKps.RemoveRange(wipKp);
 
-            var wipSop = await _context.WipSops.Where(w => w.WipNo == id).ToListAsync();
+                var wipSop = await _context.WipSops.Where(w => w.WipNo == WipNo).ToListAsync();
                 _context.WipSops.RemoveRange(wipSop);
 
-            var wipOutfit = await _context.WipOutfits.Where(w => w.WipNo == id).ToListAsync();
+                var wipOutfit = await _context.WipOutfits.Where(w => w.WipNo == WipNo).ToListAsync();
                 _context.WipOutfits.RemoveRange(wipOutfit);
 
-            var wipLabel = await _context.WipLabels.Where(w => w.WipNO == id).ToListAsync();
+                var wipLabel = await _context.WipLabels.Where(w => w.WipNO == WipNo).ToListAsync();
                 _context.WipLabels.RemoveRange(wipLabel);
 
-            var wipBarcode = await _context.WipBarcodes.Where(w => w.WipNO == id).ToListAsync();
+                var wipBarcode = await _context.WipBarcodes.Where(w => w.WipNO == WipNo).ToListAsync();
                 _context.WipBarcodes.RemoveRange(wipBarcode);
 
-            var wipBarcodeOther = await _context.WipBarcodeOthers.Where(w => w.WipNO == id).ToListAsync();
+                var wipBarcodeOther = await _context.WipBarcodeOthers.Where(w => w.WipNO == WipNo).ToListAsync();
                 _context.WipBarcodeOthers.RemoveRange(wipBarcodeOther);
 
-            var wipBoard = await _context.WipBoards.Where(w => w.WipNo == id).ToListAsync();
+                var wipBoard = await _context.WipBoards.Where(w => w.WipNo == WipNo).ToListAsync();
                 _context.WipBoards.RemoveRange(wipBoard);
 
-            var wipSystem = await _context.WipSystems.Where(w => w.WipNo == id).ToListAsync();
+                var wipSystem = await _context.WipSystems.Where(w => w.WipNo == WipNo).ToListAsync();
                 _context.WipSystems.RemoveRange(wipSystem);
 
-            var wipChecks = await _context.WipChecks.Where(w => w.WipNo == id).ToListAsync();
+                var wipChecks = await _context.WipChecks.Where(w => w.WipNo == WipNo).ToListAsync();
                 _context.WipChecks.RemoveRange(wipChecks);
 
-            var wipInfoBlob = await _context.WipInfoBlobs.Where(w => w.WipNo == id).ToListAsync();
+                var wipInfoBlob = await _context.WipInfoBlobs.Where(w => w.WipNo == WipNo).ToListAsync();
                 _context.WipInfoBlobs.RemoveRange(wipInfoBlob);
-
+            }
             try
             {
                 await _context.SaveChangesAsync();