From 675ed4fa602e79e220e76fcdbc56e4630c0fb21c Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期三, 17 七月 2024 17:17:40 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 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 f24c52a..f27f5b2 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -1233,7 +1233,7 @@ } else { staProtocol = staProtocol.clone(); } - if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) { + if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == null || staProtocol.getWorkNo() == 0)) { // 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗� CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn,crnNo); @@ -1294,6 +1294,9 @@ } } }else if (conStation==2){ + if (crnProtocol.statusType != CrnStatusType.IDLE){ + return false; + } // 鏌ヨ宸ヤ綔妗� WrkMast wrkMast = wrkMastMapper.selectPakOutStep2345(staProtocol.getSiteId(),crnProtocol.getTaskNoTwo().intValue()); if (wrkMast == null) { @@ -1956,6 +1959,10 @@ crnCommandParam.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺� crnCommandParam.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒� crnCommandParam.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞� + if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(99, crnCommandParam.getCrnNo()-2))) { + log.error("杈撻�佺嚎閿佸畾鍛戒护涓嬪彂澶辫触锛屽爢鍨涙満鍙�={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), crnCommandParam.getCrnNo()-2); + continue; + } if (!MessageQueue.offer(SlaveType.Crn, crnCommandParam.getCrnNo(), new Task(9, crnCommandParam))) { log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSONString(crnCommandParam)); } else { @@ -4506,6 +4513,39 @@ int[] sign = new int[]{0,0}; // 鍙湁褰撳爢鍨涙満鑷姩鏃舵墠缁х画鎵ц if (crnProtocol.getModeType() == CrnModeType.AUTO) { + //鍙� + if (crnProtocol.getStatusType() == CrnStatusType.SEPARATE_IDLE + && crnProtocol.getTaskNo() == 0 + && crnProtocol.getLoaded() == 1 + && crnProtocol.getForkPos() == 0) { + if (crnProtocol.getStatusTypeTwo() == CrnStatusType.SEPARATE_IDLE + && crnProtocol.getTaskNoTwo() == 0 + && crnProtocol.getLoadedTwo() == 1 + && crnProtocol.getForkPosTwo() == 0){ + List<WrkMastSplitTwin> wrkMastSplitTwinList1 = wrkMastSplitTwinService.getWrkMastSplitTwin(crn.getId(),1,2,2,0); + List<WrkMastSplitTwin> wrkMastSplitTwinList2 = wrkMastSplitTwinService.getWrkMastSplitTwin(crn.getId(),2,2,2,0); + if (!wrkMastSplitTwinList1.isEmpty() && !wrkMastSplitTwinList2.isEmpty() ){ + if (wrkMastSplitTwinList1.size()>1 || wrkMastSplitTwinList2.size()>1 ){ + log.error("Pair鍫嗗灈鏈哄嚭鍏ュ簱涓嬪彂寮傚父,鍫嗗灈鏈哄彿={},寮傚父淇℃伅={},宸ヤ綅鍙�={},宸ヤ綔绫诲瀷={}",crn.getId(),"瀛樺湪澶氱瑪鍙墽琛屼綔涓氾紝璇峰垹闄ゆ棤鏁堜綔涓氾紒锛侊紒",sign[1],sign[0]); + return false; + } + WrkMastSplitTwin wrkMastSplitTwin1 = wrkMastSplitTwinList1.get(0); + WrkMastSplitTwin wrkMastSplitTwin2 = wrkMastSplitTwinList2.get(0); + boolean ack = crnExecutePutFullPair(crn.getId(), wrkMastSplitTwin1,wrkMastSplitTwin2, sign[1]); + if (ack){ + wrkMastSplitTwin1.setWrkSts(wrkMastSplitTwin1.getWrkType()==1? 1:3); + wrkMastSplitTwinService.updateById(wrkMastSplitTwin1); + wrkMastSplitTwin2.setWrkSts(wrkMastSplitTwin2.getWrkType()==1? 1:3); + wrkMastSplitTwinService.updateById(wrkMastSplitTwin2); + }else { + log.error("鍫嗗灈鏈哄嚭鍏ュ簱涓嬪彂鎶ラ敊,鍫嗗灈鏈哄彿={},寮傚父淇℃伅={}",crn.getId(),"涓嬪彂浠诲姟杩斿洖鍊间负锛�"+ack); + } + + return false; + } + + } + } // 鍙湁褰撳爢鍨涙満宸ヤ綅1鍙栬揣鎴栬�呮湁鐗� 骞朵笖 宸ヤ綅2鏃犱换鍔℃椂鎵嶇户缁墽琛� switch (i){ case 1: @@ -7802,6 +7842,14 @@ continue; } } else if (steProtocol.getCharge()<80.0F){ + List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusListCharge(steSlave.getId(), new ArrayList<Integer>() {{ + add(5); + add(11); + add(16); + }}); + if(!basJarMastList.isEmpty()){ + continue; + } if (wrkMastExecuteService.selectNoStart(steSlave.getId())!=0){ continue; } -- Gitblit v1.9.1