1.所有审批增加版本号控制

2.汇率复制接口修改
3.海运出口导出增加字段
4.海运出口保存同步op，客服到客户订舱
5.amend审核费用明细缺少业务日期问题修改
6.放箱号增加批量修改POD接口
7.ow拿撤销启用，已提箱数重新计算
8.付费申请增加银行字段

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/stl/entity/FinStlBills.java

@@ -504,9 +504,9 @@ public class FinStlBills implements Serializable {
 	private String bankAccountName;
 
 	/**
-	 * 账户银行
+	 * 开户银行
 	 */
-	@ApiModelProperty(value = "账户银行")
+	@ApiModelProperty(value = "开户银行")
 	private String bankAccountBank;
 
 	/**
@@ -514,6 +514,31 @@ public class FinStlBills implements Serializable {
 	 */
 	@ApiModelProperty(value = "银行账号")
 	private String bankAccountNo;
+
+	/**
+	 * 所属公司id
+	 */
+	@ApiModelProperty(value = "所属公司id")
+	private String affiliatedCompanyId;
+
+	/**
+	 * 所属公司
+	 */
+	@ApiModelProperty(value = "所属公司")
+	private String affiliatedCompanyName;
+
+	/**
+	 * 信用代码
+	 */
+	@ApiModelProperty(value = "信用代码")
+	private String uscc;
+
+	/**
+	 * 税号
+	 */
+	@ApiModelProperty(value = "税号")
+	private String taxId;
+
 	/**
 	 * 收款情况
 	 */

blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/controller/BCurrencyController.java

@@ -281,8 +281,8 @@ public class BCurrencyController extends BladeController {
 	 * 复制
 	 */
 	@GetMapping("/copy")
-	public R copy(@RequestParam("id")Long id,@RequestParam("exrateYear")Integer exrateYear) {
-		return bCurrencyService.copy(id,exrateYear);
+	public R copy(@RequestParam("id")Long id,@RequestParam("exrateYearOld")Integer exrateYearOld,@RequestParam("exrateYear")Integer exrateYear) {
+		return bCurrencyService.copy(id,exrateYear,exrateYearOld);
 	}
 
 

blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/service/IBCurrencyService.java

@@ -103,5 +103,5 @@ public interface IBCurrencyService extends IService<BCurrency> {
 
 	List<BCurrency> getBCurrency(BCurrency reports);
 
-	R copy(Long id,Integer exrateYear);
+	R copy(Long id,Integer exrateYear,Integer exrateYearOld);
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/service/impl/BCurrencyServiceImpl.java

@@ -980,7 +980,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 	}
 
 	@Override
-	public R copy(Long id, Integer exrateYear) {
+	public R copy(Long id, Integer exrateYear, Integer exrateYearOld) {
 		BCurrency currency = baseMapper.selectById(id);
 		List<BCurExrate> curExrateList = bCurExrateService.list(new LambdaQueryWrapper<BCurExrate>()
 			.eq(BCurExrate::getTenantId, AuthUtil.getTenantId())
@@ -989,11 +989,17 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 			.eq(BCurExrate::getExrateYear, exrateYear)
 			.eq(BCurExrate::getCode, currency.getCode()));
 		if (!curExrateList.isEmpty()) {
+			throw new RuntimeException(exrateYear + "年已存在汇率，请勿重复复制");
+		}
+		List<BCurExrate> curExrateListOld = bCurExrateService.list(new LambdaQueryWrapper<BCurExrate>()
+			.eq(BCurExrate::getTenantId, AuthUtil.getTenantId())
+			.eq(BCurExrate::getIsDeleted, 0)
+			.eq(BCurExrate::getBranchId, AuthUtil.getDeptId())
+			.eq(BCurExrate::getExrateYear, exrateYearOld)
+			.eq(BCurExrate::getCode, currency.getCode()));
+		if (!curExrateListOld.isEmpty()) {
 			List<BCurExrate> exrateList = new ArrayList<>();
-			for (BCurExrate item : curExrateList) {
-				if (exrateYear.equals(item.getExrateYear())) {
-					throw new RuntimeException(item.getExrateYear() + "年度汇率已存在，请先修改汇率年后再复制");
-				}
+			for (BCurExrate item : curExrateListOld) {
 				item.setId(null);
 				item.setCreateTime(null);
 				item.setCreateDept(null);

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

@@ -260,5 +260,15 @@ public class PutBoxController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 批量修改放箱号Pod
+	 */
+	@GetMapping("/batchUpdatePod")
+	public R batchUpdatePod(@RequestParam("ids") String ids, @RequestParam("podId") String podId,
+							@RequestParam("podCname")String podCname, @RequestParam("podEname")String podEname,
+							@RequestParam("podCode") String podCode) {
+		return putBoxService.batchUpdatePod(ids,podId,podCname,podEname,podCode);
+	}
+
 
 }

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

@@ -94,4 +94,6 @@ public interface IPutBoxService extends IService<PutBox> {
 	R returnEmptyPOD(Bills bills);
 
     R detele(List<Long> longList);
+
+	R batchUpdatePod(String ids, String podId, String podCname, String podEname, String podCode);
 }

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

@@ -167,6 +167,20 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 			;
 			putBoxList = baseMapper.selectList(lambdaQueryWrapper);
 		}
+		List<PutBox> putBoxs = new ArrayList<>();
+		if (ObjectUtils.isNotNull(putBox.getContainerNumber())) {
+			LambdaQueryWrapper<PutBox> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(PutBox::getIsDeleted, 0)
+				.eq(PutBox::getTenantId, AuthUtil.getTenantId())
+				.eq(PutBox::getBoxClass, putBox.getBoxClass())
+				.eq(PutBox::getBoxType, putBox.getBoxType())
+				.eq(PutBox::getPolId, putBox.getPolId())
+				.eq(PutBox::getPolStationId, putBox.getPolStationId())
+				.eq(PutBox::getPodId, putBox.getPodId())
+				.eq(PutBox::getContainerNumber, putBox.getContainerNumber())
+			;
+			putBoxs = baseMapper.selectList(lambdaQueryWrapper);
+		}
 		String businessTypeCode = "FXH";
 		String billNoFormat;
 		String billNoFormatInternal = "FXH-N";
@@ -207,6 +221,9 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 				&& e.getPolStationId().equals(putBox.getPolStationId()))) {
 				throw new RuntimeException("放箱号已存在，请勿重复添加");
 			}
+			if (!putBoxs.isEmpty()) {
+				throw new RuntimeException("存在重复单据");
+			}
 			BusinessBillNo businessBillNo = new BusinessBillNo();
 			businessBillNo.setBusinessTypeId(businessType.getId());
 			businessBillNo.setCode(billNoFormat);
@@ -228,6 +245,9 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 				&& e.getPolStationId().equals(putBox.getPolStationId()))) {
 				throw new RuntimeException("放箱号已存在，请勿重复添加");
 			}
+			if (putBoxs.stream().anyMatch(e -> !e.getId().equals(putBox.getId()))) {
+				throw new RuntimeException("存在重复单据");
+			}
 			putBox.setUpdateTime(new Date());
 			putBox.setUpdateUser(AuthUtil.getUserId());
 			putBox.setUpdateUserName(AuthUtil.getUserName());
@@ -5311,6 +5331,47 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 		return R.success("删除成功");
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R batchUpdatePod(String ids, String podId, String podCname, String podEname, String podCode) {
+		if (ObjectUtils.isNull(ids) || ObjectUtils.isNull(podId)) {
+			throw new RuntimeException("缺少必要参数");
+		}
+		List<PutBox> putBoxList = baseMapper.selectList(new LambdaQueryWrapper<PutBox>()
+			.eq(PutBox::getTenantId, AuthUtil.getTenantId())
+			.eq(PutBox::getIsDeleted, 0)
+			.apply("find_in_set(id,'" + ids + "')"));
+		if (putBoxList.isEmpty()) {
+			throw new RuntimeException("未查到放箱号单据");
+		}
+		List<String> containerNumber = putBoxList.stream().map(PutBox::getContainerNumber).distinct().collect(Collectors.toList());
+		List<PutBox> putBoxs = new ArrayList<>();
+		LambdaQueryWrapper<PutBox> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(PutBox::getIsDeleted, 0)
+			.eq(PutBox::getTenantId, AuthUtil.getTenantId())
+			.in(PutBox::getContainerNumber, containerNumber)
+		;
+		putBoxs = baseMapper.selectList(lambdaQueryWrapper);
+		for (PutBox item : putBoxList) {
+			item.setPodId(podId);
+			item.setPodCname(podCname);
+			item.setPodCode(podCode);
+			item.setPodEname(podEname);
+			item.setUpdateTime(new Date());
+			item.setUpdateUser(AuthUtil.getUserId());
+			item.setUpdateUserName(AuthUtil.getUserName());
+			List<PutBox> putBoxes = putBoxs.stream().filter(e -> e.getPolId().equals(item.getPolId()) &&
+				e.getContainerNumber().equals(item.getContainerNumber()) && e.getBoxClass().equals(item.getBoxClass())
+				&& e.getBoxType().equals(item.getBoxClass()) && e.getPolStationId().equals(item.getPolStationId())
+				&& e.getPodId().equals(item.getPodId()) && !e.getId().equals(item.getId())).collect(Collectors.toList());
+			if (!putBoxes.isEmpty()) {
+				throw new RuntimeException("放箱号：" + item.getContainerNumber() + "存在重复数据，修改失败");
+			}
+		}
+		this.updateBatchById(putBoxList);
+		return R.data("操作成功");
+	}
+
 	private void countOverdueFeeV1(Bills billsHYJK, List<TradingBox> tradingBoxList,
 								   List<TradingBoxItem> tradingBoxItemOldList, List<PutBoxItems> putBoxItemsOldList,
 								   List<PutBox> putBoxList) {

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

@@ -407,7 +407,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				}
 			}
 			tradingBoxItemService.saveOrUpdateBatch(tradingBox.getTradingBoxItemsList());
-			if("XGFY".equals(tradingBox.getType())){
+			if ("XGFY".equals(tradingBox.getType())) {
 				tradingBox.setActualBoxNumber(tradingBox.getTradingBoxItemsList().size());
 			}
 			tradingBox.setCode(String.join(",", codes));
@@ -3127,6 +3127,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				.collect(Collectors.toList()).get(0);
 			FeeCenter feeCenter = new FeeCenter();
 			feeCenter.setBillType("箱东");
+			feeCenter.setBillDate(centerItems.getAccountDate());
+			feeCenter.setAccountDate(centerItems.getAccountDate());
 			feeCenter.setCorpId(centerItems.getCorpId());
 			feeCenter.setCorpCnName(centerItems.getCorpCnName());
 			feeCenter.setCorpEnName(centerItems.getCorpEnName());
@@ -3160,7 +3162,6 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			feeCenter.setOutboundDate(tradingBox.getRentDate());
 			feeCenter.setBillNo(detail.getSysNo());
 			feeCenter.setBusinessType(detail.getType());
-			feeCenter.setBillDate(detail.getPurchaseDate());
 			feeCenter.setBillCorpId(detail.getPurchaseCompanyId());
 			feeCenter.setBillCorpCnName(detail.getPurchaseCompanyName());
 			feeCenter.setBillCorpEnName(detail.getPurchaseCompanyName());
@@ -3334,23 +3335,6 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			throw new RuntimeException("必要参数未填写");
 		}
 		TradingBox tradingBox = baseMapper.selectById(detail.getId());
-		tradingBox.setWhetherEnable("否");
-		int version = StringUtil.isBlank(tradingBox.getVersion()) ? 1 : Integer.parseInt(tradingBox.getVersion());
-		tradingBox.setVersion(String.valueOf(version + 1));
-		baseMapper.updateById(tradingBox);
-		List<TradingBoxItem> itemList = tradingBoxItemService.list(new LambdaQueryWrapper<TradingBoxItem>()
-			.eq(TradingBoxItem::getPid, tradingBox.getId())
-			.eq(TradingBoxItem::getTenantId, AuthUtil.getTenantId())
-			.eq(TradingBoxItem::getIsDeleted, 0));
-		if (!itemList.isEmpty()) {
-			for (TradingBoxItem item : itemList) {
-				item.setUpdateUser(AuthUtil.getUserId());
-				item.setUpdateUserName(AuthUtil.getUserName());
-				item.setUpdateTime(new Date());
-				item.setWhetherEnable("否");
-			}
-			tradingBoxItemService.updateBatchById(itemList);
-		}
 		PutBox putBox = putBoxService.getOne(new LambdaQueryWrapper<PutBox>()
 			.eq(PutBox::getTenantId, AuthUtil.getTenantId())
 			.eq(PutBox::getIsDeleted, 0)
@@ -3378,6 +3362,26 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			}
 			putBoxService.removeById(putBox.getId());
 		}
+		tradingBox.setWhetherEnable("否");
+		int version = StringUtil.isBlank(tradingBox.getVersion()) ? 1 : Integer.parseInt(tradingBox.getVersion());
+		tradingBox.setVersion(String.valueOf(version + 1));
+		tradingBox.setActualBoxNumber(0);
+		tradingBox.setSuitcaseNum(0);
+		tradingBox.setNotSuitcaseNum(tradingBox.getBoxNumber() - tradingBox.getSuitcaseNum());
+		baseMapper.updateById(tradingBox);
+		List<TradingBoxItem> itemList = tradingBoxItemService.list(new LambdaQueryWrapper<TradingBoxItem>()
+			.eq(TradingBoxItem::getPid, tradingBox.getId())
+			.eq(TradingBoxItem::getTenantId, AuthUtil.getTenantId())
+			.eq(TradingBoxItem::getIsDeleted, 0));
+		if (!itemList.isEmpty()) {
+			for (TradingBoxItem item : itemList) {
+				item.setUpdateUser(AuthUtil.getUserId());
+				item.setUpdateUserName(AuthUtil.getUserName());
+				item.setUpdateTime(new Date());
+				item.setWhetherEnable("否");
+			}
+			tradingBoxItemService.updateBatchById(itemList);
+		}
 		return R.success("操作成功");
 	}
 

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

@@ -348,6 +348,10 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				if (bills1 != null) {
 					bills1.setMblno(bills.getMblno());
 					bills1.setHblno(bills.getHblno());
+					bills1.setOperatorId(bills.getOperatorId());
+					bills1.setOperatorName(bills.getOperatorName());
+					bills1.setCustomerServiceId(bills.getCustomerServiceId());
+					bills1.setCustomerServiceName(bills.getCustomerServiceName());
 					bills1.setVesselId(bills.getVesselId());
 					bills1.setVesselCnName(bills.getVesselCnName());
 					bills1.setVesselEnName(bills.getVesselEnName());
@@ -4353,10 +4357,12 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		copyBills.setPodFreeBoxUseDays(14);
 		copyBills.setPolFreeBoxUseDays(7);
 		copyBills.setBillNo((String) clientBillNo.getData());
-		copyBills.setCarrierId(detail.getActualShippingCompanyId());
-		copyBills.setCarrierCnName(detail.getActualShippingCompanyCname());
-		copyBills.setCarrierEnName(detail.getActualShippingCompanyEname());
-		copyBills.setCarrierShortName(detail.getActualShippingCompanyAbbreviation());
+		if ("YDC".equals(detail.getBusinessType())) {
+			copyBills.setCarrierId(detail.getActualShippingCompanyId());
+			copyBills.setCarrierCnName(detail.getActualShippingCompanyCname());
+			copyBills.setCarrierEnName(detail.getActualShippingCompanyEname());
+			copyBills.setCarrierShortName(detail.getActualShippingCompanyAbbreviation());
+		}
 		copyBills.setMblno("");
 		copyBills.setHblno("");
 		copyBills.setRefno("");

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

@@ -677,6 +677,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 					if (detail == null) {
 						throw new SecurityException("审批通过失败");
 					}
+					int version = StringUtil.isBlank(detail.getVersion()) ? 1 : Integer.parseInt(detail.getVersion());
+					detail.setVersion(String.valueOf(version + 1));
 					detail.setStatus(2);
 					int count = finStlBillsMapper.updateById(detail);
 					if (count == 0) {
@@ -746,6 +748,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				if (detail == null) {
 					throw new SecurityException("审批通过失败");
 				}
+				int version = StringUtil.isBlank(detail.getVersion()) ? 1 : Integer.parseInt(detail.getVersion());
+				detail.setVersion(String.valueOf(version + 1));
 				detail.setStatus(4);
 				int count = finStlBillsMapper.updateById(detail);
 				if (count == 0) {
@@ -769,6 +773,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				if (bills == null) {
 					throw new SecurityException("审批通过失败");
 				}
+				int version = StringUtil.isBlank(detail.getVersion()) ? 1 : Integer.parseInt(detail.getVersion());
+				detail.setVersion(String.valueOf(version + 1));
 				detail.setStatus(3);
 				detail.setAuditDateTo(new Date());
 				int count = finStlBillsMapper.updateById(detail);
@@ -790,6 +796,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				if (detail == null) {
 					throw new SecurityException("审批通过失败");
 				}
+				int version = StringUtil.isBlank(detail.getVersion()) ? 1 : Integer.parseInt(detail.getVersion());
+				detail.setVersion(String.valueOf(version + 1));
 				detail.setStatus(4);
 				detail.setAuditDateTo(new Date());
 				int count = finStlBillsMapper.updateById(detail);
@@ -866,6 +874,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 					if (detail == null) {
 						throw new SecurityException("审批通过失败");
 					}
+					int version = StringUtil.isBlank(detail.getVersion()) ? 1 : Integer.parseInt(detail.getVersion());
+					detail.setVersion(String.valueOf(version + 1));
 					detail.setStatus(2);
 					int count = finInvoicesMapper.updateById(detail);
 					if (count == 0) {
@@ -934,6 +944,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				if (detail == null) {
 					throw new SecurityException("审批通过失败");
 				}
+				int version = StringUtil.isBlank(detail.getVersion()) ? 1 : Integer.parseInt(detail.getVersion());
+				detail.setVersion(String.valueOf(version + 1));
 				detail.setStatus(4);
 				int count = finInvoicesMapper.updateById(detail);
 				if (count == 0) {
@@ -957,6 +969,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				if (bills == null) {
 					throw new SecurityException("审批通过失败");
 				}
+				int version = StringUtil.isBlank(detail.getVersion()) ? 1 : Integer.parseInt(detail.getVersion());
+				detail.setVersion(String.valueOf(version + 1));
 				detail.setStatus(3);
 				int count = finInvoicesMapper.updateById(detail);
 				if (count == 0) {
@@ -977,6 +991,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				if (detail == null) {
 					throw new SecurityException("审批通过失败");
 				}
+				int version = StringUtil.isBlank(detail.getVersion()) ? 1 : Integer.parseInt(detail.getVersion());
+				detail.setVersion(String.valueOf(version + 1));
 				detail.setStatus(4);
 				int count = finInvoicesMapper.updateById(detail);
 				if (count == 0) {
@@ -1052,6 +1068,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 					if (detail == null) {
 						throw new SecurityException("审批通过失败");
 					}
+					int version = StringUtil.isBlank(detail.getVersion()) ? 1 : Integer.parseInt(detail.getVersion());
+					detail.setVersion(String.valueOf(version + 1));
 					detail.setStatus(2);
 					int count = amendsMapper.updateById(detail);
 					if (count == 0) {
@@ -1125,6 +1143,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				if (detail == null) {
 					throw new SecurityException("审批通过失败");
 				}
+				int version = StringUtil.isBlank(detail.getVersion()) ? 1 : Integer.parseInt(detail.getVersion());
+				detail.setVersion(String.valueOf(version + 1));
 				detail.setStatus(4);
 				int count = amendsMapper.updateById(detail);
 				if (count == 0) {
@@ -1151,6 +1171,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				if (bills == null) {
 					throw new SecurityException("审批通过失败");
 				}
+				int version = StringUtil.isBlank(detail.getVersion()) ? 1 : Integer.parseInt(detail.getVersion());
+				detail.setVersion(String.valueOf(version + 1));
 				detail.setApprovedDate(new Date());
 				detail.setStatus(3);
 				int count = amendsMapper.updateById(detail);
@@ -1204,6 +1226,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				if (detail == null) {
 					throw new SecurityException("审批通过失败");
 				}
+				int version = StringUtil.isBlank(detail.getVersion()) ? 1 : Integer.parseInt(detail.getVersion());
+				detail.setVersion(String.valueOf(version + 1));
 				detail.setStatus(4);
 				int count = amendsMapper.updateById(detail);
 				if (count == 0) {

blade-service/blade-los/src/main/java/org/springblade/los/excel/BillsExcel.java

@@ -210,6 +210,11 @@ public class BillsExcel implements Serializable {
 	@ExcelProperty(value = "teu箱数")
 	private Integer teu;
 	/**
+	 * 箱属
+	 */
+	@ExcelProperty(value = "箱属")
+	private String boxBelongsTo;
+	/**
 	 * 20"集装箱箱数
 	 */
 	@ExcelProperty(value = "V20")

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -725,6 +725,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 		List<FeeCenter> feeCenterList = new ArrayList<>();
 		if (ObjectUtils.isNotNull(list) && !list.isEmpty()) {
 			Bills bills = new Bills();
+			Amends amends = new Amends();
 			if ("SE".equals(list.get(0).getBusinessType()) || "SI".equals(list.get(0).getBusinessType())) {
 				bills = billsMapper.selectById(list.get(0).getPid());
 				if (bills != null && ObjectUtils.isNotNull(bills.getBillDate())) {
@@ -746,6 +747,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						}
 					}
 				}
+			} else if ("SEA".equals(list.get(0).getBusinessType()) || "SIA".equals(list.get(0).getBusinessType())) {
+				amends = amendsMapper.selectById(list.get(0).getPid());
 			}
 			String deptName = "";
 			String deptId = AuthUtil.getDeptId();
@@ -781,7 +784,13 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 			}
 			List<Long> feeCenterIdList = new ArrayList<>();
 			for (FeeCenter feeCenter : list) {
-				feeCenter.setBillDate(bills.getBillDate());
+				if ("SE".equals(list.get(0).getBusinessType()) || "SI".equals(list.get(0).getBusinessType())) {
+					feeCenter.setBillDate(bills.getBillDate());
+				} else if ("SEA".equals(list.get(0).getBusinessType()) || "SIA".equals(list.get(0).getBusinessType())) {
+					feeCenter.setBillDate(amends.getCreateTime());
+				}else{
+					feeCenter.setBillDate(new Date());
+				}
 				feeCenter.setBookingAgentId(bills.getBookingAgentId());
 				feeCenter.setBookingAgentCnName(bills.getBookingAgentCnName());
 				feeCenter.setBookingAgentEnName(bills.getBookingAgentEnName());