广播节点、修复签收列表数量、复核文员上传图片修复

blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java

@@ -60,13 +60,16 @@ public enum WorkNodeEnums implements Serializable {
 
 	PLANNED_RESERVATION(301010, "计划预约"),
 	PLAN_DELIVERY(301020, "计划配送"),
+	DISTRIBUTION_EDIT(301025, "配送计划编辑"),
 	CANCEL_DELIVERY(301030, "计划取消"),
 	PLAN_BILLOFLADING(301040, "计划自提"),
+	EDIT_BILLOFLADING(301045, "自提计划编辑"),
 	CANCEL_BILLOFLADING(301050, "取消自提"),
 	SIGN_BILLOFLADING(301080, "自提签收"),
 	PLAN_DISTRIBUTION(301060, "计划配车"),
 	CANCEL_DISTRIBUTION(301070, "取消配车"),
 
+
 	DISTRIBUTION_LOADING(302010, "配送装车"),
 	DISTRIBUTION_ABNORMAL_LOADING(302020, "异常装车"),
 	DISTRIBUTION_CANCEL_LOADING(302030, "取消装车"),

blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java

@@ -162,6 +162,13 @@ public abstract class FanoutConstants {
 	 * 配送
 	 */
 	public interface distribution {
+		// 配送计划
+		// bianji'
+
+
+
+
+
 		interface signfor{
 			String EXCHANGE = "fanout.distribution.signfor" + ModuleNameConstant.DEVAUTH;
 			interface QUEUE {

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

@@ -80,7 +80,6 @@
                 </foreach>
             </if>
         </where>
-
         GROUP BY
         dbl2.pickup_batch,
         ldpl2.SECOND
@@ -95,7 +94,6 @@
         LEFT JOIN (
         SELECT
         CASE
-
         WHEN
         k.id IS NULL THEN
         m.id
@@ -172,11 +170,11 @@
             <if test="param.pickupBatch != null and param.pickupBatch != ''">and dbl.pickup_batch like
                 concat('%',#{param.pickupBatch},'%')
             </if>
-            <if test="param.pickUpTime != null ">and
-                DATE_FORMAT(pick_up_time,'%y%m%d') = DATE_FORMAT(#{param.pickUpTime},'%y%m%d')
+            <if test="param.pickUpTime != null ">
+                AND DATE_FORMAT(dbl.pick_up_time,'%y%m%d') = DATE_FORMAT(#{param.pickUpTime},'%y%m%d')
             </if>
-            <if test="param.pickUpTimeStart != null">and
-                AND DATE_FORMAT(pick_up_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.pickUpTimeStart},'%y%m%d') AND DATE_FORMAT(#{param.pickUpTimeEnd},'%y%m%d')
+            <if test="param.pickUpTimeStart != null">
+                AND DATE_FORMAT(dbl.pick_up_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.pickUpTimeStart},'%y%m%d') AND DATE_FORMAT(#{param.pickUpTimeEnd},'%y%m%d')
             </if>
             <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
                 and dbl.warehouse_id in

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

@@ -639,6 +639,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 		} else {
 			DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
+			if (Func.isEmpty(distributionDeliveryTripartiteEntity)) {
+				//通过装车扫描传递的车次ID发生变化，提示文员进行计划变更
+				return Resp.scanFail(13000, null, null, null);
+			}
 			BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
 		}
 		List<DistributionParcelListEntity> pushList = new ArrayList<>();
@@ -1083,7 +1087,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//查询已装车件数
 //		String str = getLoadingMsg(distrilbutionloadingscanDTO);
 		trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
-
 		Integer carLaodNum = getCarLaodNum(distrilbutionloadingscanDTO.getDeliveryId());
 		return Resp.scanSuccessWithData("装车成功", carLaodNum + "件", carLaodNum);
 	}

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

@@ -1096,7 +1096,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			 deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId());
 		} else {
 			DistributionDeliveryTripartiteVO deliveryTripartiteInfo = distributionDeliveryTripartiteMapper.getDeliveryTripartiteInfo(deliveryListEntity.getId());
-			BeanUtils.copyProperties(deliverySelfInfo, deliveryTripartiteInfo);
+			BeanUtils.copyProperties(deliveryTripartiteInfo, deliveryTripartiteInfo);
 		}
 		//查询该车次负责司机
 		for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) {
@@ -4340,7 +4340,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			}
 			if (Func.isNotEmpty(parcelListEntities)) {
 				deliveryNub.getAndAdd(parcelListEntities.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum());
-				distributionAppDeliveryListVO.setDeliveryNumber(deliveryNub.get());
+				distributionAppDeliveryListVO.setDeliveryNumber(distributionAppDeliveryListVO.getDeliveryNumber());
 			}
 
 
@@ -4364,7 +4364,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			AtomicInteger ordCount = new AtomicInteger();
 //			List<DistributionAppStockArticleVO> distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryOrderO(distributionAppDeliveryListVO);
 			List<DistributionStockArticleVO> deliveryStockArticleInfo = distributionDeliveryListMapper.getDeliveryStockArticleInfo(distributionAppDeliveryListVO.getId());
-//			deliveryStockArticleInfo.forEach();
 			List<DistributionReservationEntity> distributionReservationEntities = distributionDeliveryListMapper.selectReservationByDeliveryListId(distributionAppDeliveryListVO.getId());
 			distributionReservationEntities.forEach(r -> {
 				List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationMapper.selectStockArticleByReservationId(r.getId());
@@ -5969,14 +5968,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			});
 			if (!distributionSignPrintList.isEmpty()) {
 				//添加
+				this.update(Wrappers.<DistributionSignforEntity>update().lambda()
+					.eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId())
+					.set(DistributionSignforEntity::getDriverSigning, "2")
+					.set(!Objects.isNull(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, "2")
+				);
 				log.info("执行批量保存 {}", distributionSignPrintList);
 				return iDistributionSignPrintService.saveBatch(distributionSignPrintList);
 			}
-			this.update(Wrappers.<DistributionSignforEntity>update().lambda()
-				.eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId())
-				.set(DistributionSignforEntity::getDriverSigning, "2")
-				.set(!Objects.isNull(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, "2")
-			);
+
 
 		}
 		return false;