From ad2775412691be4f4d9dd4e33264df7851759eac Mon Sep 17 00:00:00 2001 From: pjb <pjb123456> Date: 星期五, 25 七月 2025 09:46:33 +0800 Subject: [PATCH] 回原点任务下发后等待3秒,避免和入出库任务冲突 --- src/main/java/com/zy/service/impl/MainServiceImpl.java | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java index 3ee27ba..5b6df08 100644 --- a/src/main/java/com/zy/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java @@ -1155,21 +1155,23 @@ // 绌烘《鍏ュ簱瀹屾垚锛屽厛瀹屾垚瀵瑰簲搴撲綅缁勪换鍔� if(wrkMast.getWorkNoOther() != 0 ){ WrkMast wrkMast1 = wrkMastService.selectByWrkNo(wrkMast.getWorkNoOther()); - // 浜ゆ崲搴撲綅鍙� - String locNo = wrkMast.getLocNo(); - wrkMast.setLocNo(wrkMast1.getLocNo()); - // 浜ゆ崲鍏ュ簱鏃堕棿锛屾彁鍙栧簱瀛樻椂鎸夐『搴忓厛娴呭悗娣� - Date ioTime = wrkMast.getIoTime(); - if(locNo.startsWith("10")) { - wrkMast.setIoTime(wrkMast1.getIoTime()); - wrkMast1.setIoTime(ioTime); + if (wrkMast1 != null) { + // 浜ゆ崲搴撲綅鍙� + String locNo = wrkMast.getLocNo(); + wrkMast.setLocNo(wrkMast1.getLocNo()); + // 浜ゆ崲鍏ュ簱鏃堕棿锛屾彁鍙栧簱瀛樻椂鎸夐『搴忓厛娴呭悗娣� + Date ioTime = wrkMast.getIoTime(); + if(locNo.startsWith("10")) { + wrkMast.setIoTime(wrkMast1.getIoTime()); + wrkMast1.setIoTime(ioTime); + } + wrkMast1.setLocNo(locNo); + wrkMast1.setCrnEndTime(now); + wrkMast1.setModiTime(now); + wrkMast1.setWrkSts(4L); + wrkMast1.setWorkNoOther(0); + wrkMastMapper.updateById(wrkMast1); } - wrkMast1.setLocNo(locNo); - wrkMast1.setCrnEndTime(now); - wrkMast1.setModiTime(now); - wrkMast1.setWrkSts(4L); - wrkMast1.setWorkNoOther(0); - wrkMastMapper.updateById(wrkMast1); } wrkMast.setCrnEndTime(now); wrkMast.setModiTime(now); @@ -1245,7 +1247,7 @@ basCrnpService.updateById(basCrnp); // 璁剧疆鏇存柊鏃堕棿锛岄伩鍏嶉噸澶嶄笅鍙戝洖鍘熺偣 log.info("{}鍙峰爢鍨涙満鍥炲師鐐逛换鍔′笅鍙戞垚鍔燂細{}", crn.getId(), JSON.toJSON(crnCommand)); } - Thread.sleep(2000); + Thread.sleep(3000); } } } -- Gitblit v1.9.1