From 23e81c5d24c37a87fbbbf67c68b17e8f78832148 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 03 十一月 2025 18:56:42 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |  402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 402 insertions(+), 0 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 a7a1d9c..d358482 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2795,6 +2795,8 @@
             for (String locNo : crnProtocol.getLocMastDemoList()){
                 LocMast locMast = locMastService.selectByLocNo(locNo);
                 TaskCreateParam taskCreateParam = new TaskCreateParam(crnSlave,locMast);
+                taskCreateParam.setStartPointSta(crnProtocol.getStaIntDemo());
+                taskCreateParam.setTargetPointSta(crnProtocol.getStaOutDemo());
                 openService.taskCreate(taskCreateParam);
             }
 
@@ -2804,4 +2806,404 @@
     }
 
 
+    /**
+     * 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂  婕旂ず
+     */
+    public synchronized void crnIoExecuteDemo() throws IOException {
+        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+            // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+            if (crnProtocol == null) {
+                continue;
+            }
+            BasCrnp basCrnp = basCrnpService.selectById(crnSlave.getId());
+            if (basCrnp == null) {
+                log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crnSlave.getId());
+                continue;
+            }
+
+            CrnSlave crn = new CrnSlave(crnSlave);
+            if (Cools.isEmpty(crnProtocol.getLaneNo()) || crnProtocol.getLaneNo()==0){
+                CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍫嗗灈鏈哄贩閬撳彿寮傚父锛�");
+                continue;
+            }
+
+            if (!crnSlave.getId().equals(crnProtocol.getLaneNo())) {
+                for (CrnSlave crnOther : slaveProperties.getCrn()) {
+                    if (crnOther.getId().equals(crnProtocol.getLaneNo())) {
+                        crn.updateCrnInStn(crnOther);
+                    }
+                }
+            }
+
+//            try{
+//                // 搴撲綅绉昏浆
+//                this.locToLoc(crn, crnProtocol);
+//            } catch (Exception e) {
+//                log.error("搴撲綅绉昏浆澶辫触");
+//            }
+
+            // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
+            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
+                    && crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
+                // 濡傛灉鏈�杩戜竴娆℃槸鍏ュ簱妯″紡
+                if (crnProtocol.getLastIo().equals("I")) {
+                    if (basCrnp.getInEnable().equals("Y")) {
+                        this.crnStnToLocDemo(crn, crnProtocol); //  鍏ュ簱
+                        crnProtocol.setLastIo("O");
+                    } else if (basCrnp.getOutEnable().equals("Y")) {
+                        this.locToCrnStnDemo(crn, crnProtocol); //  鍑哄簱
+                        crnProtocol.setLastIo("I");
+                    }
+                }
+                // 濡傛灉鏈�杩戜竴娆℃槸鍑哄簱妯″紡
+                else if (crnProtocol.getLastIo().equals("O")) {
+                    if (basCrnp.getOutEnable().equals("Y")) {
+                        this.locToCrnStnDemo(crn, crnProtocol); //  鍑哄簱
+                        crnProtocol.setLastIo("I");
+                    } else if (basCrnp.getInEnable().equals("Y")) {
+                        this.crnStnToLocDemo(crn, crnProtocol); //  鍏ュ簱
+                        crnProtocol.setLastIo("O");
+                    }
+                }
+            }  else {
+                if (crnProtocol.getModeType() == CrnModeType.AUTO && crnProtocol.getStatusType() == CrnStatusType.IDLE){
+                    if (crnProtocol.getTaskNo() != 0){
+                        CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "宸ヤ綔鍙蜂笉涓�0");
+                    }
+                    if (crnProtocol.getLoaded() != 0){
+                        CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "杞借揣鍙版湁鐗�");
+                    }
+                    if (crnProtocol.getForkPos() != 0){
+                        CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "璐у弶浣嶇疆涓嶅湪涓綅");
+                    }
+                }
+            }
+        }
+    }
+
+
+
+    /**
+     * 鍏ュ簱  ===>>  鍫嗗灈鏈虹珯鍒板簱浣�
+     */
+    public void crnStnToLocDemo(CrnSlave slave, CrnProtocol crnProtocol) {
+        for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
+            List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("CRN_NO", crnProtocol.getLaneNo()).eq("CRN_STN", crnStn.getStaNo()));
+
+            for (StaDesc staDesc : staDescs) {
+                boolean flag = false;
+                // 鑾峰彇鍫嗗灈鏈哄叆搴撶珯淇℃伅
+                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+                StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
+                if (staProtocol == null) {
+                    continue;
+                } else {
+                    staProtocol = staProtocol.clone();
+                }
+                // 鏌ヨ绔欑偣璇︾粏淇℃伅
+                BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
+                if (staDetl == null) {
+                    log.error("鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
+                    continue;
+                }
+                if (staProtocol.isAutoing() && staProtocol.getWorkNo() > 0
+//                        && staProtocol.isInEnable()
+                        && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
+                    flag = true;
+                }
+                if (!flag) {
+                    continue;
+                }
+
+                // 鑾峰彇宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級鐨勫叆搴撳伐浣滄。
+                TaskWrk taskWrk = taskWrkMapper.selectPakInDemo(crnProtocol.getLaneNo(), staProtocol.getWorkNo().intValue(), staDesc.getStnNo().toString());
+                if (null == taskWrk) {
+                    continue;
+                }
+
+                // 鍫嗗灈鏈烘帶鍒惰繃婊�
+                if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE)) {
+                    devpThread.setErrorDev(staProtocol.getSiteId(), "鍫嗗灈鏈洪潪绌洪棽");
+                    continue;
+                }
+                if (crnProtocol.getTaskNo() != 0) {
+                    devpThread.setErrorDev(staProtocol.getSiteId(), crnProtocol.getLaneNo()+"宸烽亾鍫嗗灈鏈哄伐浣滃彿涓嶄负0");
+                    CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "宸ヤ綔鍙蜂笉涓�0");
+                    continue;
+                }
+
+                // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+                if (taskWrkMapper.selectCrnWorking(crnProtocol.getLaneNo()) != null) {
+                    devpThread.setErrorDev(staProtocol.getSiteId(), crnProtocol.getLaneNo()+"宸烽亾鍫嗗灈鏈哄瓨鍦ㄥ悐杞︿换鍔�");
+                    CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍫嗗灈鏈哄瓨鍦ㄦ墽琛屼腑鍚婅溅浠诲姟");
+                    continue;
+                }
+
+//                int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+//                taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
+                Date now = new Date();
+                taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
+//                taskWrk.setAssignTime(now);//娲惧彂鏃堕棿
+                taskWrk.setExecuteTime(now);
+                taskWrk.setWrkSts(3);//宸ヤ綔鐘舵�� 3.鍚婅溅鍏ュ簱
+                taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
+                taskWrk.setModiTime(now);
+                taskWrk.setModiUser(9988L);
+
+                // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+                CrnCommand crnCommand1 = new CrnCommand();
+                crnCommand1.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+                crnCommand1.setLaneNo(crnProtocol.getLaneNo()); // 鍫嗗灈鏈哄贩閬撶紪鍙�
+                crnCommand1.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+                crnCommand1.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+                crnCommand1.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡:  搴撲綅绉昏浆
+                crnCommand1.setSourcePosX(crnStn.getRow().shortValue());     // 婧愬簱浣嶆帓
+                crnCommand1.setSourcePosY(crnStn.getBay().shortValue());     // 婧愬簱浣嶅垪
+                crnCommand1.setSourcePosZ(crnStn.getLev().shortValue());   // 婧愬簱浣嶅眰
+                crnCommand1.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint()));     // 鐩爣搴撲綅鍒�
+                int bay1 = Utils.getBayShort(taskWrk.getTargetPoint()) + 1;
+                crnCommand1.setDestinationPosY((short)bay1);     // 鐩爣搴撲綅灞�
+                crnCommand1.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint()));     // 鐩爣搴撲綅鎺�
+                crnCommand1.setCommand((short) 0);
+                if (!MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, crnCommand1))) {
+                    log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand1));
+                    devpThread.setErrorDev(staProtocol.getSiteId(), crnProtocol.getLaneNo()+"宸烽亾鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
+                    CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "杩愯鍛戒护涓嬪彂澶辫触");
+
+                    throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
+                } else {
+                    try {
+                        devpThread.setErrorDev(staProtocol.getSiteId(), "-");
+                        CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "-");
+
+                        taskWrkService.updateById(taskWrk);
+                    } catch (Exception e) {
+                        log.error("淇敼宸ヤ綔妗g姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+                        log.error("淇敼宸ヤ綔妗g姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽紓甯革細" + e);
+                    }
+
+                }
+            }
+
+            // return;
+        }
+    }
+
+    /**
+     * 鍑哄簱  ===>>  搴撲綅鍒板爢鍨涙満绔�
+     * 2022-06-09 TQS淇敼锛屾煡璇㈠伐浣滄。LIST锛岄亶鍘嗕笅鍙戯紝闃叉绗竴涓换鍔″牭濉炲嚭搴�
+     */
+    public void locToCrnStnDemo(CrnSlave slave, CrnProtocol crnProtocol) {
+        List<TaskWrk> taskWrksInitial = taskWrkMapper.selectPakOut(crnProtocol.getLaneNo(), null);
+        if (taskWrksInitial.size() == 0) {
+            return;
+        }
+        for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
+            List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("CRN_NO", crnProtocol.getLaneNo()).eq("CRN_STN", crnStn.getStaNo()));
+            for (StaDesc staDesc : staDescs) {
+                // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
+                List<TaskWrk> taskWrks = taskWrkMapper.selectPakOutDemo(crnProtocol.getLaneNo(), staDesc.getStnNo().toString());
+                for (TaskWrk taskWrk : taskWrks) {
+                    if (taskWrk == null) {
+                        continue;
+                    }
+                    // 宸ヤ綔妗g姸鎬佸垽鏂�
+                    if (taskWrk.getIoType() != 4 || taskWrk.getTargetPoint() == null || taskWrk.getStartPoint() == null) {
+                        log.error("鏌ヨ宸ヤ綔妗f暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/绔欑偣, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", taskWrk.getWrkNo(), taskWrk.getStartPoint(), taskWrk.getIoType());
+                        continue;
+                    }
+                    // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
+                    SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+                    StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
+                    if (staProtocol == null) {
+                        break;
+                    } else {
+                        staProtocol = staProtocol.clone();
+                    }
+
+                    // 鏌ヨ绔欑偣璇︾粏淇℃伅
+                    BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
+                    if (staDetl == null) {
+                        log.error("鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
+                        break;
+                    }
+
+                    // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
+                    if (staProtocol.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {
+
+//                    // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
+//                    if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
+//                            && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
+                        // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+
+                        // 鍫嗗灈鏈烘帶鍒惰繃婊�
+                        if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE)) {
+                            devpThread.setErrorDev(staProtocol.getSiteId(), "鍫嗗灈鏈洪潪绌洪棽");
+                            continue;
+                        }
+                        if (crnProtocol.getTaskNo() != 0) {
+                            devpThread.setErrorDev(staProtocol.getSiteId(), crnProtocol.getLaneNo()+"宸烽亾鍫嗗灈鏈哄伐浣滃彿涓嶄负0");
+                            CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "宸ヤ綔鍙蜂笉涓�0");
+
+                            continue;
+                        }
+
+                        // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+                        if (taskWrkMapper.selectCrnWorking(crnProtocol.getLaneNo()) != null) {
+                            devpThread.setErrorDev(staProtocol.getSiteId(), crnProtocol.getLaneNo()+"宸烽亾鍫嗗灈鏈哄瓨鍦ㄥ悐杞︿换鍔�");
+                            CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍫嗗灈鏈哄瓨鍦ㄦ墽琛屼腑鍚婅溅浠诲姟");
+                            break;
+                        }
+
+                        CrnCommand command = new CrnCommand();
+                        command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+                        command.setLaneNo(crnProtocol.getLaneNo()); // 鍫嗗灈鏈虹紪鍙�
+                        command.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+                        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+                        command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
+                        command.setSourcePosX(Utils.getRowShort(taskWrk.getStartPoint()));     // 婧愬簱浣嶆帓
+                        int bayS = Utils.getBayShort(taskWrk.getStartPoint()) + 1;
+                        command.setSourcePosY((short)bayS);     // 婧愬簱浣嶅垪
+                        command.setSourcePosZ(Utils.getLevShort(taskWrk.getStartPoint()));     // 婧愬簱浣嶅眰
+                        command.setDestinationPosX(crnStn.getRow().shortValue());     // 鐩爣搴撲綅鎺�
+                        command.setDestinationPosY(crnStn.getBay().shortValue());     // 鐩爣搴撲綅鍒�
+                        command.setDestinationPosZ(crnStn.getLev().shortValue());     // 鐩爣搴撲綅灞�
+//                        command.setCommand((short) 1);
+                        if (!MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command))) {
+                            log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屽贩閬�={}锛屼换鍔℃暟鎹�={}", slave.getId(), taskWrk.getCrnNo(), JSON.toJSON(command));
+                            devpThread.setErrorDev(staProtocol.getSiteId(), crnProtocol.getLaneNo()+"宸烽亾鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
+                            CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "杩愯鍛戒护涓嬪彂澶辫触");
+                            throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
+                        } else {
+                            try {
+                                // 淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
+                                Date now = new Date();
+                                taskWrk.setWrkSts(12);
+                                taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);
+                                taskWrk.setModiTime(now);
+                                taskWrk.setExecuteTime(now);
+                                devpThread.setErrorDev(staProtocol.getSiteId(), "-");
+                                CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "-");
+
+                                if (taskWrkMapper.updateById(taskWrk) == 0) {
+                                    log.error("淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+                                }
+                            } catch (Exception e) {
+                                log.error("淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+                                log.error("淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽紓甯革細" + e);
+                            }
+                        }
+                    } else {
+                        CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "-");
+                        if (staProtocol.isAutoing()){
+                            if (staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")){
+                                CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鑳藉嚭锛氭湭鎵撳紑");
+                            }
+                            if (staProtocol.getWorkNo() == 0){
+                                CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "宸ヤ綔鍙蜂笉涓�0");
+                            }
+                            if (staProtocol.isOutEnable()){
+                                CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "娌℃湁鍙嚭");
+                            }
+                            if (staProtocol.isLoading()){
+                                CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍑哄簱绔欐湁鐗�");
+                            }
+                        } else {
+                            CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍑哄簱绔欑偣锛氶潪鑷姩");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+
+    /**
+     * 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
+     */
+    public void crnStnToOutStnDemo() {
+        for (CrnSlave crn : slaveProperties.getCrn()) {
+
+            // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+            if (crnProtocol == null) {
+                continue;
+            }
+            BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
+            if (basCrnp == null) {
+                log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
+                continue;
+            }
+
+            CrnSlave crnSlave = new CrnSlave(crn);
+            if (Cools.isEmpty(crnProtocol.getLaneNo()) || crnProtocol.getLaneNo()==0){
+                CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍫嗗灈鏈哄贩閬撳彿寮傚父锛�");
+                continue;
+            }
+
+            if (!crn.getId().equals(crnProtocol.getLaneNo())) {
+                for (CrnSlave crnOther : slaveProperties.getCrn()) {
+                    if (crnOther.getId().equals(crnProtocol.getLaneNo())) {
+                        crnSlave.updateCrnInStn(crnOther);
+                    }
+                }
+            }
+            // 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
+            for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
+
+                List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("CRN_NO", crnProtocol.getLaneNo()).eq("CRN_STN", crnStn.getStaNo()));
+                for (StaDesc staDesc : staDescs) {
+                    try {
+                        // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
+                        DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+                        StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
+                        if (staProtocol == null) {
+                            continue;
+                        } else {
+                            staProtocol = staProtocol.clone();
+                        }
+                        if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
+                            // 鏌ヨ宸ヤ綔妗�
+                            TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorkingDemo(crnProtocol.getLaneNo(), staDesc.getStnNo().toString());
+                            if (taskWrk == null) {
+                                continue;
+                            }
+                            log.info("涓嬪彂杈撻�佺嚎浠诲姟锛歵askWrk:" + JSON.toJSONString(taskWrk));
+//                            R r = siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getWrkNo().shortValue(), (short) 0, "Y", false, false);
+                            staProtocol.setWorkNo(taskWrk.getWrkNo());
+                            staProtocol.setStaNo(BarcodeUtils.getStaNo(staProtocol.getSiteId()));
+                            boolean offer = false;
+                            try {
+                                offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+                            } catch (Exception e) {
+                                log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:" + e);
+                                log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:offer:" + offer);
+                            }
+//                            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(r));
+                            if (offer) {
+                                log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk));
+                                Date now = new Date();
+//                                taskWrk.setStatus(TaskStatusType.OVER3.id);
+                                taskWrk.setWrkSts(2);
+                                taskWrk.setModiTime(now);
+                                taskWrk.setCompleteTime(now);
+                                taskWrkService.updateById(taskWrk);
+                            } else {
+                                log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:" + JSON.toJSONString(taskWrk));
+//                                log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯镐俊鎭�:"+JSON.toJSONString(r));
+                            }
+                        }
+                    } catch (Exception e) {
+                        log.error("鍑哄簱鍒板嚭搴撶珯寮傚父:寮傚父淇℃伅锛�" + e);
+                    }
+                }
+
+            }
+        }
+    }
+
 }

--
Gitblit v1.9.1