1.海运出口列表增加国外代理检索条件

2.新流程校验注释

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -121,6 +121,8 @@ public class BillsController extends BladeController {
 				.like(Bills::getPolEnName, bills.getPolEnName()).or().like(Bills::getPolCode, bills.getPolEnName()))
 			.and(ObjectUtils.isNotNull(bills.getDestinationName()), i -> i.like(Bills::getDestinationName, bills.getDestinationName()).or()
 				.like(Bills::getDestinationCode, bills.getDestinationName()))
+			.and(ObjectUtils.isNotNull(bills.getForeignAgencyDetails()), i -> i.like(Bills::getForeignAgencyCode, bills.getForeignAgencyDetails()).or()
+				.like(Bills::getForeignAgencyCnName, bills.getForeignAgencyDetails()).or().like(Bills::getForeignAgencyEnName, bills.getForeignAgencyDetails()))
 			.and(ObjectUtils.isNotNull(bills.getLineCnName()), i -> i.like(Bills::getLineCnName, bills.getLineCnName()).or()
 				.like(Bills::getLineEnName, bills.getLineCnName()))
 			.and(ObjectUtils.isNotNull(bills.getCyCnName()), i -> i.like(Bills::getCyCode, bills.getCyCnName()).or()
@@ -645,6 +647,8 @@ public class BillsController extends BladeController {
 				.like(Bills::getPolEnName, bills.getPolEnName()).or().like(Bills::getPolCode, bills.getPolEnName()))
 			.and(ObjectUtils.isNotNull(bills.getLineCnName()), i -> i.like(Bills::getLineCnName, bills.getLineCnName()).or()
 				.like(Bills::getLineEnName, bills.getLineCnName()))
+			.and(ObjectUtils.isNotNull(bills.getForeignAgencyDetails()), i -> i.like(Bills::getForeignAgencyCode, bills.getForeignAgencyDetails()).or()
+				.like(Bills::getForeignAgencyCnName, bills.getForeignAgencyDetails()).or().like(Bills::getForeignAgencyEnName, bills.getForeignAgencyDetails()))
 			.and(ObjectUtils.isNotNull(bills.getCyCnName()), i -> i.like(Bills::getCyCode, bills.getCyCnName()).or()
 				.like(Bills::getCyCnName, bills.getCyCnName()).or().like(Bills::getCyEnName, bills.getCyCnName()))
 			.eq(ObjectUtils.isNotNull(bills.getSrcType()), Bills::getSrcType, bills.getSrcType())

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -6581,7 +6581,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		if (detail == null) {
 			throw new SecurityException("未查到单据信息");
 		}
-		List<PreContainers> preContainersList = preContainersService.list(new LambdaQueryWrapper<PreContainers>()
+		/*List<PreContainers> preContainersList = preContainersService.list(new LambdaQueryWrapper<PreContainers>()
 			.eq(PreContainers::getTenantId, AuthUtil.getTenantId())
 			.eq(PreContainers::getIsDeleted, 0)
 			.eq(PreContainers::getPid, detail.getId()));
@@ -6593,13 +6593,13 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		}
 		if (ObjectUtils.isNotNull(texts.toString())) {
 			return R.success(texts.toString());
-		}
+		}*/
 		StringBuilder text = new StringBuilder();
-		for (PreContainers containers : preContainersList) {
+		/*for (PreContainers containers : preContainersList) {
 			if (containers.getSalesPrice().compareTo(containers.getCostPrice()) > 0) {
 				text.append(containers.getCntrTypeCode()).append("销售价大于成本中心销售价，是否继续！");
 			}
-		}
+		}*/
 		if (ObjectUtils.isNotNull(text.toString())) {
 			return R.success(text.toString());
 		} else {