Merge remote-tracking branch 'origin/dev' into dev

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

@@ -61,6 +61,23 @@ public class DistributionDeliverySelfEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "配送ID")
 	private Long deliveryId;
+	/**
+	 * 司机电话
+	 */
+	@ApiModelProperty(value = "司机电话")
+	private String driverPhone;
+
+	/**
+	 * 司机名称
+	 */
+	@ApiModelProperty(value = "司机名称")
+	private String driverName;
+
+	/**
+	 * 车牌号
+	 */
+	@ApiModelProperty(value = "车牌号")
+	private String vehicleNub;
 	/**
 	 * 预留1
 	 */
@@ -87,4 +104,5 @@ public class DistributionDeliverySelfEntity extends TenantEntity {
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.xml

@@ -18,6 +18,9 @@
         <result column="vehicle_id" property="vehicleId"/>
         <result column="is_master" property="isMaster"/>
         <result column="delivery_id" property="deliveryId"/>
+        <result column="delivery_phone" property="driverPhone"/>
+        <result column="delivery_name" property="driverName"/>
+        <result column="vehicle_nub" property="vehicleNub"/>
         <result column="reserve1" property="reserve1"/>
         <result column="reserve2" property="reserve2"/>
         <result column="reserve3" property="reserve3"/>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -23,6 +23,7 @@
         <result column="description_goods" property="descriptionGoods"/>
         <result column="cargo_number" property="cargoNumber"/>
         <result column="warehouse" property="warehouse"/>
+        <result column="material" property="material"/>
 <!--        <result column="market" property="market"/>-->
         <result column="cargo_unit" property="cargoUnit"/>
         <result column="shop" property="shop"/>

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

@@ -696,6 +696,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					distributionParcelListEntities.forEach(p->{
 						DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity();
 						distributionReservationPackageEntity.setReservationId(distributionReservationDTO.getId());
+						distributionReservationPackageEntity.setPacketBarCode(p.getPacketBarCode());
 						distributionReservationPackageEntity.setParceListId(p.getId());
 						distributionReservationPackageEntity.setStockArticleId(s.getId());
 						//维护订单下包件信息
@@ -710,6 +711,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						distributionReservationPackageEntity.setReservationId(distributionReservationDTO.getId());
 						distributionReservationPackageEntity.setParceListId(p.getId());
 						distributionReservationPackageEntity.setStockArticleId(s.getId());
+						distributionReservationPackageEntity.setPacketBarCode(p.getPacketBarCode());
 						distributionReservationPackageService.save(distributionReservationPackageEntity);
 					});
 					s.setAvailableQuantity(s.getAvailableQuantity() - s.getReservationNum());
@@ -719,6 +721,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				//构建预约订单中间表信息
 				distributionReservationStockarticleEntity.setReservationNum(s.getReservationNum());
 				distributionReservationStockarticleEntity.setStockArticleId(s.getId());
+				distributionReservationStockarticleEntity.setIsHaveData(s.getIsHaveData());
+				distributionReservationStockarticleEntity.setStockArticleCode(s.getStockArticleCode());
 				distributionReservationStockarticleEntity.setReservationId(distributionReservationEntity.getId());
 				distributionReservationStockarticleService.save(distributionReservationStockarticleEntity);
 				//统计订单包件数量