1.费用申请修改-审核通过逻辑修改

2.放箱号列表增加内部放箱号查询
3.空箱出场导入修改配箱明细数据错误修改
4.海运进出口-销售报告打印接口增加打印人
5.海运出口提取运价接口条件修改
6.海运进出口增加提单状态

blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/entity/RouteCost.java

@@ -611,5 +611,12 @@ public class RouteCost implements Serializable {
 	@TableField(exist = false)
 	private String item;
 
+	/**
+	 * etd
+	 */
+	@TableField(exist = false)
+	private String etd;
+
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -1595,7 +1595,7 @@ public class Bills implements Serializable {
 	 */
 	@ApiModelProperty(value = "来源id预定舱")
 	private Long temporaryId;
-/**
+	/**
 	 * 来源预定舱单号
 	 */
 	@ApiModelProperty(value = "来源预定舱单号")
@@ -1616,6 +1616,11 @@ public class Bills implements Serializable {
 	 */
 	@ApiModelProperty(value = "海运费利润")
 	private BigDecimal oceanFreightProfit;
+	/**
+	 * 提单状态
+	 */
+	@ApiModelProperty(value = "提单状态")
+	private String billOfLadingStatus;
 
 	/**
 	 * 到港日期
@@ -2374,6 +2379,11 @@ public class Bills implements Serializable {
 	@TableField(exist = false)
 	private String printDate;
 	/**
+	 * 打印人
+	 */
+	@TableField(exist = false)
+	private String printPeople;
+	/**
 	 * 应收(USD折合人民币)
 	 */
 	@TableField(exist = false)
@@ -2444,10 +2454,10 @@ public class Bills implements Serializable {
 
 	/**
 	 * 首页统计类型  1=开船提醒
-	 *    2=到港提醒
-	 *    3=截港提醒
-	 *    4=截单提醒
-	 *    5=开船未付费提醒
+	 * 2=到港提醒
+	 * 3=截港提醒
+	 * 4=截单提醒
+	 * 5=开船未付费提醒
 	 */
 	@TableField(exist = false)
 	private String type;

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -800,6 +800,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 				String exrateType = currencyUtils.standardCurrency(bills.getBranchId());
 				bills.setExrateType(exrateType);
+				bills.setPrintPeople(AuthUtil.getUserName());
 				bills = this.dictionaryConversion(bills);
 				bills = this.assignmentSeaBillsDetail(bills);
 				HmmEdi hmmEdi = hmmEdiService.getOne(new LambdaQueryWrapper<HmmEdi>()
@@ -858,6 +859,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								}
 								for (Bills item : billsList) {
 									this.dictionaryConversion(item);
+									item.setPrintPeople(AuthUtil.getUserName());
 									List<FeeCenter> feeD = feeCenterListMh.stream().filter(e -> MagicValues.D.equals(e.getDc()) &&
 										e.getPid().equals(item.getId())).collect(Collectors.toList());
 									item.setFeeCenterListD(feeD);
@@ -1618,6 +1620,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				bills.setExrateType(exrateType);
 				bills = this.dictionaryConversion(bills);
 				bills = this.assignmentSeaBillsDetail(bills);
+				bills.setPrintPeople(AuthUtil.getUserName());
 				HmmEdi hmmEdi = hmmEdiService.getOne(new LambdaQueryWrapper<HmmEdi>()
 					.eq(HmmEdi::getTenantId, AuthUtil.getTenantId())
 					.eq(HmmEdi::getPid, bills.getId()));
@@ -1685,6 +1688,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								}
 							}
 							for (Bills item : billsList) {
+								item.setPrintPeople(AuthUtil.getUserName());
 								List<FeeCenter> feeD = feeCenterListMh.stream().filter(e -> MagicValues.D.equals(e.getDc())).collect(Collectors.toList());
 								item.setFeeCenterListD(feeD);
 								List<FeeCenter> feeC = feeCenterListMh.stream().filter(e -> MagicValues.C.equals(e.getDc())).collect(Collectors.toList());
@@ -1871,6 +1875,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						.eq(Bills::getTenantId, AuthUtil.getTenantId())
 						.eq(Bills::getIsDeleted, 0));
 					if (details != null) {
+						details.setPrintPeople(AuthUtil.getUserName());
 						LambdaQueryWrapper<FeeCenter> feeCenterLambdaQueryWrapper = new LambdaQueryWrapper<FeeCenter>()
 							.eq(FeeCenter::getPid, bills.getId())
 							.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
@@ -2576,6 +2581,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					} else {
 						bills.setCarrierCnName(bills.getCarrierCnName());
 					}
+					bills.setPrintPeople(AuthUtil.getUserName());
 					String analysis = "";
 					if ("OWN".equals(bills.getSrcType())) {
 						analysis = "公司";
@@ -2616,6 +2622,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								List<FeeCenter> feeCenterListMh = feeCenterService.list(feeCenterLambdaQueryWrapper);
 								feeCenterListMh.stream().filter(e -> ObjectUtils.isNull(e.getReportType())).forEach(e -> e.setReportType("0"));
 								for (Bills item : billsList) {
+									item.setPrintPeople(AuthUtil.getUserName());
 									for (FeeCenter feeCenter : amendFeeCenterList) {
 										if (feeCenter.getPid().equals(amends.getId())) {
 											feeCenter.setReportType(MagicValues.ONE);
@@ -3458,6 +3465,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								}
 								feeCenterReportList.add(feeCenterReports);
 							}
+							details.setPrintPeople(AuthUtil.getUserName());
 							details.setFeeCenterList(feeCenterReportList);
 							list.add(0, details);
 						}

blade-service/blade-los/src/main/java/org/springblade/los/box/controller/PutBoxController.java

@@ -82,6 +82,7 @@ public class PutBoxController extends BladeController {
 			.eq(ObjectUtils.isNotNull(putBox.getBoxType()), PutBox::getBoxType, putBox.getBoxType())
 			.eq(ObjectUtils.isNotNull(putBox.getBoxClass()), PutBox::getBoxClass, putBox.getBoxClass())
 			.like(ObjectUtils.isNotNull(putBox.getContainerNumber()), PutBox::getContainerNumber, putBox.getContainerNumber())
+			.like(ObjectUtils.isNotNull(putBox.getInternalContainerNumber()), PutBox::getInternalContainerNumber, putBox.getInternalContainerNumber())
 			.like(ObjectUtils.isNotNull(putBox.getBoxEastName()), PutBox::getBoxEastName, putBox.getBoxEastName())
 			.eq(ObjectUtils.isNotNull(putBox.getBoxBelongsTo()), PutBox::getBoxBelongsTo, putBox.getBoxBelongsTo())
 			.eq(ObjectUtils.isNotNull(putBox.getPodId()), PutBox::getPodId, putBox.getPodId())

blade-service/blade-los/src/main/java/org/springblade/los/box/controller/RouteCostController.java

@@ -343,6 +343,8 @@ public class RouteCostController extends BladeController {
 		lambdaQueryWrapper.eq(RouteCost::getTenantId, AuthUtil.getTenantId())
 			.eq(RouteCost::getIsDeleted, 0)
 			.eq(RouteCost::getStatus, "审核通过")
+			.ge(ObjectUtils.isNotNull(routeCost.getEtd()),RouteCost::getEffectiveEndDate,routeCost.getEtd())
+			.le(ObjectUtils.isNotNull(routeCost.getEtd()),RouteCost::getEffectiveStartDate,routeCost.getEtd())
 			.eq(ObjectUtils.isNotNull(routeCost.getBusinessType()), RouteCost::getBusinessType, routeCost.getBusinessType())
 			.eq(ObjectUtils.isNotNull(routeCost.getPodId()), RouteCost::getPodId, routeCost.getPodId())
 			.eq(ObjectUtils.isNotNull(routeCost.getDestinationId()), RouteCost::getDestinationId, routeCost.getDestinationId())

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/PutBoxServiceImpl.java

@@ -1094,11 +1094,11 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 					List<Containers> containerItemList = containersList.stream().filter(e -> item.getMblno().equals(e.getHblno())
 						&& item.getBoxCode().equals(e.getCntrNo())).collect(Collectors.toList());
 					for (Containers containers : containerItemList) {
-						containers.setPodStationId(corps.getId());
-						containers.setPodStationCode(corps.getCode());
-						containers.setPodStationCname(corps.getCnName());
-						containers.setPodStationEname(corps.getEnName());
-						containers.setPodEmptyContainerReturnDate(item.getBoxStatusDate());
+						containers.setPolCyId(corps.getId());
+						containers.setPolCyCode(corps.getCode());
+						containers.setPolCyCname(corps.getCnName());
+						containers.setPolCyEname(corps.getEnName());
+						containers.setPolStationEmptyContainerExitDate(item.getBoxStatusDate());
 						containers.setContainerNumber(item.getContainerNumber());
 						containersListNew.add(containers);
 					}

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

@@ -89,6 +89,7 @@ public class BillsController extends BladeController {
 		LambdaQueryWrapper<Bills> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
+			.like(ObjectUtils.isNotNull(bills.getBillOfLadingStatus()), Bills::getBillOfLadingStatus, bills.getBillOfLadingStatus())
 			.eq(ObjectUtils.isNotNull(bills.getTransferOrderStatus()), Bills::getTransferOrderStatus, bills.getTransferOrderStatus())
 			.eq(ObjectUtils.isNotNull(bills.getLogisticsStatus()), Bills::getLogisticsStatus, bills.getLogisticsStatus())
 			.like(ObjectUtils.isNotNull(bills.getBillNo()), Bills::getBillNo, bills.getBillNo())
@@ -621,6 +622,7 @@ public class BillsController extends BladeController {
 		lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.like(ObjectUtils.isNotNull(bills.getBillNo()), Bills::getBillNo, bills.getBillNo())
+			.like(ObjectUtils.isNotNull(bills.getBillOfLadingStatus()), Bills::getBillOfLadingStatus, bills.getBillOfLadingStatus())
 			.like(ObjectUtils.isNotNull(bills.getMblno()), Bills::getMblno, bills.getMblno())
 			.like(ObjectUtils.isNotNull(bills.getHblno()), Bills::getHblno, bills.getHblno())
 			.like(ObjectUtils.isNotNull(bills.getCorpSource()), Bills::getCorpSource, bills.getCorpSource())

blade-service/blade-los/src/main/java/org/springblade/los/check/service/impl/AuditProecessServiceImpl.java

@@ -2061,6 +2061,9 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				amountCrLoc = amountCrLoc.add(feeCenter.getAmountLoc());
 				finAccBills.setAmountCrLoc(feeCenter.getAmountLoc());
 			}
+			finAccBills.setCorpId(feeCenterUpdateRecord.getCorpIdUpdate());
+			finAccBills.setCorpCnName(feeCenterUpdateRecord.getCorpCnNameUpdate());
+			finAccBills.setCorpEnName(feeCenterUpdateRecord.getCorpEnNameUpdate());
 			finAccBillsService.updateById(finAccBills);
 		}
 		if ("HYJK,HYCK".contains(feeCenter.getBusinessType())) {