From a461aa6893f1e422fb8e440e27e58e635f3e515d Mon Sep 17 00:00:00 2001 From: Sai Date: Wed, 5 Jul 2023 14:39:33 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=AA=BF=E6=95=B4=E9=81=8E=E7=AB=99?= =?UTF-8?q?=E5=88=A4=E6=96=B7=E5=AE=8C=E5=B7=A5=E7=8B=80=E6=85=8B=202.=20?= =?UTF-8?q?=E5=B7=A5=E5=96=AE=E7=B6=AD=E8=AD=B7=E8=B3=87=E6=96=99=E6=8A=93?= =?UTF-8?q?=E5=AE=89=E5=8B=A4=E6=8F=90=E4=BE=9BAPI=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=AC=84=E4=BD=8D=E5=90=8D=E7=A8=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Views/PCS/PCS003.cshtml | 6 ++-- AMESCoreStudio.Web/Views/PCS/PCS034.cshtml | 6 ++-- .../Controllers/AMES/WipLockController.cs | 3 +- .../Controllers/BLL/BarCodeCheckController.cs | 33 +++++++++++++------ 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml index 3ffc0e17..48774c7e 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml @@ -1995,12 +1995,12 @@ data: { "wipNo": '@Model.wipInfo.WipNO' }, success: function (result) { if (result.success) { - if (result.data.cHANGE_NO == null) { + if (result.data.changE_NO == null) { hg.msghide("查無資料，不需要更新！"); } else { - var result_data = result.data.cHANGE_NO; - console.log(result_data.cHANGE_NO); + var result_data = result.data.changE_NO; + console.log(result_data); if (result_data.length == 0) { hg.msghide("不需要更新！"); } diff --git a/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml index 4062548a..127b32e6 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml @@ -1777,12 +1777,12 @@ data: { "wipNo": '@Model.wipInfo.WipNO' }, success: function (result) { if (result.success) { - if (result.data.cHANGE_NO == null) { + if (result.data.changE_NO == null) { hg.msghide("查無資料，不需要更新！"); } else { - var result_data = result.data.cHANGE_NO; - console.log(result_data.cHANGE_NO); + var result_data = result.data.changE_NO; + console.log(result_data); if (result_data.length == 0) { hg.msghide("不需要更新！"); } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs index a0d2491c..72126a1c 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs @@ -176,7 +176,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { s.LockStatus = s.LockStatus == "0" ? "鎖定" : "解鎖"; s.LockReasonTypeName = s.LockReasonType == "0" ? "3C認證工單" : - s.LockReasonType == "1" ? "驗證工單" : "維修換料待分析"; return s; + s.LockReasonType == "1" ? "驗證工單" : + s.LockReasonType == "2" ? "ECN" : "維修換料待分析"; return s; }).ToList(); result.Data = qq; diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs index 73ff59c3..571d1ab8 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs @@ -423,7 +423,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES else barCodeCheckDto.ruleStatus = "P"; - var result_CUTableMsg = await CU_Tables(barCodeCheckDto, burnIn); if (!string.IsNullOrWhiteSpace(result_CUTableMsg)) { @@ -669,16 +668,17 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } } - // 判斷下一站為完工站 - if (CheckNextStopCloseStation(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID).Result.Success) + if (barCodeCheckDto.ruleStatus == "P") { - var result_wipInfoAllClost = await CheckWipNoBarCodeAllClost(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID); - if (!result_wipInfoAllClost.Success) + // 判斷下一站為完工站 + if (CheckNextStopCloseStation(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID).Result.Success) { - Msg += "wipInfosAllClost_Error：" + result_wipInfoAllClost.Msg + "
"; - + var result_wipInfoAllClost = await CheckWipNoBarCodeAllClost(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID); + if (!result_wipInfoAllClost.Success) + { + Msg += "wipInfosAllClost_Error：" + result_wipInfoAllClost.Msg + "
"; + } } - } } @@ -741,6 +741,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES StatusNo = StatusNo, CreateUserID = barCodeCheckDto.userID }; + + if (barCodeCheckDto.ruleStatus == "P") + { + if (CheckNextStopCloseStation(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID).Result.Success) + { + barcodeInfo.StatusID = -1; + } + } + return await barcodeInfoesController.PostBarcodeInfoes(barcodeInfo); } // 更新 @@ -753,9 +762,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES barcodeInfo.StatusID = 1; if (!string.IsNullOrWhiteSpace(barCodeCheckDto.extNo)) barcodeInfo.ExtraBarcodeNo = barCodeCheckDto.extNo; - if (CheckNextStopCloseStation(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID).Result.Success) + + if (barCodeCheckDto.ruleStatus == "P") { - barcodeInfo.StatusID = -1; + if (CheckNextStopCloseStation(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID).Result.Success) + { + barcodeInfo.StatusID = -1; + } } return await barcodeInfoesController.PutBarcodeInfoes(barcodeInfo); }