From e4e648039069464f96b3e4abacae167e3a0b3be3 Mon Sep 17 00:00:00 2001 From: lsh <lsh123456> Date: 星期六, 04 三月 2023 14:15:40 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 154 insertions(+), 18 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 25427ac..c32a5d8 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; +import com.core.common.SpringUtils; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.mapper.*; @@ -1244,7 +1245,7 @@ SteProtocol steProtocol = steThread.getSteProtocol(); if (steProtocol == null) { continue; } if (!steProtocol.isIdle()) { continue; } - if (steProtocol.getRow() == 1) { continue; } +// if (steProtocol.getRow() == 1) { continue; } String locNo = wrkMast.getWrkSts() < 10 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo(); // 濡傛灉鍦ㄥ悓涓�涓簱浣嶇粍 if (Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(steProtocol.getRow().intValue(), true)) @@ -1835,6 +1836,22 @@ } } // 绉诲簱 ===>> 鍫嗗灈鏈烘惉鑷崇洰鏍囧簱浣嶇粍 瀹屾垚 + } else if (wrkMast.getWrkSts() == 16) { + // 16.鍚婅溅鍑哄簱涓� ==> 17.鍑哄簱瀹屾垚 + wrkMast.setWrkSts(17L); + Date now = new Date(); + wrkMast.setCrnEndTime(now); + wrkMast.setModiTime(now); + LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo()); + Integer outCrnNo = locMastService.getOutCrnNo(locMast); + wrkMast.setCrnNo(outCrnNo); + // 淇敼鎴愬姛鍚庡浣嶅爢鍨涙満 + if (wrkMastMapper.updateById(wrkMast) > 0) { + // 鍫嗗灈鏈哄浣� + crnThread.setResetFlag(true); + } else { + News.error("淇敼宸ヤ綔妗g姸鎬� 16.鍚婅溅鍑哄簱涓� ==> 17.鍑哄簱瀹屾垚 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo()); + } } } } @@ -1879,15 +1896,17 @@ } else { steThread.setResetFlag(true); } - } else if (wrkCharge.getWrkSts() == 29) { - // 29.寮�濮嬪厖鐢� ===>> 30.瀹屾垚鍏呯數 - wrkCharge.setWrkSts(30L); - if (!wrkChargeService.updateById(wrkCharge)) { - News.error("淇敼鍏呯數浠诲姟鐘舵�� 29.寮�濮嬪厖鐢� ===>> 30.瀹屾垚鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo()); - } else { - steThread.setResetFlag(true); - } - } else if (wrkCharge.getWrkSts() == 32) { + } +// else if (wrkCharge.getWrkSts() == 29) { +// // 29.寮�濮嬪厖鐢� ===>> 30.瀹屾垚鍏呯數 +// wrkCharge.setWrkSts(30L); +// if (!wrkChargeService.updateById(wrkCharge)) { +// News.error("淇敼鍏呯數浠诲姟鐘舵�� 29.寮�濮嬪厖鐢� ===>> 30.瀹屾垚鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo()); +// } else { +// steThread.setResetFlag(true); +// } +// } + else if (wrkCharge.getWrkSts() == 32) { // 32.灏忚溅璧拌 ===>> 33.灏忚溅寰呮惉 wrkCharge.setWrkSts(33L); if (!wrkChargeService.updateById(wrkCharge)) { @@ -2486,7 +2505,7 @@ SteChargeType steCharge = null; do { String locNo; - if (!devpThread.charge0) { + if (devpThread.charge0) { SteChargeType first = SteChargeType.FIRST; locNo = first.locNo; if (basSteService.hasCarOfLocNo(locNo) == null @@ -2537,7 +2556,7 @@ } // 澶勪簬鍏呯數搴撲綅缁� - if (steProtocol.getRow().intValue() == Utils.getRow(chargeLocNo) + if ( 0<steProtocol.getRow().intValue() && steProtocol.getRow().intValue()<=4 && steProtocol.getBay().intValue() == Utils.getBay(chargeLocNo) && steProtocol.getLev().intValue() == Utils.getLev(chargeLocNo)) { // 淇敼宸ヤ綔妗g姸鎬� 21.鍑嗗鍏呯數 => 24.灏忚溅鍒拌揪 @@ -2564,10 +2583,22 @@ */ public synchronized void executeSteCharge() { WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.charge); - if (null == wrkCharge) { return; } - Integer steNo = wrkCharge.getSteNo(); - SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo); + SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, 1); SteProtocol steProtocol = steThread.getSteProtocol(); + if (null == wrkCharge) { + if (steProtocol.getChargeStatus()==(short)0 && steProtocol.isBrushConnect()){ + SteCommand steCommand = new SteCommand(); + steCommand.setSteNo(1); // 绌挎杞︾紪鍙� + steCommand.setTaskNo(10060); // 宸ヤ綔鍙� + steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE); // 浠诲姟妯″紡: 鏂紑鍏呯數 + if (!MessageQueue.offer(SlaveType.Ste, 1, new Task(2, steCommand))) { + News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand)); + } + } + return; + } + Integer steNo = wrkCharge.getSteNo(); + BasSte basSte = basSteService.selectById(steNo); if (Cools.isEmpty(steProtocol, basSte)) { return; } if (steProtocol.getMode() == 0 @@ -2581,9 +2612,35 @@ if (!steProtocol.isEnable()) { return; } - if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())) { + if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())+40) { + MessageQueue.offer(SlaveType.Devp, 1, new Task(3, 999));//涓柇鍏呯數鏍囪 wrkCharge.setWrkSts(30L); - wrkChargeMapper.updateById(wrkCharge); + if (!wrkChargeService.updateById(wrkCharge)) { + News.error("淇敼鍏呯數浠诲姟鐘舵�� 29.寮�濮嬪厖鐢� ===>> 30.瀹屾垚鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo()); + }else { + SteCommand steCommand = new SteCommand(); + steCommand.setSteNo(wrkCharge.getSteNo()); // 绌挎杞︾紪鍙� + steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙� + steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE); // 浠诲姟妯″紡: 鏂紑鍏呯數 + if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) { + News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand)); + } + } + return; + }else if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine()) && steProtocol.getChargeStatus()==(short)0 && steProtocol.isBrushConnect()) { + MessageQueue.offer(SlaveType.Devp, 1, new Task(3, 999));//涓柇鍏呯數鏍囪 + wrkCharge.setWrkSts(30L); + if (!wrkChargeService.updateById(wrkCharge)) { + News.error("淇敼鍏呯數浠诲姟鐘舵�� 29.寮�濮嬪厖鐢� ===>> 30.瀹屾垚鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo()); + }else { + SteCommand steCommand = new SteCommand(); + steCommand.setSteNo(wrkCharge.getSteNo()); // 绌挎杞︾紪鍙� + steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙� + steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE); // 浠诲姟妯″紡: 鏂紑鍏呯數 + if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) { + News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand)); + } + } return; } try { @@ -2644,7 +2701,7 @@ SteCommand steCommand = new SteCommand(); steCommand.setSteNo(wrkCharge.getSteNo()); // 绌挎杞︾紪鍙� steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙� - steCommand.setTaskMode(SteTaskModeType.GO_ORIGIN); // 鍘诲彸绔� + steCommand.setTaskMode(SteTaskModeType.BACK_ORIGIN); // 鍘诲彸绔� steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), false).shortValue()); steCommand.setBay(steProtocol.getBay()); @@ -2663,6 +2720,7 @@ } } } else if (wrkCharge.getWrkSts() == 26) { + //26.绛夊緟鍏呯數 ===> // 绌挎杞︿笅鍙戝厖鐢典换鍔� SteCommand steCommand = new SteCommand(); steCommand.setSteNo(wrkCharge.getSteNo()); // 绌挎杞︾紪鍙� @@ -2675,6 +2733,27 @@ wrkCharge.setWrkSts(29L); if (!wrkChargeService.updateById(wrkCharge)) { News.error("淇敼鍏呯數浠诲姟鐘舵�� 28.鍏呯數灏辩华 ===>> 29.寮�濮嬪厖鐢� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo()); + } + } + } else if (wrkCharge.getWrkSts() == 29) { + Float idle2 = steProtocol.isIdle2(); + String chargeLine = SpringUtils.getBean(BasSteService.class).selectById(1).getChargeLine(); + if (idle2<(Float.parseFloat(chargeLine)+2)){ + MessageQueue.offer(SlaveType.Devp, 1, new Task(3, 666));//鍏呯數鏍囪 + }else if (idle2 >= 100f){ + MessageQueue.offer(SlaveType.Devp, 1, new Task(3, 999));//涓柇鍏呯數鏍囪 + // 29.寮�濮嬪厖鐢� ===>> 30.瀹屾垚鍏呯數 + wrkCharge.setWrkSts(30L); + if (!wrkChargeService.updateById(wrkCharge)) { + News.error("淇敼鍏呯數浠诲姟鐘舵�� 29.寮�濮嬪厖鐢� ===>> 30.瀹屾垚鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo()); + }else { + SteCommand steCommand = new SteCommand(); + steCommand.setSteNo(wrkCharge.getSteNo()); // 绌挎杞︾紪鍙� + steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙� + steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE); // 浠诲姟妯″紡: 鏂紑鍏呯數 + if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) { + News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand)); + } } } } @@ -3201,6 +3280,63 @@ } } + /** + * 鍑哄叆搴撴ā寮忓垏鎹� + */ + public synchronized void outAndIn() { + try { + // 鏍规嵁杈撻�佺嚎plc閬嶅巻 + for (DevpSlave devp : slaveProperties.getDevp()) { + for (DevpSlave.Sta inSta : devp.getInSta()) { + Thread.sleep(500); + boolean a=true,b=true; + List<WrkMast> wrkMasts = wrkMastMapper.selectAll(inSta.getStaNo()); + if (Cools.isEmpty(wrkMasts)){ + b=false; + }else { + for (WrkMast wrkMast:wrkMasts){ + if (wrkMast.getSourceStaNo() > wrkMast.getStaNo()){ + a=false; + break; + } + } + } + switch (inSta.getStaNo()) { + case 102://1F + if (a && b){ + MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 11)); + }else if (b){ + MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 12)); + }else { + MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 10)); + } + break; + case 202://2F + if (a && b){ + MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 21)); + }else if (b){ + MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 22)); + }else { + MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 20)); + } + break; + case 302://3F + if (a && b){ + MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 31)); + }else if (b){ + MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 32)); + }else { + MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, 30)); + } + break; + } + } + } + + } catch (Exception e) { + e.printStackTrace(); + } + } } -- Gitblit v1.9.1