Merge branch 'dev' into pre-production

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

@@ -494,4 +494,10 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 	 */
 	List<DistributionSignforEntity> selectSignforByDeliveryId(@Param("deliveryId")Long deliveryId);
 
+	/**
+	 * 检查配送任务是否进行发车
+	 * @param deliveryListEntityId
+	 * @return
+	 */
+    Boolean checkDeliveryStart(@Param("deliveryId")Long deliveryId);
 }

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

@@ -2241,5 +2241,8 @@
         GROUP BY
         lds.reservation_id
     </select>
+    <select id="checkDeliveryStart" resultType="java.lang.Boolean">
+        SELECT IF(departure_time is null,true,false) FROM  logpm_distribution_delivery_self WHERE delivery_id  = #{deliveryId}   AND is_master = 2
+    </select>
 
 </mapper>

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

@@ -2661,6 +2661,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (deliveryListEntity.getDeliveryStatus().equals(DeliveryStatusConstant.yiwancheng.getValue())) {
 			return R.fail("配送已完成...");
 		}
+		//检测是否进行发车
+		Boolean isStrat = baseMapper.checkDeliveryStart(deliveryListEntityId);
+		//TODO 发车校验
+//		if (isStrat){
+//			return R.fail("配送已发车,请取消发车后进行任务编辑...");
+//		}
 		if (IsOrNoConstant.yes.getValue().equals(deliveryListDTO.getIsDeliveryDriverUpdate())) {
 			//查看是否满足进行司机修改
 			//查询是否存在有装车数据，存在装车则不满足司机切换
@@ -4509,7 +4515,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		String loadingId = distrilbutionloadingscanDTO.getLoadingId();
 		Boolean b = false;
 		if ("1".equals(distributionDeliveryListEntity.getKind())) {
-			b = distributionDeliverySelfService.update(new UpdateWrapper<DistributionDeliverySelfEntity>().lambda().eq(DistributionDeliverySelfEntity::getId, loadingId).set(DistributionDeliverySelfEntity::getDepartureTime, format));
+			b = distributionDeliverySelfService.update(new UpdateWrapper<DistributionDeliverySelfEntity>().lambda()
+				.eq(DistributionDeliverySelfEntity::getId, loadingId)
+				.set(DistributionDeliverySelfEntity::getDepartureTime, format)
+			);
 		} else {
 			b = distributionDeliveryTripartiteService.update(new UpdateWrapper<DistributionDeliveryTripartiteEntity>().lambda().eq(DistributionDeliveryTripartiteEntity::getId, loadingId).set(DistributionDeliveryTripartiteEntity::getDepartureTime, format));
 
@@ -7189,7 +7198,29 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	public R cancelStart(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
-		return null;
+		//获取当前用户司机
+		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
+		if ("3".equals(distributionDeliveryListEntity.getDeliveryStatus())) {
+			return Resp.scanFail("该任务已完结！", "该任务已完结!");
+		}
+		String loadingId = distrilbutionloadingscanDTO.getLoadingId();
+		Boolean b = false;
+		if ("1".equals(distributionDeliveryListEntity.getKind())) {
+			b = distributionDeliverySelfService.update(new UpdateWrapper<DistributionDeliverySelfEntity>().lambda()
+				.eq(DistributionDeliverySelfEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
+				.eq(DistributionDeliverySelfEntity::getIsMaster, "2")
+				.set(DistributionDeliverySelfEntity::getDepartureTime, null)
+			);
+		} else {
+			b = distributionDeliveryTripartiteService.update(new UpdateWrapper<DistributionDeliveryTripartiteEntity>().lambda()
+				.eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
+				.set(DistributionDeliveryTripartiteEntity::getDepartureTime, null)
+			);
+		}
+		//修改主表状态
+		distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.daipeisong.getValue());
+		baseMapper.updateById(distributionDeliveryListEntity);
+		return R.success("取消发车成功");
 	}
 
 	@Override

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

@@ -193,6 +193,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	private ITrunklinePackageTrackLogClient trunklinePackageTrackLogClient;
 
 
+
 	@Override
 	public IPage<DistrilbutionBillLadingVO> selectDistrilbutionBillLadingPage(IPage<DistrilbutionBillLadingVO> page, DistrilbutionBillLadingVO distrilbutionBillLading) {
 		return page.setRecords(baseMapper.selectDistrilbutionBillLadingPage(page, distrilbutionBillLading));
@@ -1064,6 +1065,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			if (!ladingScanEntities.isEmpty()) {
 //				进行签收扫描数据补录
 				distributionBillLadingScanService.saveBatch(ladingScanEntities);
+				String collect = ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.joining(","));
+				warehouseUpdownTypeClient.downPackageAndDelTrayAndIsUpdate(collect,myCurrentWarehouse.getId(),"后台PC自提签收下架",false);
+
 			}
 		}
 
@@ -1298,6 +1302,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						distributionBillLadingScanEntity.setOrderSelfNumbering(parcelListEntity.getOrderCode());
 						distributionBillLadingScanEntity.setStockArticleId(parcelListEntity.getStockArticleId());
 						distributionBillLadingScanEntity.setBillLadingId(id);
+						distributionBillLadingScanEntity.setWarehouseId(warehouseId);
 						distributionBillLadingScanEntity.setMaterialType("2");
 						distributionBillLadingScanEntity.setQuantity(parcelListEntity.getQuantity());
 						ladingScanEntities.add(distributionBillLadingScanEntity);
@@ -1335,6 +1340,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						DistributionBillLadingScanEntity distributionBillLadingScanEntity = new DistributionBillLadingScanEntity();
 						distributionBillLadingScanEntity.setPacketBarCode(parcelListEntity.getOrderPackageCode());
 						distributionBillLadingScanEntity.setScanType(3);
+						distributionBillLadingScanEntity.setWarehouseId(warehouseId);
 						distributionBillLadingScanEntity.setParcelListId(parcelListEntity.getId());
 						distributionBillLadingScanEntity.setOrderSelfNumbering(parcelListEntity.getOrderCode());
 						distributionBillLadingScanEntity.setStockArticleId(parcelListEntity.getStockArticleId());