From e90544b3ab05170775b132e5c567bb33eb436ab4 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期一, 15 七月 2024 08:55:57 +0800 Subject: [PATCH] 深浅库位冲突 --- src/main/java/com/zy/core/thread/SiemensCrnThread.java | 2 ++ src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 ++++--- 2 files changed, 6 insertions(+), 3 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 b334411..8a682c6 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -610,11 +610,12 @@ String shallowLoc = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint()); LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc)); if (locMast.getLocSts().equals("R")) { - List<TaskWrk> wrkMastList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("source_loc_no", locMast.getLocNo())); + List<TaskWrk> wrkMastList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("start_point", locMast.getLocNo())); if (!wrkMastList.isEmpty()) { TaskWrk wrkMast = wrkMastList.get(0); wrkMast.setIoPri(99); taskWrkMapper.updateById(wrkMast); + log.warn("{}瀵瑰簲娴呭簱浣嶆湁璐э紝鎻愬崌{}搴撲綅浼樺厛绾�",taskWrk.getStartPoint(),wrkMast.getStartPoint()); continue; } } @@ -832,12 +833,12 @@ if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) { //鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。 TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(),crnProtocol.getTaskNo().intValue()); - log.info("鏀跺埌鐢宠瀹屾垚璇锋眰锛�" + taskWrk.toString()); + if (Cools.isEmpty(taskWrk)) { // log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗c�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo()); continue; } - + log.info("鏀跺埌鐢宠瀹屾垚璇锋眰锛�" + taskWrk); //鑾峰彇鎸囦护ID // Integer commandId = crnProtocol.getCommandId(); // CommandInfo commandInfo = new CommandInfo(); diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java index 8449921..31de838 100644 --- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java +++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java @@ -256,6 +256,7 @@ // crnCommand.setDestinationStaNo(command.getDestinationStaNo()); crnCommand.setCommand(command.getCommand()); if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) { + log.error("write鍐欏叆浜�9999浠诲姟鍙凤細{}",command); command.setTaskNo((short) 9999); } @@ -411,6 +412,7 @@ // crnCommand.setDestinationStaNo(command.getDestinationStaNo()); crnCommand.setCommand(command.getCommand()); if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) { + log.error("write2鍐欏叆浜�9999浠诲姟鍙凤細{}",command); command.setTaskNo((short) 9999); } -- Gitblit v1.9.1