Merge branch 'dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -3740,13 +3740,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		List<TrunklineCarsOrderEntity> 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<DistributionParcelListEntity> 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<TrunklineCarsL
 				String orderCode = carsOrderEntity.getOrderCode();
 				String waybillNo = carsOrderEntity.getWaybillNo();
 				Integer planNum = carsOrderEntity.getPlanNum();
-				Integer realNum = carsOrderEntity.getRealNum();
+//				Integer realNum = carsOrderEntity.getRealNum();
 				if (realNum.equals(0)) {
 					loadingZero(loadId, warehouseId, waybillNo, orderCode, null, planNum, "手动一键装车");
 				}