From 09a307c282dd4541f93791bc27b886cabe565bee Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期日, 21 一月 2024 16:11:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 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 d9f635e..a051bab 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -3166,22 +3166,22 @@ continue; } log.error("灏忚溅浠诲姟瀹屾垚涓嬪彂杈撻�佺嚎浠诲姟锛�"+staProtocol); - try{ - Thread.sleep(1000); - DevpThread devpThreadEnd = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1); - StaProtocol staProtocolEnd = devpThreadEnd.getStation().get(wrkMastSta.getStaEnd()); - log.error("灏忚溅浠诲姟瀹屾垚璇诲彇杈撻�佺嚎浠诲姟锛�"+staProtocolEnd); - if (staProtocolEnd.getWorkNo()==0 ){ //|| !staProtocolEnd.getWorkNo().equals(wrkMast.getWrkNo()) - staProtocolEnd.setWorkNo(wrkMast.getWrkNo()); - staProtocolEnd.setStaNo(wrkMast.getStaNo()); - if (!MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocolEnd))) { - continue; - } - log.error("灏忚溅浠诲姟瀹屾垚涓嬪彂杈撻�佺嚎浠诲姟绗簩娆★細"+staProtocolEnd); - } - }catch (Exception e){ - - } +// try{ +// Thread.sleep(1000); +// DevpThread devpThreadEnd = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1); +// StaProtocol staProtocolEnd = devpThreadEnd.getStation().get(wrkMastSta.getStaEnd()); +// log.error("灏忚溅浠诲姟瀹屾垚璇诲彇杈撻�佺嚎浠诲姟锛�"+staProtocolEnd); +// if (staProtocolEnd.getWorkNo()==0 ){ //|| !staProtocolEnd.getWorkNo().equals(wrkMast.getWrkNo()) +// staProtocolEnd.setWorkNo(wrkMast.getWrkNo()); +// staProtocolEnd.setStaNo(wrkMast.getStaNo()); +// if (!MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocolEnd))) { +// continue; +// } +// log.error("灏忚溅浠诲姟瀹屾垚涓嬪彂杈撻�佺嚎浠诲姟绗簩娆★細"+staProtocolEnd); +// } +// }catch (Exception e){ +// +// } } wrkMastSta.setWrkSts(3); wrkMastStaMapper.updateById(wrkMastSta); -- Gitblit v1.9.1