From 3acafcf0039fc3dca10191b2f364c89ae831c819 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期五, 15 三月 2024 16:00:27 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 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 8017176..2619446 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -219,7 +219,11 @@ toWmsDTO.setWarehouseId("1688469798893297665"); toWmsDTO.setContainerCode(barcode); toWmsDTO.setApplyType("TUNNEL_LOCATION"); - toWmsDTO.setTaskTunnel(taskWrk.getCrnNo()); + if (inSta.getBarcode() == 7 || inSta.getBarcode() == 8){ + toWmsDTO.setTaskTunnel(taskWrk.getCrnNo()); + }else { + toWmsDTO.setTaskTunnel(inSta.getBarcode()); + } toWmsDTO.setCanInboundTunnels(list); String response = null; try { @@ -323,9 +327,18 @@ log.error("杈撻�佺嚎鍛戒护涓嬫柟澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", taskWrk.getWrkNo()); continue;//鍛戒护涓嬪彂澶辫触 } - // 澶嶄綅鍫嗗灈鏈� crnThread.setResetFlag(true); + + if (taskWrk.getIoType() == 1 || taskWrk.getIoType() == 3){ + taskWrk.setWrkSts(4); + } else if (taskWrk.getIoType() == 2) { + taskWrk.setWrkSts(14); + } + if (!taskWrkService.updateById(taskWrk)){ + log.error(taskWrk.getTaskNo()+ " 鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�"); + } + } } @@ -793,6 +806,14 @@ if (commandInfoService.updateById(commandInfo)) {//淇敼鎴愬姛鍚庡浣嶅爢鍨涙満 // 鍫嗗灈鏈哄浣� crnThread.setResetFlag(true); + if (taskWrk.getIoType() == 1 || taskWrk.getIoType() == 3){ + taskWrk.setWrkSts(4); + } else if (taskWrk.getIoType() == 2) { + taskWrk.setWrkSts(14); + } + if (!taskWrkService.updateById(taskWrk)){ + log.error(taskWrk.getTaskNo()+ " 鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�"); + } } } } -- Gitblit v1.9.1