审核异常BUG修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -398,9 +398,9 @@ public class DistributionReservationController extends BladeController {
 	@GetMapping("/getReservationZeroOrderDetail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "客户列表零担详情", notes = "传入distrbutionReservation")
-	public R<List<DistributionParcelNumberVO>> getReservationZeroOrderDetail(@ApiIgnore @RequestParam Long id,@ApiIgnore @RequestParam Long reservationId) {
+	public R getReservationZeroOrderDetail(@ApiIgnore @RequestParam Long id,@ApiIgnore @RequestParam Long reservationId) {
-		List<DistributionParcelNumberVO> parcelNumberVOS = reservationService.getReservationZeroOrderDetail(id,reservationId);
+		R r = reservationService.getReservationZeroOrderDetail(id,reservationId);
-		return R.data(parcelNumberVOS);
+		return r;
 	}
 
 

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

@@ -597,4 +597,11 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 	 */
 	List<Long> selectDeliveyId(@Param("param") DistributionAppDeliveryListDTO distributionDeliveryList);
 
+	/**
+	 * 查询商配零担计划数量
+	 * @param orderId
+	 * @param deliveryId
+	 * @return
+	 */
+	Integer selectDeliveryZeroPackagePlanNum(@Param("orderId")Long orderId,@Param("deliveryId") Long deliveryId,@Param("packageId") Long packageId);
 }

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

@@ -2692,5 +2692,23 @@
         AND DATE_FORMAT( lddl.task_time, '%y%m%d' ) BETWEEN DATE_FORMAT( #{param.taskTime_start}, '%y%m%d' ) AND DATE_FORMAT( #{param.taskTime_end}, '%y%m%d' )
         AND lddl.warehouse_id = #{param.warehouseId}
     </select>
+    <select id="selectDeliveryZeroPackagePlanNum" resultType="java.lang.Integer">
+        SELECT
+        ldrzp.quantity
+        FROM
+        logpm_distribution_delivery_list AS lddl
+        INNER JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id
+        INNER JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
+        LEFT JOIN logpm_distribution_reservation_stockarticle AS ldrs ON ldr.id = ldrs.reservation_id
+        LEFT JOIN logpm_distribution_reservation_zero_package AS ldrzp ON ldrs.stock_article_id = ldrzp.stock_article_id AND ldrzp.reservation_id = ldrs.reservation_id
+        LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrzp.parcel_list_id = ldpl.id AND ldpl.stock_article_id = ldrs.stock_article_id
+        LEFT JOIN logpm_distribution_parcel_number AS ldpn ON ldpl.id = ldpn.parcel_list_id
+        WHERE
+        ldrs.stock_article_id = #{orderId}
+        AND lddl.id=#{deliveryId}
+        AND ldrzp.parcel_list_id=#{packageId}
+        and ldrs.stock_article_status in ('1','3')
+        AND ldrzp.zero_package_status IN ( '1', '3' )
+    </select>
 
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -231,7 +231,7 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	 * @param id
 	 * @return
 	 */
-	List<DistributionParcelNumberVO> getReservationZeroOrderDetail(Long id,Long reservationId);
+	R getReservationZeroOrderDetail(Long id,Long reservationId);
 
 	/**
 	 * 查询预约订单的包件信息

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

@@ -6030,13 +6030,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		List<DistributionParcelNumberVO> parcelNumberVOS = baseMapper.selectDeliveryZeroOrderDetail(orderId, deliveryId);
 		Map<Long, DistributionParcelNumberVO> reservationNum = parcelNumberVOS.stream().collect(Collectors.toMap(DistributionParcelNumberVO::getParcelListId, Function.identity(), (k1, k2) -> k2));
 		zeroOrderDetail.forEach(z -> {
-			Integer integer = 0;
+			Integer planNum = baseMapper.selectDeliveryZeroPackagePlanNum(orderId, deliveryId,z.getParcelListId());
-			if (Func.isNotEmpty(reservationNum.get(z.getParcelListId()))) {
+			if (!Objects.isNull(planNum)){
-				integer = reservationNum.get(z.getParcelListId()).getReservationNum();
+				z.setReservationNum(planNum);
-				z.setReservationNum(reservationNum.get(z.getParcelListId()).getReservationNum());
+				z.setMaxPlanNum((z.getMaxPlanNum()+planNum));
+			}else {
+				z.setReservationNum(0);
 			}
-			int quantity = z.getHandQuantity() - z.getDeliveryQuantity() + integer;
-			z.setNumber(quantity);
 		});
 		return R.data(zeroOrderDetail);
 	}
@@ -8780,7 +8780,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (isAbnormalLoadingFlag) {
 						log.info("异常装车判定成功>>>>>>packageCode:{},reservationId:{}", distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getReservationId());
 						//已发车无法进行异常装车
-						if (DeliveryStartStatusConstant.yifache.equals(deliveryListEntity.getIsStart())) {
+						if (DeliveryStartStatusConstant.yifache.getValue().equals(deliveryListEntity.getIsStart())) {
 							return Resp.scanFail("已发车无法进行异常装车", "已发车无法进行异常装车");
 						}
 						if (Objects.isNull(distrilbutionloadingscanDTO.getReservationId())) {

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

@@ -272,6 +272,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	@Autowired
 	private DistributionLoadscanMapper distributionLoadscanMapper;
 
+
 	@Autowired
 	private DistributionStockMapper distributionStockMapper;
 
@@ -3668,7 +3669,15 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	}
 
 	@Override
-	public List<DistributionParcelNumberVO> getReservationZeroOrderDetail(Long id, Long reservationId) {
+	public R getReservationZeroOrderDetail(Long id, Long reservationId) {
+		List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda()
+			.eq(DistributionLoadscanEntity::getReservationId, reservationId)
+			.eq(DistributionLoadscanEntity::getOrderId, id)
+			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+		);
+		if (!Func.isEmpty(loadscanEntityList)) {
+			return R.fail("当前零担已装车");
+		}
 		List<DistributionParcelNumberVO> zeroOrderDetail = distributionStockArticleService.getZeroOrderDetail(id);
 		for (DistributionParcelNumberVO distributionParcelNumberVO : zeroOrderDetail) {
 			Integer planNum = distributionReservationMapper.getZeroPackagePlanNum(id,reservationId,distributionParcelNumberVO.getParcelListId());
@@ -3679,14 +3688,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				distributionParcelNumberVO.setReservationNum(0);
 			}
 		}
-//		List<DistributionParcelNumberVO> parcelNumberVOS = baseMapper.selectReservationZeroOrderDetail(id, reservationId);
+
-//		Map<Long, DistributionParcelNumberVO> reservationNum = parcelNumberVOS.stream().collect(Collectors.toMap(DistributionParcelNumberVO::getParcelListId, Function.identity(), (k1, k2) -> k2));
+		return R.data(zeroOrderDetail);
-//		zeroOrderDetail.forEach(z -> {
-//			if (Func.isNotEmpty(reservationNum.get(z.getParcelListId()))) {
-//				z.setReservationNum(reservationNum.get(z.getParcelListId()).getReservationNum());
-//			}
-//		});
-		return zeroOrderDetail;
 	}
 
 	@Override

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

@@ -8649,6 +8649,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		long count = distributionLoadscanAbnormalService.count(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
 			.eq(DistributionLoadscanAbnormalEntity::getReservationId, reservationId)
 			.eq(DistributionLoadscanAbnormalEntity::getAuditingStatus, LoadingAbnormalAuditingStatusConstant.daishenhe.getValue())
+			.eq(DistributionLoadscanAbnormalEntity::getComplete, Integer.parseInt(IsOrNoConstant.yes.getValue()))
 		);
 		if (count == 0) {
 			//进行签收的维护