diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java index 005a6b889..6ab3eb6dc 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java @@ -117,6 +117,7 @@ public class OpenOrderDTO implements Serializable { private Integer trunklineCompleteOrNot;//干线是否整车 0否 1是 + private Long trunklineVehicleTypeId;//提货车型id private String trunklineVehicleType;//提货车型 private String pickupVehicleType;//提货车型 diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java index 89846f789..01ef13cea 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java @@ -468,6 +468,9 @@ public class WarehouseWaybillEntity extends TenantEntity { @ApiModelProperty(value = "干线是否整车 0否 1是") private Integer trunklineCompleteOrNot; + @ApiModelProperty(value = "干线车型 ") + private Long trunklineVehicleTypeId; + @ApiModelProperty(value = "干线车型 ") private String trunklineVehicleType; diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java index 48cc18ba2..d72bf193e 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java @@ -759,10 +759,10 @@ public class AsyncDataServiceImpl implements IAsyncDataService { for (ReceivingOrderEntity receivingOrderEntity : list) { - if (!ArrayUtil.contains(ouPaiProperties.getJidiCanshu(), receivingOrderEntity.getFromWarehouseName())) { - log.info(FactoryConstant.OUPAI, "推送老系统失败，当前仓库不是双流仓，推送失败 {}", receivingOrderEntity.getCurrentWarehouseName()); - continue; - } +// if (!ArrayUtil.contains(ouPaiProperties.getJidiCanshu(), receivingOrderEntity.getFromWarehouseName())) { +// log.info(FactoryConstant.OUPAI, "推送老系统失败，当前仓库不是双流仓，推送失败 {}", receivingOrderEntity.getCurrentWarehouseName()); +// continue; +// } // 查询这个派车单下面的订单 List factoryOrderEntities = factoryOrderService.lambdaQuery().eq(FactoryOrderEntity::getReceivingId, receivingOrderEntity.getId()).eq(FactoryOrderEntity::getTurnStatus, 0).list(); log.info(">>>>>>>>>>>>>>>>>>>>>handlerOuPaiDataToHt 派车单 {} 派车单下面订单集合长度 {}", receivingOrderEntity.getCode(), factoryOrderEntities.size()); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 31b3b8792..b45421f0b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -568,6 +568,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setPickupCompleteOrNot(openOrderDTO.getPickupCompleteOrNot()); waybillEntity.setTrunklineCompleteOrNot(openOrderDTO.getTrunklineCompleteOrNot()); waybillEntity.setTrunklineVehicleType(openOrderDTO.getTrunklineVehicleType()); + waybillEntity.setTrunklineVehicleTypeId(openOrderDTO.getTrunklineVehicleTypeId()); waybillEntity.setPickupVehicleType(openOrderDTO.getPickupVehicleType()); waybillEntity.setAbolishStatus(0); waybillEntity.setFreezeStatus(0); @@ -746,6 +747,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setPickupCompleteOrNot(openOrderDTO.getPickupCompleteOrNot()); waybillEntity.setTrunklineCompleteOrNot(openOrderDTO.getTrunklineCompleteOrNot()); waybillEntity.setTrunklineVehicleType(openOrderDTO.getTrunklineVehicleType()); + waybillEntity.setTrunklineVehicleTypeId(openOrderDTO.getTrunklineVehicleTypeId()); waybillEntity.setPickupVehicleType(openOrderDTO.getPickupVehicleType()); waybillEntity.setDepartureWarehouseId(openOrderDTO.getDepartureWarehouseId()); waybillEntity.setDepartureWarehouseName(openOrderDTO.getDepartureWarehouseName()); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java index f8efd8f61..5d293fb95 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java @@ -252,6 +252,7 @@ public class WarehouseWaybillController extends BladeController { List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); myWatchWarehouse.forEach(warehouseEntity -> warehouseIds.add(warehouseEntity.getId())); } + waybillDTO.setWarehouseIds(warehouseIds); IPage pages = warehouseWaybillService.pageList(waybillDTO); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index b6aae5988..1e132067e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -912,7 +912,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl