From 406c973b4c10643567bcd8f10ff00eb9f781f3c3 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期一, 07 四月 2025 17:18:28 +0800 Subject: [PATCH] 还没有写完 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 52 ++-------------------------------------------------- 1 files changed, 2 insertions(+), 50 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 381cb5d..e65a9ba 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -85,6 +85,8 @@ @Autowired private CrnController crnController; + @Autowired + private TransferTaskService transferTaskService; public void generateStoreWrkFile1() throws IOException, InterruptedException { try { @@ -992,56 +994,6 @@ } catch (Exception e) { e.printStackTrace(); } - } - - - /** - * 鐙珛杈撻�佺嚎 - */ - public void onlyDevp() { - DevpSlave devpSlave = slaveProperties.getDevp().get(1); - List<DevpSlave.Sta> inSta = devpSlave.getInSta(); - // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅 - DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devpSlave.getId()); - for (DevpSlave.Sta sta : inSta) { - try { - StaProtocol staProtocol = devpThread.getStation().get(sta.getStaNo()); - if (staProtocol == null) { - continue; - } else { - staProtocol = staProtocol.clone(); - } - if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) { - // 鏌ヨ宸ヤ綔妗� -// TaskWrk taskWrk = devpTaskMapper.selectCrnStaWorking(crnSlave.getId(), staDesc.getStnNo().toString()); -// if (taskWrk == null) { -// continue; -// } -// log.info("涓嬪彂杈撻�佺嚎浠诲姟锛歵askWrk:" + JSON.toJSONString(taskWrk)); -// staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue()); -// staProtocol.setStaNo(staDesc.getStnNo().shortValue()); -// boolean offer = false; -// try { -// offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol)); -// } catch (Exception e) { -// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:" + e); -// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:offer:" + offer); -// } -// if (offer) { -// log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk)); -// taskWrk.setStatus(5); -// taskWrk.setWrkSts(14); -// taskWrkService.updateById(taskWrk); -// -// } else { -// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:" + JSON.toJSONString(taskWrk)); -// } - } - } catch (Exception e) { - log.error("鍑哄簱鍒板嚭搴撶珯寮傚父:寮傚父淇℃伅锛�" + e); - } - } - } -- Gitblit v1.9.1