From 27e041badaa2876d5a7f39da3ff6bb4005b57013 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期一, 11 十一月 2024 16:49:05 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java index 4113b50..8a31403 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java @@ -225,7 +225,7 @@ param.setBarcode(barcode); param.setIoType(1); param.setSourceStaNo(inSta.getStaNo()); - param.setLocType1((short) 1); + param.setLocType1(staProtocol.getLocType1().shortValue()); String response = new HttpHandler.Builder() .setUri(wmsUrl) .setPath("/rpc/pakin/loc/v1") @@ -485,6 +485,14 @@ continue; } + //瑙f瀽鍓嶅垽鏂唴閮ㄧ洰鏍囧�兼槸鍚︽湁鐗� 鏈夊伐浣滃彿 + StaProtocol staProtocolInside = devpThread.getStation().get(Utils.getStaByLev(Utils.getLev(task.getDestLoc()))); + if (staProtocolInside == null) { + continue; + } + if (staProtocolInside.isLoading() || staProtocolInside.getWorkNo() !=0) { + continue; + } if (Cools.isEmpty(task.getShuttleNo())) { //鍒嗛厤灏忚溅 -- Gitblit v1.9.1