自提订制品签收

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

@@ -1160,7 +1160,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		}
 		//校验包件是否具备被签收的性质
 
-		if (distributionParcelListEntities.stream().anyMatch(p -> !OrderPackageStatusConstant.yiruku.getValue().equals(p.getOrderPackageStatus()))) {
+		if (distributionParcelListEntities.stream().allMatch(p -> !OrderPackageStatusConstant.yiruku.getValue().equals(p.getOrderPackageStatus()))) {
 			String collect = distributionParcelListEntities.stream().filter(p -> !OrderPackageStatusConstant.yiruku.getValue().equals(p.getOrderPackageStatus())).map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(","));
 			log.error(method + "自提签收包件失败,不在库包件进行签收orderPackageCode:{}", collect);
 			return R.fail("当前勾选存在包件不在库,请核对和进行操作");
@@ -1176,6 +1176,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			}
 		}
 
+		//维护自提单状态
+		distrilbutionBillLading.setConditions(BillLadingStatusConstant.yitihuo.getValue());
+		distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
+			.eq(DistributionBillLadingScanEntity::getBillLadingId,distrilbutionBillLading.getId())
+		);
 
 		return R.success("操作成功");
 	}
@@ -1376,6 +1381,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				case 1:
 					//定制品
 					for (DistributionParcelListEntity parcelListEntity : v) {
+						if (OrderPackageStatusConstant.yiqianshou.getValue().equals(parcelListEntity.getOrderPackageStatus())){
+							continue;
+						}
 						DistributionBillLadingScanEntity distributionBillLadingScanEntity = new DistributionBillLadingScanEntity();
 						distributionBillLadingScanEntity.setPacketBarCode(parcelListEntity.getOrderPackageCode());
 						distributionBillLadingScanEntity.setScanType(3);