自提备货BUG修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -1179,7 +1179,6 @@ public class DistributionStockupAppController extends BladeController {
 				}
 			}
 
-
 			// 2打印处理的扫码
 			// 查询当前库位上最早入库的指定物料库存品
 			byId = disStockOrdercodeRecoService.selectStockOrdercodeRecoListByCode(stockupDTO.getCargoNumber(), stockupDTO.getAllocationId(), stockupDTO.getMallName());

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

@@ -2556,6 +2556,16 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		//查询签收件数
 		//查询库存品数
 //		查询签收完成订单数
+		List<DistrilbutionBillStockEntity> entityList = distrilbutionBillStockService.list(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
+			.eq(DistrilbutionBillStockEntity::getBillLadingId, billLadingId)
+			.ne(DistrilbutionBillStockEntity::getOrderStatus, "2")
+		);
+		if (entityList.isEmpty()) {
+			mainVO.setList(null);
+			return mainVO;
+		}
+
+
 		List<Boolean> num = baseMapper.getCompleteNum(billLadingId);
 		if (Func.isNotEmpty(num)) {
 			int size = num.stream().filter(f -> f.equals(true)).collect(Collectors.toList()).size();