1. 調整過站判斷完工狀態

2. 工單維護資料抓安勤提供API修改欄位名稱

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;
+                            var result_data = result.data.changE_NO;
-                            console.log(result_data.cHANGE_NO);
+                            console.log(result_data);
                             if (result_data.length == 0) {
                                 hg.msghide("不需要更新！");
                             }

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;
+                            var result_data = result.data.changE_NO;
-                            console.log(result_data.cHANGE_NO);
+                            console.log(result_data);
                             if (result_data.length == 0) {
                                 hg.msghide("不需要更新！");
                             }

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;

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 (barCodeCheckDto.ruleStatus == "P")
-                        if (CheckNextStopCloseStation(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID).Result.Success)
                         {
-                            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 + "<br/>";
+                                var result_wipInfoAllClost = await CheckWipNoBarCodeAllClost(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID);
-
+                                if (!result_wipInfoAllClost.Success)
+                                {
+                                    Msg += "wipInfosAllClost_Error：" + result_wipInfoAllClost.Msg + "<br/>";
+                                }
                             }
-
                         }
                     }
 
@@ -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);
             }