diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/AsyncDataServiceImpl.java index 1c24d4534..36b14f9d1 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/AsyncDataServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/AsyncDataServiceImpl.java @@ -380,7 +380,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { Long allocationId = taryAllocationService.getAllocationIdByTrayId(basicdataTrayEntity.getId()); if(Objects.isNull(allocationId)){ //没有上架就直接打托 - R response = trayTypeService.orderScanOrderPackageCode(newTrayType,"T"+trayId,orderPackageCode,newWarehouseId); + R response = trayTypeService.orderScanOrderPackageCodeSync(newTrayType,"T"+trayId,orderPackageCode,newWarehouseId); int code = response.getCode(); String msg = response.getMsg(); if(code == 4001){ @@ -416,7 +416,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { } } - R r = trayTypeService.orderScanOrderPackageCode(newTrayType,"T"+trayId,orderPackageCode,newWarehouseId); + R r = trayTypeService.orderScanOrderPackageCodeSync(newTrayType,"T"+trayId,orderPackageCode,newWarehouseId); int code1 = r.getCode(); if(code1 != 200){ log.warn("####################orderStatusHandler: 二次打托失败 orderPackageCode={} trayCode={}",orderPackageCode,"T"+trayId); @@ -439,7 +439,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { updownTypeService.downPackage(upShelfPackageList,wid); } - R r = trayTypeService.orderScanOrderPackageCode(newTrayType, "T" + trayId, orderPackageCode, newWarehouseId); + R r = trayTypeService.orderScanOrderPackageCodeSync(newTrayType, "T" + trayId, orderPackageCode, newWarehouseId); int code1 = r.getCode(); if(code1 != 200){ log.warn("####################orderStatusHandler: 二次打托失败 orderPackageCode={} trayCode={}",orderPackageCode,"T"+trayId); @@ -451,7 +451,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { //先去空置托盘再打托 trayTypeService.trayToNull("T"+trayId); - R r = trayTypeService.orderScanOrderPackageCode(newTrayType, "T" + trayId, orderPackageCode, newWarehouseId); + R r = trayTypeService.orderScanOrderPackageCodeSync(newTrayType, "T" + trayId, orderPackageCode, newWarehouseId); int code1 = r.getCode(); if(code1 != 200){ log.warn("####################orderStatusHandler: 二次打托失败 orderPackageCode={} trayCode={}",orderPackageCode,"T"+trayId); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index 1d394ad84..b77e7f8cb 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -434,7 +434,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl