diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index d0374924d..339456690 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -3740,13 +3740,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsOrderEntityList = trunklineCarsOrderService.findListByLoadIdAndNodeId(loadId, warehouseId); for (TrunklineCarsOrderEntity carsOrderEntity : carsOrderEntityList) { Integer type = carsOrderEntity.getType(); + Integer realNum = carsOrderEntity.getRealNum(); if (type.equals(1)) { //订制品订单 String orderCode = carsOrderEntity.getOrderCode(); Integer planNum = carsOrderEntity.getPlanNum(); List entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId, "20"); int size = entityListByOrderCode.size(); - if (planNum.equals(size)) { + if (planNum.equals(size+realNum)) { for (DistributionParcelListEntity parcelListEntity : entityListByOrderCode) { String orderPackageCode = parcelListEntity.getOrderPackageCode(); //查询包件是否已经装车 @@ -3761,7 +3762,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl