From 0999c98742040f20349484e6d04dc116bfa9e354 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 15 Dec 2023 19:18:48 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/warehouse/feign/IWarehouseTrayTypeClient.java | 3 +++ .../com/logpm/factory/receiver/OrderStatusHandler.java | 7 ++++++- .../com/logpm/warehouse/feign/WarehouseTrayTypeClient.java | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java index 3309d22c9..8a5457f16 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java @@ -67,4 +67,7 @@ public interface IWarehouseTrayTypeClient { void deleteZeroOrderByTrayCode(@RequestParam String orderCode, @RequestParam String palletCode, @RequestParam Long wid); @GetMapping(API_PREFIX+"/changeTrayWarehouseInfo") void changeTrayWarehouseInfo(@RequestParam String trayCode, @RequestParam Long warehouseId); + + @GetMapping(API_PREFIX+"/trayToNull") + void trayToNull(@RequestParam String trayCode); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java index c520376f3..288b698c6 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java @@ -221,7 +221,12 @@ public class OrderStatusHandler { boolean b = warehouseTrayTypeClient.orderScanOrderPackageCode(m); if(!b){ log.warn("####################orderStatusHandler: 打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId); - return; + //先去空置托盘再打托 + warehouseTrayTypeClient.trayToNull("T"+trayId); + boolean b1 = warehouseTrayTypeClient.orderScanOrderPackageCode(m); + if(!b1){ + log.warn("####################orderStatusHandler: 二次打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId); + } } }else{ //有上架就上架 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayTypeClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayTypeClient.java index 33dcaccb0..fe98348f8 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayTypeClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayTypeClient.java @@ -89,5 +89,10 @@ public class WarehouseTrayTypeClient implements IWarehouseTrayTypeClient { warehouseTrayTypeService.changeTrayWarehouseInfo(trayCode,warehouseId); } + @Override + public void trayToNull(String trayCode) { + warehouseTrayTypeService.trayToNull(trayCode); + } + }