From 319a5ff2ca5ed992fba21deb1254af51332d32dc Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 6 Feb 2023 10:55:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=96=AE?= =?UTF-8?q?=E5=88=AA=E9=99=A4=E5=88=A4=E6=96=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Views/PCS/PCS002.cshtml | 2 +- AMESCoreStudio.Web/Views/PCS/PCS005.cshtml | 2 +- AMESCoreStudio.Web/Views/PCS/PCS035.cshtml | 2 +- .../Controllers/AMES/WipInfosController.cs | 54 ++++++++++--------- 4 files changed, 32 insertions(+), 28 deletions(-) diff --git a/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml index ff5710ff..d0790560 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS002.cshtml +++ b/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) { diff --git a/AMESCoreStudio.Web/Views/PCS/PCS005.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS005.cshtml index e0132344..df160942 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS005.cshtml +++ b/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) { diff --git a/AMESCoreStudio.Web/Views/PCS/PCS035.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS035.cshtml index 3b4dacdb..65585e81 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS035.cshtml +++ b/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) { diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs index fa7153ce..11067edf 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs @@ -1244,46 +1244,50 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// 工單號碼 /// [HttpDelete("{id}")] - public async Task> DeleteWipinfo(string id) + public async Task> DeleteWipinfo(int id) { ResultModel result = new ResultModel(); - 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(); - _context.WipAtts.RemoveRange(wipAtt); - - var wipKp = await _context.WipKps.Where(w => w.WipNo == id).ToListAsync(); - _context.WipKps.RemoveRange(wipKp); + 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 wipSop = await _context.WipSops.Where(w => w.WipNo == id).ToListAsync(); - _context.WipSops.RemoveRange(wipSop); + var wipKp = await _context.WipKps.Where(w => w.WipNo == WipNo).ToListAsync(); + _context.WipKps.RemoveRange(wipKp); - var wipOutfit = await _context.WipOutfits.Where(w => w.WipNo == id).ToListAsync(); - _context.WipOutfits.RemoveRange(wipOutfit); + var wipSop = await _context.WipSops.Where(w => w.WipNo == WipNo).ToListAsync(); + _context.WipSops.RemoveRange(wipSop); - var wipLabel = await _context.WipLabels.Where(w => w.WipNO == id).ToListAsync(); - _context.WipLabels.RemoveRange(wipLabel); + var wipOutfit = await _context.WipOutfits.Where(w => w.WipNo == WipNo).ToListAsync(); + _context.WipOutfits.RemoveRange(wipOutfit); - var wipBarcode = await _context.WipBarcodes.Where(w => w.WipNO == id).ToListAsync(); - _context.WipBarcodes.RemoveRange(wipBarcode); + var wipLabel = await _context.WipLabels.Where(w => w.WipNO == WipNo).ToListAsync(); + _context.WipLabels.RemoveRange(wipLabel); - var wipBarcodeOther = await _context.WipBarcodeOthers.Where(w => w.WipNO == id).ToListAsync(); - _context.WipBarcodeOthers.RemoveRange(wipBarcodeOther); + var wipBarcode = await _context.WipBarcodes.Where(w => w.WipNO == WipNo).ToListAsync(); + _context.WipBarcodes.RemoveRange(wipBarcode); - var wipBoard = await _context.WipBoards.Where(w => w.WipNo == id).ToListAsync(); - _context.WipBoards.RemoveRange(wipBoard); + var wipBarcodeOther = await _context.WipBarcodeOthers.Where(w => w.WipNO == WipNo).ToListAsync(); + _context.WipBarcodeOthers.RemoveRange(wipBarcodeOther); - var wipSystem = await _context.WipSystems.Where(w => w.WipNo == id).ToListAsync(); - _context.WipSystems.RemoveRange(wipSystem); + var wipBoard = await _context.WipBoards.Where(w => w.WipNo == WipNo).ToListAsync(); + _context.WipBoards.RemoveRange(wipBoard); - var wipChecks = await _context.WipChecks.Where(w => w.WipNo == id).ToListAsync(); - _context.WipChecks.RemoveRange(wipChecks); + var wipSystem = await _context.WipSystems.Where(w => w.WipNo == WipNo).ToListAsync(); + _context.WipSystems.RemoveRange(wipSystem); - var wipInfoBlob = await _context.WipInfoBlobs.Where(w => w.WipNo == id).ToListAsync(); - _context.WipInfoBlobs.RemoveRange(wipInfoBlob); + var wipChecks = await _context.WipChecks.Where(w => w.WipNo == WipNo).ToListAsync(); + _context.WipChecks.RemoveRange(wipChecks); + var wipInfoBlob = await _context.WipInfoBlobs.Where(w => w.WipNo == WipNo).ToListAsync(); + _context.WipInfoBlobs.RemoveRange(wipInfoBlob); + } try { await _context.SaveChangesAsync();