自提新增、编辑维护包件信息

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

@@ -404,7 +404,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			//修改零担数据
 			updetaParcelNum(distrilbutionBillLading);
 			//修改图片
-			List<DistributionPrintEntity> printEntityList = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda().eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLading.getId()));
+			List<DistributionPrintEntity> printEntityList = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda()
+				.eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLading.getId())
+			);
 			if (!printEntityList.isEmpty()) {
 				boolean blobFlag = printEntityList.stream().anyMatch(p -> p.getSite().contains("blob"));
 				if (blobFlag) {
@@ -623,7 +625,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						}
 
 						List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
-							.eq(DistributionParcelListEntity::getStockArticleId, i.getStockArticleId()));
+							.eq(DistributionParcelListEntity::getStockArticleId, i.getStockArticleId())
+							.eq(DistributionParcelListEntity::getIsTransfer, 0)
+						);
 						int sum = list1.stream().filter(ii -> ii.getOrderPackageReservationStatus().equals(OrderPackageReservationStatusConstant.daiyuyue.getValue())).collect(Collectors.toList()).stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
 						if (sum == 0) {
 							log.debug("####{}当前订单备货包件为空，无法创建任务！", byId.getOrderCode());
@@ -2292,6 +2296,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					.ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue())
 					.ne(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yichuku.getValue())
 					.ne(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue())
+					.eq(DistributionParcelListEntity::getIsTransfer, 0)
 				);
 
 				if (!Func.isEmpty(parcelListEntities)) {