Merge branch 'dev' into pre-production

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

@@ -9,7 +9,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="";
+	public static final String DEVAUTH ="-tjj";
 
 	/**
 	 * 工厂对接服务名称

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

@@ -1259,7 +1259,7 @@
     <select id="selectPushOldPackageLoading" resultType="com.logpm.oldproject.dto.SignPushDataUnitDTO">
         SELECT
         ldpl.id AS id,
-        ldpl.warehouse_id AS warehouse_id,
+        if(lww.old_id is null,lww.id,lww.old_id) AS warehouseId,
         lddl.id AS distributionId,
         lddl.train_number AS transNo,
         ldpl.waybill_number AS waybillNo,
@@ -1281,6 +1281,7 @@
         AND lddl.is_deleted = 0
         INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldl.package_id = ldpl.id
         AND ldpl.is_deleted = 0
+        LEFT JOIN logpm_warehouse_warehouse AS lww ON ldpl.warehouse_id = lww.id
         WHERE
         ldl.reservation_id = #{reservationId}
         AND ldl.delivery_id = #{deliveryId}
@@ -1290,7 +1291,7 @@
     <select id="selectPushOldPackageSigning" resultType="com.logpm.oldproject.dto.SignPushDataUnitDTO">
         SELECT
         ldpl.id AS id,
-        ldpl.warehouse_id AS warehouse_id,
+        if(lww.old_id is null,lww.id,lww.old_id) AS warehouseId,
         lddl.id AS distributionId,
         lddl.train_number AS transNo,
         ldpl.waybill_number AS waybillNo,
@@ -1312,6 +1313,7 @@
         AND lddl.is_deleted = 0
         INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldl.package_id = ldpl.id
         AND ldpl.is_deleted = 0
+        LEFT JOIN logpm_warehouse_warehouse AS lww ON ldpl.warehouse_id = lww.id
         WHERE
         ldl.reservation_id = #{reservationId}
         AND ldl.delivery_id = #{deliveryId}

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

@@ -288,44 +288,50 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	private void processReservationIds(List<DistributionSignforVO> distributionSignforVOS, List<Long> reservationIds) {
-		List<DistributionParcelListVO> distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationIds(reservationIds);
-//		List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
+//		List<DistributionParcelListVO> distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationIds(reservationIds);
+////		List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
+////			.in(DisStockListDetailEntity::getReservationId, reservationIds)
+////			.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
+////		);
+//		List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntities = distributionReservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
+//			.in(DistributionReservationZeroPackageEntity::getReservationId, reservationIds)
+//			.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
+//		);
+//
+//		List<DisStockListDetailEntity> inventoryList = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
 //			.in(DisStockListDetailEntity::getReservationId,reservationIds)
 //			.ne(DisStockListDetailEntity::getStockPackageStatus,ReservationPackageStatusConstant.quxiao.getValue())
 //		);
-		List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntities = distributionReservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
-			.in(DistributionReservationZeroPackageEntity::getReservationId, reservationIds)
-			.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
-		);
 
-		Map<Long, List<DistributionParcelListVO>> packageMap = distributionParcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListVO::getReservationId));
+
+//		Map<Long, List<DistributionParcelListVO>> packageMap = distributionParcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListVO::getReservationId));
 //		Map<Long, List<DisStockListDetailEntity>> inventoryMap = list.stream().collect(Collectors.groupingBy(DisStockListDetailEntity::getReservationId));
-		Map<Long, List<DistributionReservationZeroPackageEntity>> zeroPackageMap = reservationZeroPackageEntities.stream().collect(Collectors.groupingBy(DistributionReservationZeroPackageEntity::getReservationId));
+//		Map<Long, List<DistributionReservationZeroPackageEntity>> zeroPackageMap = reservationZeroPackageEntities.stream().collect(Collectors.groupingBy(DistributionReservationZeroPackageEntity::getReservationId));
 
 		distributionSignforVOS.forEach(d -> {
 			d.setDeliveryTypeName(getDeliveryTypeName(d.getDeliveryType()));
 
-			int weizhuangchejianshu = getWeizhuangchejianshu(packageMap, d);
-			int zhuangchejianshu = getZhuangchejianshu(packageMap, d);
-			int qianshoujianshu = getQianshoujianshu(packageMap, zeroPackageMap, d);
-			int weiqianshoujianshu = getWeiqianshoujianshu(packageMap, zeroPackageMap, d);
+			int weizhuangchejianshu = d.getReservationNum() - d.getLoadedNumber();
+//			int zhuangchejianshu = getZhuangchejianshu(packageMap, d);
+//			int qianshoujianshu = getQianshoujianshu(packageMap, zeroPackageMap, d);
+			int weiqianshoujianshu = d.getReservationNum() - d.getReceivedQuantity();
 
 			d.setUnloadedNumber(weizhuangchejianshu);
 			d.setAbnormalLoadedNumber(getAbnormalLoading(d));
-			d.setLoadedNumber(zhuangchejianshu);
+			d.setLoadedNumber(d.getLoadedNumber());
 			d.setUnreceivedQuantity(weiqianshoujianshu);
-			d.setReceivedQuantity(qianshoujianshu);
+			d.setReceivedQuantity(d.getReceivedQuantity());
 			d.setAbnormalReceivedQuantity(getAbnormalSigning(d));
 		});
 	}
 
-	private int getWeiqianshoujianshu(Map<Long, List<DistributionParcelListVO>> packageMap, Map<Long, List<DistributionReservationZeroPackageEntity>> zeroPackageMap, DistributionSignforVO d) {
-
-		int fromParcelList = packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> !f.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum();
-		int fromZeroPackage = calculateWeiqianshouFromZeroPackage(zeroPackageMap, d);
-
-		return fromParcelList + fromZeroPackage;
-	}
+//	private int getWeiqianshoujianshu(Map<Long, List<DistributionParcelListVO>> packageMap, Map<Long, List<DistributionReservationZeroPackageEntity>> zeroPackageMap, DistributionSignforVO d) {
+//
+//		int fromParcelList = packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> !f.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum();
+//		int fromZeroPackage = calculateWeiqianshouFromZeroPackage(zeroPackageMap, d);
+//
+//		return fromParcelList + fromZeroPackage;
+//	}
 
 	private int calculateWeiqianshouFromZeroPackage(Map<Long, List<DistributionReservationZeroPackageEntity>> zeroPackageMap, DistributionSignforVO d) {
 		if (!zeroPackageMap.containsKey(d.getReservationId())) return 0;
@@ -345,21 +351,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 
-	private int getWeizhuangchejianshu(Map<Long, List<DistributionParcelListVO>> packageMap, DistributionSignforVO d) {
-		return packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> f.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum();
-	}
-
-	private int getZhuangchejianshu(Map<Long, List<DistributionParcelListVO>> packageMap, DistributionSignforVO d) {
-		return packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> f.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum();
-	}
+//	private int getWeizhuangchejianshu(Map<Long, List<DistributionParcelListVO>> packageMap, DistributionSignforVO d) {
+//		return packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> f.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum();
+//	}
 
+//	private int getZhuangchejianshu(Map<Long, List<DistributionParcelListVO>> packageMap, DistributionSignforVO d) {
+//		return packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> f.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum();
+//	}
 
-	private int getQianshoujianshu(Map<Long, List<DistributionParcelListVO>> packageMap, Map<Long, List<DistributionReservationZeroPackageEntity>> zeroPackageMap, DistributionSignforVO d) {
-		int fromParcelList = packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> f.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum();
-		int fromZeroPackage = calculateQianshouFromZeroPackage(zeroPackageMap, d);
 
-		return fromParcelList + fromZeroPackage;
-	}
+//	private int getQianshoujianshu(Map<Long, List<DistributionParcelListVO>> packageMap, Map<Long, List<DistributionReservationZeroPackageEntity>> zeroPackageMap, DistributionSignforVO d) {
+//		int fromParcelList = packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> f.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum();
+//		int fromZeroPackage = calculateQianshouFromZeroPackage(zeroPackageMap, d);
+//
+//		return fromParcelList + fromZeroPackage;
+//	}
 
 	private int calculateQianshouFromZeroPackage(Map<Long, List<DistributionReservationZeroPackageEntity>> zeroPackageMap, DistributionSignforVO d) {
 		if (!zeroPackageMap.containsKey(d.getReservationId())) return 0;