配送增加是否整车字段

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java

@@ -287,7 +287,11 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	 * 是否发车 0-否   1-是
 	 */
 	@ApiModelProperty(value = "是否发车 0-否   1-是")
-	private Integer isStart;
+	private Integer isStart;	/**
+	 * 是否发车 0-否   1-是
+	 */
+	@ApiModelProperty(value = "是否发车 0-否   1-是")
+	private Integer isAll;
 
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java

@@ -92,5 +92,11 @@ public class DistributionDeliveryAllocationDTO {
 	@ApiModelProperty(value = "费用")
 	private BigDecimal price;
 
+	/**
+	 * 是否整车
+	 */
+	@ApiModelProperty(value = "是否整车")
+	private Integer isAll;
+
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -3641,6 +3641,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		deliveryListEntity.setDeliveryNumber(deliveryPackageTotal.get());
 		deliveryListEntity.setCustomersNumber(clientTotal.get());
 		deliveryListEntity.setTaskTime(deliveryListDTO.getTaskTime());
+		deliveryListEntity.setIsAll(deliveryListDTO.getIsAll());
 		//对配送进行更改
 		this.updateById(deliveryListEntity);
 		//对修改计划下的所有包件进行维护
@@ -4147,6 +4148,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		deliveryListEntity.setDeliveryNumber(packageTotal.get());
 		deliveryListEntity.setInventoryNub(inventoryTotal.get());
 		deliveryListEntity.setCustomersNumber(clientTotal.get());
+		deliveryListEntity.setIsAll(deliveryListDTO.getIsAll());
 		//对配送进行更改
 		this.updateById(deliveryListEntity);
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -1460,7 +1460,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		distributionDeliveryListEntity.setTaskTime(taskTime);
 		distributionDeliveryListEntity.setDeliveryNumber(packageNum.get());
 		distributionDeliveryListEntity.setInventoryNub(inventoryNum.get());
-		distributionDeliveryListEntity.setIsStart(DeliveryStartStatusConstant.daifache.getValue());
+		distributionDeliveryListEntity.setInventoryNub(inventoryNum.get());
+		distributionDeliveryListEntity.setIsAll(allocationDTO.getIsAll());
+
 		distributionDeliveryListService.updateById(distributionDeliveryListEntity);
 		String content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getUser().getNickName() + "转车次任务,操作方式:批量预约任务转配送,车次号:" + distributionDeliveryListEntity.getTrainNumber();
 		distributionAsyncService.recordsReservationDeliveryLog(reservationEntityList, myCurrentWarehouse, user, distributionDeliveryListEntity, WorkNodeEnums.PLAN_DISTRIBUTION.getCode(), content);
@@ -2679,6 +2681,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		distributionDeliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.weizhuangche.getValue());
 		distributionDeliveryListEntity.setWarehouseId(myCurrentWarehouse.getId());
 		distributionDeliveryListEntity.setIsStart(DeliveryStartStatusConstant.daifache.getValue());
+		distributionDeliveryListEntity.setIsAll(allocationDTO.getIsAll());
 		distributionDeliveryListService.updateById(distributionDeliveryListEntity);
 		//推送信息至运单追中日志
 		if (!aaa.isEmpty()) {