From c17493e1a45d8cf1bf5d384fe271ecd5865b6f26 Mon Sep 17 00:00:00 2001 From: pjb <pjb123456> Date: 星期三, 06 八月 2025 16:02:08 +0800 Subject: [PATCH] 出库限制去捆绑机器任务数修复 --- src/main/java/com/zy/service/impl/MainServiceImpl.java | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java index 8f1ca6b..085881e 100644 --- a/src/main/java/com/zy/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java @@ -827,12 +827,25 @@ if (config != null && config.getStatus() == 1) { crnAvailableOut = true; } + // 闄愬埗鍘绘崋缁戞満鍣ㄤ换鍔℃暟 + int kbWrks = wrkMastMapper.selectCountByKb(); for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) { // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗� List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo()); for (WrkMast wrkMast : wrkMasts) { if (wrkMast == null) { continue; + } + if (wrkMast.getStaNo() == 1031) { + // 鑾峰彇1033鏃犵姸鎬佹椂浠诲姟鏁�+1 + SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1); + StaProtocol staProtocol = devpThread.getStation().get(1033); + if (staProtocol.isLoading() && staProtocol.getWorkNo() == 0) { + kbWrks ++; + } + if (kbWrks > 1) { + continue; + } } // 宸ヤ綔妗g姸鎬佸垽鏂� if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null) { @@ -1801,12 +1814,12 @@ DevpThread devpThread2 = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2); StaProtocol staProtocol2 = devpThread2.getStation().get(1090); if(!staProtocol2.isAutoing() || staProtocol2.isLoading() || staProtocol2.getWorkNo() != 0) { - log.info("鍘诲紓甯稿彛鐩爣绔欑偣锛岄潪鑷姩锛屾湁鐗╋紝宸ヤ綔鍙蜂负锛歿}",staProtocol2.getWorkNo()); + log.info("{}鍘诲紓甯稿彛鐩爣绔欑偣锛岃嚜鍔�:{}锛屾湁鐗�:{}锛屽伐浣滃彿涓猴細{}",wrkMast.getWrkNo(),staProtocol2.isAutoing(),staProtocol2.isLoading(),staProtocol2.getWorkNo()); continue; } - int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().where("sta_no = 1090 and wrk_sts in (9,10)")); + int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().where("sta_no = 1090 AND (wrk_sts IN (9,10) OR (wrk_sts = 2 AND rgv_finish_time IS NOT NULL))")); if (count > 0) { - log.info("鍘诲紓甯稿彛锛屼絾鏄墠闈㈡湁鍘诲紓甯稿彛浠诲姟鏁帮細{}",count); + log.info("{}鍘诲紓甯稿彛锛屼絾鏄墠闈㈡湁鍘诲紓甯稿彛浠诲姟鏁帮細{}",wrkMast.getWrkNo(),count); continue; } } @@ -1863,7 +1876,7 @@ wrkMast.setWrkSts(15L); wrkMast.setModiTime(new Date()); wrkMastService.updateById(wrkMast); - } else if(wrkMast.getIoType() == 110 && (wrkMast.getStaNo() == 1002 || wrkMast.getStaNo() == 1020 ||wrkMast.getStaNo() == 1035)) { + } else if(wrkMast.getIoType() == 110 && (wrkMast.getStaNo() == 1002 || wrkMast.getStaNo() == 1020 ||wrkMast.getStaNo() == 1035 || wrkMast.getStaNo() == 1024)) { if(wrkMast.getWrkSts() != 2 ){ log.warn("rgv鏀捐揣瀹屾垚110锛宺gv鏈浣�:rgv鍙穥}锛屼换鍔″彿锛歿}锛屼换鍔$姸鎬亄}",wrkMast.getRgvNo(),wrkMast.getWrkNo(),wrkMast.getWrkSts()); continue; -- Gitblit v1.9.1