1.集装箱生成放箱号增加字段判断是否系统自动生成

2.箱池动态导入接口增加手动创建放箱号重新计算箱量逻辑
3.海运进出口客户查询增加编码查询
4.同步账单日期，船名航次

blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/controller/BCorpsController.java

@@ -204,7 +204,9 @@ public class BCorpsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCorps.getCode()), BCorps::getCode, bCorps.getCode())
 			.eq(ObjectUtils.isNotNull(bCorps.getStatus()), BCorps::getStatus, bCorps.getStatus())
 			.like(ObjectUtils.isNotNull(bCorps.getEnName()), BCorps::getEnName, bCorps.getEnName())
-			.like(ObjectUtils.isNotNull(bCorps.getShortName()), BCorps::getShortName, bCorps.getShortName())
+			.and(ObjectUtils.isNotNull(bCorps.getShortName()), i -> i.like(BCorps::getCode, bCorps.getShortName()).or()
+				.like(BCorps::getCnName, bCorps.getShortName()).or().like(BCorps::getEnName, bCorps.getShortName())
+				.or().like(BCorps::getShortName, bCorps.getShortName()))
 			.like(ObjectUtils.isNotNull(bCorps.getUscc()), BCorps::getUscc, bCorps.getUscc());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapper.apply("(find_in_set('" + AuthUtil.getDeptId() + "',branch_id) or branch_id is null)");

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

@@ -922,6 +922,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 						item.setEta(bills.getEta());
 						item.setActualEta(bills.getActualEta());
 						item.setActualEtd(bills.getActualEtd());
+						item.setBillDate(bills.getBillDate());
 						item.setIssueDate(bills.getIssueDate());
 						item.setBoxBelongsTo(bills.getBoxBelongsTo());
 						item.setVesselId(bills.getVesselId());
@@ -970,6 +971,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 						.eq(FeeCenter::getIsDeleted, 0)
 						.eq(FeeCenter::getPid, billIds));
 					for (FeeCenter item : feeCenterList) {
+						item.setEta(bills.getEta());
+						item.setEtd(bills.getEtd());
+						item.setBillDate(bills.getBillDate());
 						item.setVesselId(bills.getVesselId());
 						item.setVesselCnName(bills.getVesselCnName());
 						item.setVesselEnName(bills.getVesselEnName());
@@ -991,6 +995,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					for (FinAccBills item : finAccBillsList) {
 						Bills bill = billsList.stream().filter(e -> e.getId().equals(item.getBusinessBillId())).findFirst().orElse(null);
 						if (bill != null) {
+							item.setEtd(bill.getEtd());
+							item.setEta(bill.getEta());
+							item.setBillDate(bill.getBillDate());
 							item.setVesselId(bill.getVesselId());
 							item.setVesselCnName(bill.getVesselCnName());
 							item.setVesselEnName(bill.getVesselEnName());
@@ -1275,6 +1282,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setEta(bills.getEta());
 				item.setActualEta(bills.getActualEta());
 				item.setActualEtd(bills.getActualEtd());
+				item.setBillDate(bills.getBillDate());
 				item.setVesselId(bills.getVesselId());
 				item.setVesselCnName(bills.getVesselCnName());
 				item.setVesselEnName(bills.getVesselEnName());
@@ -1552,6 +1560,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				if (!finAccBillsList.isEmpty()) {
 					List<FinAccBills> finAccBills = finAccBillsList.stream().filter(e -> e.getId().equals(item.getAccBillId())).collect(Collectors.toList());
 					for (FinAccBills data : finAccBills) {
+						data.setBillDate(item.getBillDate());
 						data.setBookingAgentId(item.getBookingAgentId());
 						data.setBookingAgentCnName(item.getBookingAgentCnName());
 						data.setBookingAgentEnName(item.getBookingAgentEnName());
@@ -5561,6 +5570,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					item.setEta(bills.getEta());
 					item.setActualEta(bills.getActualEta());
 					item.setActualEtd(bills.getActualEtd());
+					item.setBillDate(bills.getBillDate());
 					item.setVesselId(bills.getVesselId());
 					item.setVesselCnName(bills.getVesselCnName());
 					item.setVesselEnName(bills.getVesselEnName());
@@ -5589,6 +5599,54 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					item.setIssueAt(bills.getIssueAt());
 				}
 				this.updateBatchById(billsList);
+				List<Long> billIds = billsList.stream().map(Bills::getId).collect(Collectors.toList());
+				List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
+					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+					.eq(FeeCenter::getIsDeleted, 0)
+					.eq(FeeCenter::getPid, billIds));
+				for (FeeCenter item : feeCenterList) {
+					item.setEta(bills.getEta());
+					item.setEtd(bills.getEtd());
+					item.setBillDate(bills.getBillDate());
+					item.setVesselId(bills.getVesselId());
+					item.setVesselCnName(bills.getVesselCnName());
+					item.setVesselEnName(bills.getVesselEnName());
+					item.setVoyageNo(bills.getVoyageNo());
+					item.setPolId(bills.getPolId());
+					item.setPolCnName(bills.getPolCnName());
+					item.setPolEnName(bills.getPolEnName());
+					item.setPolCode(bills.getPolCode());
+					item.setPodId(bills.getPodId());
+					item.setPodCnName(bills.getPodCnName());
+					item.setPodEnName(bills.getPodEnName());
+					item.setPodCode(bills.getPodCode());
+				}
+				feeCenterService.updateBatchById(feeCenterList);
+				List<FinAccBills> finAccBillsList = finAccBillsService.list(new LambdaQueryWrapper<FinAccBills>()
+					.eq(FinAccBills::getTenantId, AuthUtil.getTenantId())
+					.eq(FinAccBills::getIsDeleted, 0)
+					.in(FinAccBills::getBusinessBillId, billIds));
+				for (FinAccBills item : finAccBillsList) {
+					Bills bill = billsList.stream().filter(e -> e.getId().equals(item.getBusinessBillId())).findFirst().orElse(null);
+					if (bill != null) {
+						item.setEtd(bill.getEtd());
+						item.setEta(bill.getEta());
+						item.setBillDate(bill.getBillDate());
+						item.setVesselId(bill.getVesselId());
+						item.setVesselCnName(bill.getVesselCnName());
+						item.setVesselEnName(bill.getVesselEnName());
+						item.setVoyageNo(bill.getVoyageNo());
+						item.setPolId(bill.getPolId());
+						item.setPolCnName(bill.getPolCnName());
+						item.setPolEnName(bill.getPolEnName());
+						item.setPolCode(bill.getPolCode());
+						item.setPodId(bill.getPodId());
+						item.setPodCnName(bill.getPodCnName());
+						item.setPodEnName(bill.getPodEnName());
+						item.setPodCode(bill.getPodCode());
+					}
+				}
+				finAccBillsService.updateBatchById(finAccBillsList);
 			}
 		}
 		return R.data("操作成功");