From 7cc5158075ba57d1e1c630ca4a42dc06262ad0d7 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期六, 17 二月 2024 21:34:00 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |  283 ++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 171 insertions(+), 112 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 3cb6a63..5819380 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1091,26 +1091,99 @@
                             && crnProtocol.forkPosType == CrnForkPosType.HOME) {
 
                         // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+                        if (crnProtocol.getCrnNo()<=2){
 
-                        // 涓嬪彂绔欑偣淇℃伅
-                        staProtocol.setWorkNo(wrkMast.getWrkNo());
-                        staProtocol.setStaNo(RouteUtils.CrnStaEnd(wrkMast.getStaNo(),wrkMast.getSourceStaNo()));
-                        if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
-                            continue;
+                            StaProtocol staProtocolOther = devpThread.getStation().get(crnStn.getStaNoOther());
+                            if (staProtocolOther == null) {
+                                continue;
+                            } else {
+                                staProtocolOther = staProtocolOther.clone();
+                            }
+                            if (staProtocolOther.isAutoing() && staProtocolOther.isLoading() && (staProtocolOther.getWorkNo() == 0 || staProtocolOther.getStaNo() == null)) {
+                                WrkMastCrn wrkMastCrn = wrkMastCrnMapper.selectWrkNoOneAndTwo(wrkMast.getWrkNo());
+                                if (Cools.isEmpty(wrkMastCrn)){
+                                    continue;
+                                }
+
+                                WrkMast wrkMastOne = wrkMastMapper.selectPakInStep3(wrkMastCrn.getWrkNoOne().intValue());
+                                WrkMast wrkMastTwo = wrkMastMapper.selectPakInStep3(wrkMastCrn.getWrkNoTwo().intValue());
+                                WrkMast wrkMast1 = null;
+                                WrkMast wrkMast2 = null;
+                                if (Utils.getRow(wrkMastOne.getSourceLocNo()) == wrkMast.getCrnNo()*4){
+                                    wrkMast1 = wrkMastTwo;
+                                    wrkMast2 = wrkMastOne;
+                                }else {
+                                    wrkMast2 = wrkMastTwo;
+                                    wrkMast1 = wrkMastOne;
+                                }
+
+                                // 涓嬪彂绔欑偣淇℃伅
+                                staProtocolOther.setWorkNo(wrkMast1.getWrkNo());
+                                staProtocolOther.setStaNo(wrkMast1.getStaNo());
+                                if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocolOther))) {
+                                    continue;
+                                }
+
+                                // 涓嬪彂绔欑偣淇℃伅
+                                staProtocol.setWorkNo(wrkMast2.getWrkNo());
+//                                    staProtocol.setStaNo(RouteUtils.CrnStaEnd(wrkMast.getStaNo(),wrkMast.getSourceStaNo()));
+                                staProtocol.setStaNo(wrkMast2.getStaNo());
+                                if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
+                                    continue;
+                                }
+                                boolean sign = true;
+
+                                // 鏇存柊宸ヤ綔妗g姸鎬佷负14澶辫触
+                                wrkMastCrn.setWrkSts(14L);
+                                if (wrkMastCrnMapper.updateById(wrkMastCrn) != 0) {
+                                } else {
+                                    sign = false;
+                                    log.error("鏇存柊宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
+                                }
+
+                                // 鏇存柊宸ヤ綔妗g姸鎬佷负14澶辫触
+                                wrkMastOne.setWrkSts(14L);
+                                wrkMastOne.setCrnEndTime(new Date());
+                                if (wrkMastMapper.updateById(wrkMastOne) != 0) {
+                                } else {
+                                    sign = false;
+                                    log.error("鏇存柊宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
+                                }
+
+                                // 鏇存柊宸ヤ綔妗g姸鎬佷负14澶辫触
+                                wrkMastTwo.setWrkSts(14L);
+                                wrkMastTwo.setCrnEndTime(new Date());
+                                if (wrkMastMapper.updateById(wrkMastTwo) != 0) {
+                                } else {
+                                    sign = false;
+                                    log.error("鏇存柊宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
+                                }
+
+                                if (sign){
+                                    // 澶嶄綅鍫嗗灈鏈�
+                                    crnThread.setResetFlag(true);
+                                }
+                            }
+
+                        }else {
+                            // 涓嬪彂绔欑偣淇℃伅
+                            staProtocol.setWorkNo(wrkMast.getWrkNo());
+                            staProtocol.setStaNo(RouteUtils.CrnStaEnd(wrkMast.getStaNo(),wrkMast.getSourceStaNo()));
+                            if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
+                                continue;
+                            }
+
+                            // 鏇存柊宸ヤ綔妗g姸鎬佷负14澶辫触
+                            wrkMast.setWrkSts(14L);
+                            wrkMast.setCrnEndTime(new Date());
+                            if (wrkMastMapper.updateById(wrkMast) != 0) {
+                                // 澶嶄綅鍫嗗灈鏈�
+                                crnThread.setResetFlag(true);
+                            } else {
+                                log.error("鏇存柊宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
+                            }
                         }
-
-                        // 鏇存柊宸ヤ綔妗g姸鎬佷负14澶辫触
-                        wrkMast.setWrkSts(14L);
-                        wrkMast.setCrnEndTime(new Date());
-                        if (wrkMastMapper.updateById(wrkMast) != 0) {
-                            // 澶嶄綅鍫嗗灈鏈�
-                            crnThread.setResetFlag(true);
-                        } else {
-                            log.error("鏇存柊宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
-                        }
-
                     }
-
                 }
             }
         }
@@ -1147,6 +1220,7 @@
                                 case 1:
                                 case 2:
                                     this.crnStnToLoc1Single(crn, crnProtocol); //  鍏ュ簱
+                                    break;
                                 default:
                                     this.crnStnToLoc1(crn, crnProtocol); //  鍏ュ簱
                             }
@@ -1156,6 +1230,7 @@
                                 case 1:
                                 case 2:
                                     this.locToCrnStn1Single(crn, crnProtocol); //  鍑哄簱
+                                    break;
                                 default:
                                     this.locToCrnStn1(crn, crnProtocol); //  鍑哄簱
                             }
@@ -1169,6 +1244,7 @@
                                 case 1:
                                 case 2:
                                     this.locToCrnStn1Single(crn, crnProtocol); //  鍑哄簱
+                                    break;
                                 default:
                                     this.locToCrnStn1(crn, crnProtocol); //  鍑哄簱
                             }
@@ -1178,6 +1254,7 @@
                                 case 1:
                                 case 2:
                                     this.crnStnToLoc1Single(crn, crnProtocol); //  鍏ュ簱
+                                    break;
                                 default:
                                     this.crnStnToLoc1(crn, crnProtocol); //  鍏ュ簱
                             }
@@ -2011,15 +2088,16 @@
      * 2022-12-03 TQS淇敼锛屽厛閬嶅巻鏌ヨ宸ヤ綔妗f墍鏈夌珯鐐瑰嚭搴撲换鍔IST锛屾牴鎹伐浣滄。浠诲姟鎺掑簭浼樺厛绾ч珮浜� 鏍规嵁鍫嗗灈鏈哄叆搴撶珯鐐规帓搴�
      */
     public synchronized void locToCrnStn1Single(CrnSlave slave, CrnProtocol crnProtocol) {
-        List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep12(slave.getId());
-        for (WrkMast wrkMast : wrkMasts) {
-            if (wrkMast == null) {
+        List<WrkMastCrn> wrkMastCrnList = wrkMastCrnMapper.selectList(new EntityWrapper<WrkMastCrn>()
+                .eq("crn_no", crnProtocol.getCrnNo()).eq("wrk_sts", 11L));
+        for (WrkMastCrn wrkMastCrn : wrkMastCrnList) {
+            if (wrkMastCrn == null) {
                 continue;
             }
 
             CrnSlave.CrnStn crnStn = null;
             for (CrnSlave.CrnStn crnStn1 : slave.getCrnOutStn()){
-                if(crnStn1.getStaNo().equals(wrkMast.getSourceStaNo())){
+                if(crnStn1.getStaNo().equals(wrkMastCrn.getSourceStaNo())){
                     crnStn = crnStn1;
                     break;
                 }
@@ -2029,21 +2107,14 @@
             }
 
             // 宸ヤ綔妗g姸鎬佸垽鏂�
-            if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null) {
-                log.error("鏌ヨ宸ヤ綔妗f暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/绔欑偣, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
+            if (wrkMastCrn.getIoType() < 100 || wrkMastCrn.getSourceStaNo() == null) {
+                log.error("鏌ヨ宸ヤ綔妗f暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/绔欑偣, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", wrkMastCrn.getWrkNo(), wrkMastCrn.getSourceLocNo(), wrkMastCrn.getIoType());
                 continue;
             }
-            //閫�搴撴ā寮忚烦杩�118銆�119鍑哄簱浠诲姟
-            if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
-                RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign();
-                if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()==1){
-                    continue;
-                }
-            }
             // 鑾峰彇婧愬簱浣嶄俊鎭�
-            LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
+            LocMast sourceSta = locMastService.selectById(wrkMastCrn.getSourceLocNo());
             if (!sourceSta.getLocSts().equals("R") && !sourceSta.getLocSts().equals("P")) {
-                log.error("鍑哄簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), sourceSta.getLocSts());
+                log.error("鍑哄簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMastCrn.getLocNo(), sourceSta.getLocSts());
                 continue;
             }
             // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
@@ -2056,11 +2127,18 @@
                 staProtocol = staProtocol.clone();
             }
 
+            StaProtocol staProtocolOther = devpThread.getStation().get(crnStn.getStaNoOther());
+            if (staProtocolOther == null) {
+                continue;
+            } else {
+                staProtocolOther = staProtocolOther.clone();
+            }
+
 //            // 鍏ュ嚭搴撴ā寮忓垽鏂�
 //            if (devpThread.ioMode != IoModeType.PAKOUT_MODE) { continue; }
-            if (wrkMast.getStaNo() == 204 && devpThread.ioModeOf2F != IoModeType.PAKOUT_MODE) {
-                continue;
-            }
+//            if (wrkMast.getStaNo() == 204 && devpThread.ioModeOf2F != IoModeType.PAKOUT_MODE) {
+//                continue;
+//            }
 
             // 鏌ヨ绔欑偣璇︾粏淇℃伅
             BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
@@ -2069,91 +2147,72 @@
                 break;
 //                    continue;
             }
+
+            // 鏌ヨ绔欑偣璇︾粏淇℃伅
+            BasDevp staDetlOther = basDevpService.selectById(crnStn.getStaNoOther());
+            if (staDetlOther == null) {
+                log.error("鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNoOther());
+                break;
+//                    continue;
+            }
             // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
             if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                     && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
-                // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-
-                // 鍫嗗灈鏈烘帶鍒惰繃婊�
-                if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
+                if (staProtocolOther.isAutoing() && !staProtocolOther.isLoading() && staDetlOther.getCanouting() != null && staDetlOther.getCanouting().equals("Y")
+                        && staProtocolOther.getWorkNo() == 0 && staProtocolOther.isOutEnable()){
+                    // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+                    // 鍫嗗灈鏈烘帶鍒惰繃婊�
+                    if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
 //                        continue;
-                    break;
-                }
-
-                // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
-                if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
-                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
-                    LocMast shallowLoc = locMastService.selectById(shallowLocNo);
-                    // O.绌哄簱浣嶃�丵.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
-                    if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
-                        WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
-                        if (null == waitWrkMast) {
-                            log.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗o紒", shallowLocNo);
-                        } else {
-                            if (waitWrkMast.getWrkSts() == 11) {
-                                waitWrkMast.setIoPri(15D);
-                                waitWrkMast.setModiTime(new Date());
-                                if (wrkMastMapper.updateById(waitWrkMast) == 0) {
-                                    log.error("璋冩暣宸ヤ綔妗d紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
-                                }
-                                continue;
-                            } else {
-
-                            }
-                        }
-                    } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
-//                            WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
-                        //2022-08-16 modify,涓嶆牴鎹畊pdmk鏍囪绉诲簱浠诲姟(瀹规槗琚彇娑堝鑷村牭濉�)锛屾煡璇㈠伐浣滄。鏄惁瀛樺湪浠诲姟
-                        WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
-                        // 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
-//                            if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())
-//                                || Cools.isEmpty(waitWrkMast)) {
-                        if (Cools.isEmpty(waitWrkMast)) {
-                            wrkMast.setUpdMk("Y");
-                            wrkMastMapper.updateById(wrkMast);
-                            // 鐢熸垚宸ヤ綔妗�,灏嗘祬搴撲綅绉昏浆鍒版柊鐨勫簱浣嶄腑
-                            moveLocForDeepLoc(slave, shallowLoc);
-                        }
-                        log.error("{}浠诲姟鍑哄簱澶辫触锛屾祬搴撲綅鍫靛锛佹祬搴撲綅鍙�:{}", wrkMast.getWrkNo(), shallowLocNo);
-                        continue;
-                    } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
-                        WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
-                        if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
-                            continue;
-                        }
+                        break;
                     }
-                }
 
-                // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
-                if (wrkMastMapper.selectWorking(slave.getId()) != null) {
-                    break;
+                    // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+                    if (wrkMastMapper.selectWorking(slave.getId()) != null) {
+                        break;
 //                        return;
-                }
-
-                // 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
-                CrnCommand crnCommand = new CrnCommand();
-                crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
-                crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
-                crnCommand.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
-                crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡:  搴撲綅绉昏浆
-                crnCommand.setSourcePosX(sourceSta.getRow1().shortValue());     // 婧愬簱浣嶆帓
-                crnCommand.setSourcePosY(sourceSta.getBay1().shortValue());     // 婧愬簱浣嶅垪
-                crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue());     // 婧愬簱浣嶅眰
-                crnCommand.setDestinationPosX(crnStn.getRow().shortValue());     // 鐩爣搴撲綅鎺�
-                crnCommand.setDestinationPosY(crnStn.getBay().shortValue());     // 鐩爣搴撲綅鍒�
-                crnCommand.setDestinationPosZ(crnStn.getLev().shortValue());     // 鐩爣搴撲綅灞�
-                if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
-                    log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
-                } else {
-                    // 淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
-                    Date now = new Date();
-                    wrkMast.setWrkSts(12L);
-                    wrkMast.setCrnStrTime(now);
-                    wrkMast.setModiTime(now);
-                    if (wrkMastMapper.updateById(wrkMast) == 0) {
-                        log.error("淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
                     }
-                    break;
+
+                    // 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
+                    CrnCommand crnCommand = new CrnCommand();
+                    crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+                    crnCommand.setTaskNo(wrkMastCrn.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+                    crnCommand.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+                    crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡:  搴撲綅绉昏浆
+                    crnCommand.setSourcePosX(sourceSta.getRow1().shortValue());     // 婧愬簱浣嶆帓
+                    crnCommand.setSourcePosY(sourceSta.getBay1().shortValue());     // 婧愬簱浣嶅垪
+                    crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue());     // 婧愬簱浣嶅眰
+                    crnCommand.setDestinationPosX(crnStn.getRow().shortValue());     // 鐩爣搴撲綅鎺�
+                    crnCommand.setDestinationPosY(crnStn.getBay().shortValue());     // 鐩爣搴撲綅鍒�
+                    crnCommand.setDestinationPosZ(crnStn.getLev().shortValue());     // 鐩爣搴撲綅灞�
+                    if (!MessageQueue.offer(SlaveType.Crn, wrkMastCrn.getCrnNo(), new Task(2, crnCommand))) {
+                        log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMastCrn.getCrnNo(), JSON.toJSON(crnCommand));
+                    } else {
+                        // 淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
+                        Date now = new Date();
+                        wrkMastCrn.setWrkSts(12L);
+                        wrkMastCrn.setModiTime(now);
+                        if (wrkMastCrnMapper.updateById(wrkMastCrn) == 0) {
+                            log.error("淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMastCrn.getWrkNo());
+                        }
+
+                        WrkMast wrkMastOne = wrkMastMapper.selectPakInStep3(wrkMastCrn.getWrkNoOne().intValue());
+                        wrkMastOne.setWrkSts(12L);
+                        wrkMastOne.setCrnStrTime(now);
+                        wrkMastOne.setModiTime(now);
+                        if (wrkMastMapper.updateById(wrkMastOne) == 0) {
+                            log.error("淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMastOne.getWrkNo());
+                        }
+
+                        WrkMast wrkMastTwo = wrkMastMapper.selectPakInStep3(wrkMastCrn.getWrkNoTwo().intValue());
+                        wrkMastTwo.setWrkSts(12L);
+                        wrkMastTwo.setCrnStrTime(now);
+                        wrkMastTwo.setModiTime(now);
+                        if (wrkMastMapper.updateById(wrkMastTwo) == 0) {
+                            log.error("淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMastTwo.getWrkNo());
+                        }
+                        break;
+                    }
                 }
             }
         }

--
Gitblit v1.9.1