Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorps.java

@@ -619,5 +619,11 @@ public class BCorps implements Serializable {
 	@ApiModelProperty(value = "客户唯一id")
 	private String corpOnlyId;
 
+	/**
+	 * 账单号
+	 */
+	@TableField(exist = false)
+	private String accBillNo;
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/dto/FeeCenterReports.java

@@ -168,5 +168,10 @@ public class FeeCenterReports implements Serializable {
 	 */
 	private String feeCnNameC;
 
+	/**
+	 * 账单号
+	 */
+	private String accBillNo;
+
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/Util/MagicValues.java

@@ -26,9 +26,12 @@ public class MagicValues {
 	public static final String SETTLEMENT_CENTER = "结算中心";
 	public static final String MEET = "应付";
 	public static final String MEET_BILL = "应付-账单";
+	public static final String MEET_BILL_NUMBER = "应付-账单号";
+	public static final String MEET_AMEND = "应付-amend";
 	public static final String RECEIVABLE = "应收";
-
 	public static final String RECEIVABLE_BILL = "应收-账单";
+	public static final String BILL_NUMBER = "应收-账单号";
+	public static final String RECEIVABLE_AMEND = "应收-amend";
 	public static final String DISPATCH_NOTICE = "派车通知单";
 	public static final String INCOMING_NOTIFICATION = "入货通知";
 	public static final String SALES_REPORT = "销售报告";

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/controller/ReportsController.java

@@ -180,10 +180,11 @@ public class ReportsController extends BladeController {
 						   @RequestParam(value = "groupCode", required = false) String groupCode,
 						   @RequestParam(value = "corpIds", required = false) String corpIds,
 						   @RequestParam(value = "itemIds", required = false) String itemIds,
+						   @RequestParam(value = "BillNumber", required = false) String BillNumber,
 						   @RequestParam(value = "curCode", required = false) String curCode,
 						   @RequestParam(value = "type", required = false) String type
 	) {
-		return reportsService.getReportData(billId, reportCode, groupCode, corpIds, itemIds, type, curCode);
+		return reportsService.getReportData(billId, reportCode, groupCode, corpIds, itemIds, type, curCode,BillNumber);
 	}
 
 

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

@@ -53,7 +53,7 @@ public interface IReportsService extends IService<Reports> {
 	 * 获取模本数据加信息
 	 */
     R getReportData(String billId, String reportCode, String groupCode,String corpIds,
-					String itemIds,String type,String curCode);
+					String itemIds,String type,String curCode,String BillNumber);
 
     List<Reports> getReports(Reports reports);
 

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

@@ -192,7 +192,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 
 	@Override
 	public R<Map<String, Object>> getReportData(String billId, String reportCode, String groupCode, String corpIds,
-												String itemIds, String type, String curCode) {
+												String itemIds, String type, String curCode, String BillNumber) {
 		Map<String, Object> map = new HashMap<>();
 		if (ObjectUtils.isNull(billId)) {
 			throw new RuntimeException("缺少比要参数");
@@ -214,13 +214,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			throw new RuntimeException("获取报表表头数据失败");
 		}
 		if (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type)) {
-			return this.getReportDataHY(billId, reportCode, groupCode, corpIds, itemIds, type, curCode);
+			return this.getReportDataHY(billId, reportCode, groupCode, corpIds, itemIds, type, curCode, BillNumber);
 		} else if (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type)) {
-			return this.getReportDataKY(billId, reportCode, groupCode, corpIds, itemIds, type, curCode);
+			return this.getReportDataKY(billId, reportCode, groupCode, corpIds, itemIds, type, curCode, BillNumber);
 		} else if (MagicValues.AMEND.equals(type)) {
-			return this.getReportDataAmend(billId, reportCode, groupCode, corpIds, itemIds, type, curCode);
+			return this.getReportDataAmend(billId, reportCode, groupCode, corpIds, itemIds, type, curCode, BillNumber);
 		} else if (MagicValues.BGSE.equals(type) || MagicValues.BGSI.equals(type) || MagicValues.BGAE.equals(type) || MagicValues.BGAI.equals(type)) {
-			return this.getReportDataBG(billId, reportCode, groupCode, corpIds, itemIds, type, curCode);
+			return this.getReportDataBG(billId, reportCode, groupCode, corpIds, itemIds, type, curCode, BillNumber);
 		} else {
 			if (MagicValues.PAID_APPLICATION.equals(reportCode) && MagicValues.PAID_APPLICATION.equals(groupCode)) {
 				FinStlBills finStlBills = finStlBillsService.getById(billId);
@@ -845,7 +845,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 	}
 
 	public R<Map<String, Object>> getReportDataHY(String billId, String reportCode, String groupCode, String corpIds,
-												  String itemIds, String type, String curCode) {
+												  String itemIds, String type, String curCode, String BillNumber) {
 		Map<String, Object> map = new HashMap<>();
 		if (ObjectUtils.isNull(billId)) {
 			throw new RuntimeException("缺少比要参数");
@@ -1801,7 +1801,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				map.put(MagicValues.DATA, null);
 			}
 		} else if (MagicValues.COST.equals(reportCode) &&
-			(MagicValues.RECEIVABLE.equals(groupCode) || MagicValues.RECEIVABLE_BILL.equals(groupCode))
+			(MagicValues.RECEIVABLE.equals(groupCode) || MagicValues.RECEIVABLE_BILL.equals(groupCode) ||
+				MagicValues.BILL_NUMBER.equals(groupCode) || MagicValues.RECEIVABLE_AMEND.equals(groupCode))
 			&& (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
@@ -1822,6 +1823,15 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 				}
 				ids.add(0, bills.getId());
+				if (MagicValues.RECEIVABLE_AMEND.equals(groupCode)) {
+					List<Amends> amendsList = amendsService.list(new LambdaQueryWrapper<Amends>()
+						.eq(Amends::getTenantId, AuthUtil.getTenantId())
+						.eq(Amends::getIsDeleted, 0)
+						.in(Amends::getOrigId, ids));
+					if (!amendsList.isEmpty()){
+						ids.addAll(amendsList.stream().map(Amends::getId).collect(Collectors.toList()));
+					}
+				}
 				LambdaQueryWrapper<FeeCenter> lambdaQueryWrapper = new LambdaQueryWrapper<FeeCenter>()
 					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 					.eq(FeeCenter::getDc, MagicValues.D)
@@ -1830,12 +1840,15 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (MagicValues.RECEIVABLE_BILL.equals(groupCode)) {
 					lambdaQueryWrapper.eq(FeeCenter::getAccStatus, 1);
 				}
+				if (MagicValues.BILL_NUMBER.equals(groupCode)) {
+					lambdaQueryWrapper.eq(FeeCenter::getAccBillNo, BillNumber);
+					lambdaQueryWrapper.eq(FeeCenter::getAccStatus, 1);
+				}
 				if (ObjectUtils.isNotNull(corpIds)) {
 					lambdaQueryWrapper.eq(FeeCenter::getCorpId, corpIds);
-				} else {
-					if (ObjectUtils.isNotNull(itemIds)) {
-						lambdaQueryWrapper.apply("find_in_set(id,'" + itemIds + "')");
-					}
+				}
+				if (ObjectUtils.isNotNull(itemIds)) {
+					lambdaQueryWrapper.apply("find_in_set(id,'" + itemIds + "')");
 				}
 				if (ObjectUtils.isNotNull(curCode)) {
 					lambdaQueryWrapper.eq(FeeCenter::getCurCode, curCode);
@@ -1888,6 +1901,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 					}
 					FeeCenterReports feeCenterReports = new FeeCenterReports();
+					feeCenterReports.setAccBillNo(item.getAccBillNo());
 					feeCenterReports.setStorageDate(item.getStorageDate());
 					feeCenterReports.setOutboundDate(item.getOutboundDate());
 					feeCenterReports.setRemarks(item.getRemarks());
@@ -1927,16 +1941,17 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				bills.setAmountProfitUsd(amountProfitUsd);
 				bills.setAmountDrLoc(amountDrLoc);
 				BigDecimal exrateD = ibCurrencyService.getCnyExrate(new Date(), "USD", "D", "1");
-				if ("USD".equals(curCode)) {
-					bills.setCapitalLetters(BigDecimalUtils.convertToEnglish(amountDrUsd));
-					bills.setCapitalLettersUsd(BigDecimalUtils.convertToEnglish(amountDrUsd));
+				bills.setCapitalLetters(BigDecimalUtils.convertToEnglish(amountDr));
+				bills.setCapitalLettersUsd(BigDecimalUtils.convertToEnglish(amountDrUsd));
+				/*if ("USD".equals(curCode)) {
+
 				} else if ("CNY".equals(curCode)) {
 					bills.setCapitalLetters(BigDecimalUtils.convertToEnglish(amountDr));
 					bills.setCapitalLettersUsd(BigDecimalUtils.convertToEnglish(amountDr.divide(exrateD, 2, RoundingMode.HALF_UP)));
 				} else {
 					bills.setCapitalLetters(BigDecimalUtils.convertToEnglish(amountDrLoc));
 					bills.setCapitalLettersUsd(BigDecimalUtils.convertToEnglish(amountDrLoc.divide(exrateD, 2, RoundingMode.HALF_UP)));
-				}
+				}*/
 				bills.setAmountCrLoc(amountCrLoc);
 				bills.setAmountProfitLoc(amountProfitLoc);
 				List<BCorpsBank> bCorpsBanks = bankService.list(new LambdaQueryWrapper<BCorpsBank>()
@@ -1955,7 +1970,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				map.put(MagicValues.DATA, null);
 			}
 		} else if (MagicValues.COST.equals(reportCode) &&
-			(MagicValues.MEET.equals(groupCode) || MagicValues.MEET_BILL.equals(groupCode))
+			(MagicValues.MEET.equals(groupCode) || MagicValues.MEET_BILL.equals(groupCode)||
+				MagicValues.MEET_BILL_NUMBER.equals(groupCode) || MagicValues.MEET_AMEND.equals(groupCode))
 			&& (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
@@ -1976,6 +1992,15 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 				}
 				ids.add(0, bills.getId());
+				if (MagicValues.MEET_AMEND.equals(groupCode)) {
+					List<Amends> amendsList = amendsService.list(new LambdaQueryWrapper<Amends>()
+						.eq(Amends::getTenantId, AuthUtil.getTenantId())
+						.eq(Amends::getIsDeleted, 0)
+						.in(Amends::getOrigId, ids));
+					if (!amendsList.isEmpty()){
+						ids.addAll(amendsList.stream().map(Amends::getId).collect(Collectors.toList()));
+					}
+				}
 				LambdaQueryWrapper<FeeCenter> lambdaQueryWrapper = new LambdaQueryWrapper<FeeCenter>()
 					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 					.eq(FeeCenter::getDc, MagicValues.C)
@@ -1983,10 +2008,9 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				lambdaQueryWrapper.in(FeeCenter::getPid, ids);
 				if (ObjectUtils.isNotNull(corpIds)) {
 					lambdaQueryWrapper.eq(FeeCenter::getCorpId, corpIds);
-				} else {
-					if (ObjectUtils.isNotNull(itemIds)) {
-						lambdaQueryWrapper.apply("find_in_set(id,'" + itemIds + "')");
-					}
+				}
+				if (ObjectUtils.isNotNull(itemIds)) {
+					lambdaQueryWrapper.apply("find_in_set(id,'" + itemIds + "')");
 				}
 				if (ObjectUtils.isNotNull(curCode)) {
 					lambdaQueryWrapper.eq(FeeCenter::getCurCode, curCode);
@@ -1994,6 +2018,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (MagicValues.MEET_BILL.equals(groupCode)) {
 					lambdaQueryWrapper.eq(FeeCenter::getAccStatus, 1);
 				}
+				if (MagicValues.MEET_BILL_NUMBER.equals(groupCode)) {
+					lambdaQueryWrapper.eq(FeeCenter::getAccBillNo, BillNumber);
+					lambdaQueryWrapper.eq(FeeCenter::getAccStatus, 1);
+				}
 				feeCenterList = feeCenterService.list(lambdaQueryWrapper);
 				BigDecimal amountDr = new BigDecimal(MagicValues.ZERO);
 				BigDecimal amountCr = new BigDecimal(MagicValues.ZERO);
@@ -2042,6 +2070,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 					}
 					FeeCenterReports feeCenterReports = new FeeCenterReports();
+					feeCenterReports.setAccBillNo(item.getAccBillNo());
 					feeCenterReports.setStorageDate(item.getStorageDate());
 					feeCenterReports.setOutboundDate(item.getOutboundDate());
 					feeCenterReports.setRemarks(item.getRemarks());
@@ -2082,7 +2111,9 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				bills.setAmountDrLoc(amountDrLoc);
 				bills.setAmountCrLoc(amountCrLoc);
 				BigDecimal exrateD = ibCurrencyService.getCnyExrate(new Date(), "USD", "C", "1");
-				if ("USD".equals(curCode)) {
+				bills.setCapitalLetters(BigDecimalUtils.convertToEnglish(amountDr));
+				bills.setCapitalLettersUsd(BigDecimalUtils.convertToEnglish(amountDrUsd));
+				/*if ("USD".equals(curCode)) {
 					bills.setCapitalLetters(BigDecimalUtils.convertToEnglish(amountCrUsd));
 					bills.setCapitalLettersUsd(BigDecimalUtils.convertToEnglish(amountCrUsd));
 				} else if ("CNY".equals(curCode)) {
@@ -2091,7 +2122,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				} else {
 					bills.setCapitalLetters(BigDecimalUtils.convertToEnglish(amountCrLoc));
 					bills.setCapitalLettersUsd(BigDecimalUtils.convertToEnglish(amountCrLoc.divide(exrateD, 2, RoundingMode.HALF_UP)));
-				}
+				}*/
 				bills.setAmountProfitLoc(amountProfitLoc);
 				bills.setDept(dept);
 				map.put(MagicValues.DATA, bills);
@@ -2978,7 +3009,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 	}
 
 	public R<Map<String, Object>> getReportDataKY(String billId, String reportCode, String groupCode, String corpIds,
-												  String itemIds, String type, String curCode) {
+												  String itemIds, String type, String curCode, String BillNumber) {
 		Map<String, Object> map = new HashMap<>();
 		if (ObjectUtils.isNull(billId)) {
 			throw new RuntimeException("缺少比要参数");
@@ -3994,7 +4025,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 	}
 
 	public R<Map<String, Object>> getReportDataAmend(String billId, String reportCode, String groupCode, String corpIds,
-													 String itemIds, String type, String curCode) {
+													 String itemIds, String type, String curCode, String BillNumber) {
 		Map<String, Object> map = new HashMap<>();
 		if (ObjectUtils.isNull(billId)) {
 			throw new RuntimeException("缺少比要参数");
@@ -6074,7 +6105,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 	}
 
 	public R<Map<String, Object>> getReportDataBG(String billId, String reportCode, String groupCode, String corpIds,
-												  String itemIds, String type, String curCode) {
+												  String itemIds, String type, String curCode, String BillNumber) {
 		Map<String, Object> map = new HashMap<>();
 		if (ObjectUtils.isNull(billId)) {
 			throw new RuntimeException("缺少比要参数");

blade-service/blade-los/src/main/java/org/springblade/los/billno/service/impl/BusinessBillNoServiceImpl.java

@@ -174,7 +174,7 @@ public class BusinessBillNoServiceImpl extends ServiceImpl<BusinessBillNoMapper,
 					} else {
 						//不相等  序列号规则长度-最大序列号长度 之间赋0 然后拼接最大序列号
 						StringBuilder number = new StringBuilder();
-						for (int i = 0; i <= tail.length() - count.length(); i++) {
+						for (int i = 0; i < tail.length() - count.length(); i++) {
 							number.append("0");
 						}
 						billNo = billNo + number.toString() + count;

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/controller/FeeCenterController.java

@@ -322,8 +322,11 @@ public class FeeCenterController extends BladeController {
 	 */
 	@GetMapping("/getFeeCenterCorpIds")
 	@ApiOperationSupport(order = 2)
-	public R<List<BCorps>> getFeeCenterCorpIds(@RequestParam("billId") Long billId, @RequestParam("dc") String dc, @RequestParam("type") String type) {
-		return R.data(feeCenterService.getFeeCenterCorpIds(billId, dc, type));
+	public R<List<BCorps>> getFeeCenterCorpIds(@RequestParam(value = "billId",required = false) Long billId,
+											   @RequestParam(value = "dc",required = false) String dc,
+											   @RequestParam(value = "type",required = false) String type,
+											   @RequestParam(value = "accBillNo",required = false) String accBillNo) {
+		return R.data(feeCenterService.getFeeCenterCorpIds(billId, dc, type,accBillNo));
 	}
 
 	/**

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

@@ -80,7 +80,7 @@ public interface IFeeCenterService extends IService<FeeCenter> {
 	 * @param billId
 	 * @return
 	 */
-	List<BCorps> getFeeCenterCorpIds(Long billId,String dc,String type);
+	List<BCorps> getFeeCenterCorpIds(Long billId,String dc,String type,String accBillNo);
 
 	R submitTrade(FeeCenter feeCenter);
 

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

@@ -1044,127 +1044,147 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 	}
 
 	@Override
-	public List<BCorps> getFeeCenterCorpIds(Long billId, String dc, String type) {
-		List<Long> corpIds = new ArrayList<>();
-		if ("HYCK".equals(type) || "HYJK".equals(type)) {
-			Bills bills = billsMapper.selectById(billId);
-			if (bills != null) {
-				if ("MM".equals(bills.getBillType())) {
-					List<Bills> billsList = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
-						.eq(Bills::getTenantId, AuthUtil.getTenantId())
-						.eq(Bills::getIsDeleted, 0)
-						.eq(Bills::getMasterId, bills.getId())
-						.eq(Bills::getMasterBillNo, bills.getBillNo()));
-					if (!billsList.isEmpty()) {
-						List<Long> billIds;
-						billIds = billsList.stream().map(Bills::getId).collect(Collectors.toList());
-						if (!billIds.isEmpty()) {
-							billIds.add(billId);
-						} else {
-							billIds = new ArrayList<>();
-							billIds.add(billId);
-						}
-						List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
-							.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-							.eq(FeeCenter::getIsDeleted, 0)
-							.eq(FeeCenter::getDc, dc)
-							.in(FeeCenter::getPid, billIds));
-						if (!feeCenterList.isEmpty()) {
-							corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
-						}
-					}
-				}
-				List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
-					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-					.eq(FeeCenter::getIsDeleted, 0)
-					.eq(FeeCenter::getDc, dc)
-					.eq(FeeCenter::getPid, billId));
-				if (!feeCenterList.isEmpty()) {
-					corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+	public List<BCorps> getFeeCenterCorpIds(Long billId, String dc, String type, String accBillNo) {
+		if (ObjectUtils.isNotNull(accBillNo) && "1".equals(accBillNo)) {
+			List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
+				.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+				.eq(FeeCenter::getIsDeleted, 0)
+				.eq(FeeCenter::getAccStatus, 1)
+				.eq(FeeCenter::getPid, billId)
+				.eq(FeeCenter::getDc, dc));
+			List<BCorps> bCorpsList = new ArrayList<>();
+			if (!feeCenterList.isEmpty()) {
+				List<String> accBillNoList = feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull)
+					.distinct().collect(Collectors.toList());
+				for (String item : accBillNoList) {
+					BCorps bCorps = new BCorps();
+					bCorps.setAccBillNo(item);
+					bCorpsList.add(bCorps);
 				}
 			}
-		} else if ("KYCK".equals(type) || "KYJK".equals(type)) {
-			AeaBills bills = aeaBillsMapper.selectById(billId);
-			if (bills != null) {
-				if ("MM".equals(bills.getBillType())) {
-					List<AeaBills> billsList = aeaBillsMapper.selectList(new LambdaQueryWrapper<AeaBills>()
-						.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
-						.eq(AeaBills::getIsDeleted, 0)
-						.eq(AeaBills::getMasterId, bills.getId())
-						.eq(AeaBills::getMasterBillNo, bills.getBillNo()));
-					if (!billsList.isEmpty()) {
-						List<Long> billIds;
-						billIds = billsList.stream().map(AeaBills::getId).collect(Collectors.toList());
-						if (!billIds.isEmpty()) {
-							billIds.add(billId);
-						} else {
-							billIds = new ArrayList<>();
-							billIds.add(billId);
+			return bCorpsList;
+		} else {
+			List<Long> corpIds = new ArrayList<>();
+			if ("HYCK".equals(type) || "HYJK".equals(type)) {
+				Bills bills = billsMapper.selectById(billId);
+				if (bills != null) {
+					if ("MM".equals(bills.getBillType())) {
+						List<Bills> billsList = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
+							.eq(Bills::getTenantId, AuthUtil.getTenantId())
+							.eq(Bills::getIsDeleted, 0)
+							.eq(Bills::getMasterId, bills.getId())
+							.eq(Bills::getMasterBillNo, bills.getBillNo()));
+						if (!billsList.isEmpty()) {
+							List<Long> billIds;
+							billIds = billsList.stream().map(Bills::getId).collect(Collectors.toList());
+							if (!billIds.isEmpty()) {
+								billIds.add(billId);
+							} else {
+								billIds = new ArrayList<>();
+								billIds.add(billId);
+							}
+							List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
+								.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+								.eq(FeeCenter::getIsDeleted, 0)
+								.eq(FeeCenter::getDc, dc)
+								.in(FeeCenter::getPid, billIds));
+							if (!feeCenterList.isEmpty()) {
+								corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+							}
 						}
-						List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
-							.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-							.eq(FeeCenter::getIsDeleted, 0)
-							.eq(FeeCenter::getDc, dc)
-							.in(FeeCenter::getPid, billIds));
-						if (!feeCenterList.isEmpty()) {
-							corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+					}
+					List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
+						.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+						.eq(FeeCenter::getIsDeleted, 0)
+						.eq(FeeCenter::getDc, dc)
+						.eq(FeeCenter::getPid, billId));
+					if (!feeCenterList.isEmpty()) {
+						corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+					}
+				}
+			} else if ("KYCK".equals(type) || "KYJK".equals(type)) {
+				AeaBills bills = aeaBillsMapper.selectById(billId);
+				if (bills != null) {
+					if ("MM".equals(bills.getBillType())) {
+						List<AeaBills> billsList = aeaBillsMapper.selectList(new LambdaQueryWrapper<AeaBills>()
+							.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
+							.eq(AeaBills::getIsDeleted, 0)
+							.eq(AeaBills::getMasterId, bills.getId())
+							.eq(AeaBills::getMasterBillNo, bills.getBillNo()));
+						if (!billsList.isEmpty()) {
+							List<Long> billIds;
+							billIds = billsList.stream().map(AeaBills::getId).collect(Collectors.toList());
+							if (!billIds.isEmpty()) {
+								billIds.add(billId);
+							} else {
+								billIds = new ArrayList<>();
+								billIds.add(billId);
+							}
+							List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
+								.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+								.eq(FeeCenter::getIsDeleted, 0)
+								.eq(FeeCenter::getDc, dc)
+								.in(FeeCenter::getPid, billIds));
+							if (!feeCenterList.isEmpty()) {
+								corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+							}
 						}
 					}
+					List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
+						.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+						.eq(FeeCenter::getIsDeleted, 0)
+						.eq(FeeCenter::getDc, dc)
+						.eq(FeeCenter::getPid, billId));
+					if (!feeCenterList.isEmpty()) {
+						corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+					}
 				}
-				List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
-					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-					.eq(FeeCenter::getIsDeleted, 0)
-					.eq(FeeCenter::getDc, dc)
-					.eq(FeeCenter::getPid, billId));
-				if (!feeCenterList.isEmpty()) {
-					corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+			} else if ("BGSE".equals(type) || "BGSI".equals(type) || "BGAI".equals(type) || "BGAE".equals(type)) {
+				CustomsDeclaration bills = customsDeclarationMapper.selectById(billId);
+				if (bills != null) {
+					List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
+						.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+						.eq(FeeCenter::getIsDeleted, 0)
+						.eq(FeeCenter::getDc, dc)
+						.eq(FeeCenter::getPid, billId));
+					if (!feeCenterList.isEmpty()) {
+						corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+					}
 				}
-			}
-		} else if ("BGSE".equals(type) || "BGSI".equals(type) || "BGAI".equals(type) || "BGAE".equals(type)) {
-			CustomsDeclaration bills = customsDeclarationMapper.selectById(billId);
-			if (bills != null) {
-				List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
-					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-					.eq(FeeCenter::getIsDeleted, 0)
-					.eq(FeeCenter::getDc, dc)
-					.eq(FeeCenter::getPid, billId));
-				if (!feeCenterList.isEmpty()) {
-					corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+			} else if ("AMEND".equals(type)) {
+				Amends amends = amendsMapper.selectById(billId);
+				if (amends != null) {
+					List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
+						.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+						.eq(FeeCenter::getIsDeleted, 0)
+						.eq(FeeCenter::getDc, dc)
+						.eq(FeeCenter::getPid, billId));
+					if (!feeCenterList.isEmpty()) {
+						corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+					}
 				}
-			}
-		} else if ("AMEND".equals(type)) {
-			Amends amends = amendsMapper.selectById(billId);
-			if (amends != null) {
-				List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
-					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-					.eq(FeeCenter::getIsDeleted, 0)
-					.eq(FeeCenter::getDc, dc)
-					.eq(FeeCenter::getPid, billId));
-				if (!feeCenterList.isEmpty()) {
-					corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+			} else if ("MYDL".equals(type)) {
+				Agent agent = agentMapper.selectById(billId);
+				if (agent != null) {
+					List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
+						.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+						.eq(FeeCenter::getIsDeleted, 0)
+						.eq(FeeCenter::getDc, dc)
+						.eq(FeeCenter::getPid, billId));
+					if (!feeCenterList.isEmpty()) {
+						corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+					}
 				}
 			}
-		} else if ("MYDL".equals(type)) {
-			Agent agent = agentMapper.selectById(billId);
-			if (agent != null) {
-				List<FeeCenter> feeCenterList = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
-					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-					.eq(FeeCenter::getIsDeleted, 0)
-					.eq(FeeCenter::getDc, dc)
-					.eq(FeeCenter::getPid, billId));
-				if (!feeCenterList.isEmpty()) {
-					corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
-				}
+			if (!corpIds.isEmpty()) {
+				return bCorpsService.list(new LambdaQueryWrapper<BCorps>()
+					.eq(BCorps::getTenantId, AuthUtil.getTenantId())
+					.eq(BCorps::getIsDeleted, 0)
+					.in(BCorps::getId, corpIds));
+			} else {
+				return new ArrayList<>();
 			}
 		}
-		if (!corpIds.isEmpty()) {
-			return bCorpsService.list(new LambdaQueryWrapper<BCorps>()
-				.eq(BCorps::getTenantId, AuthUtil.getTenantId())
-				.eq(BCorps::getIsDeleted, 0)
-				.in(BCorps::getId, corpIds));
-		} else {
-			return new ArrayList<>();
-		}
 
 	}