2024年12月3日17:24:09

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/aea/entity/AeaBills.java

@@ -1363,6 +1363,18 @@ public class AeaBills implements Serializable {
 	@ApiModelProperty(value = "核算部门")
 	private String accDeptName;
 
+	/**
+	 * 账单号
+	 */
+	@TableField(exist = false)
+	private String accNo;
+
+	/**
+	 * 往来单位
+	 */
+	@TableField(exist = false)
+	private String to;
+
 
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/customsDeclaration/entity/CustomsDeclaration.java

@@ -801,5 +801,17 @@ public class CustomsDeclaration implements Serializable {
 	@ApiModelProperty(value = "核算部门")
 	private String accDeptName;
 
+	/**
+	 * 账单号
+	 */
+	@TableField(exist = false)
+	private String accNo;
+
+	/**
+	 * 往来单位
+	 */
+	@TableField(exist = false)
+	private String to;
+
 
 }

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

@@ -1859,6 +1859,18 @@ public class Bills implements Serializable {
 	@TableField(exist = false)
 	private String dispatchTime2;
 
+	/**
+	 * 账单号
+	 */
+	@TableField(exist = false)
+	private String accNo;
+
+	/**
+	 * 往来单位
+	 */
+	@TableField(exist = false)
+	private String to;
+
 
 
 }

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

@@ -6249,7 +6249,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							feeCenterReportList.add(feeCenterReports);
 						}
 						bills.setFeeCenterList(feeCenterReportList);
-					}else{
+					} else {
 						throw new RuntimeException("请先维护费用");
 					}
 					list.add(0, bills);
@@ -6596,7 +6596,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					bills.setMforwarderDetails(seaBillsDetail.getMforwarderDetails());
 				}
 //				bills.setFM(MagicValues.FM);
-				bills.setCapitalLetters(BigDecimalUtils.convertToEnglish(bills.getQuantity())+" "+bills.getPackingUnit());
+				bills.setCapitalLetters(BigDecimalUtils.convertToEnglish(bills.getQuantity()) + " " + bills.getPackingUnit());
 				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
 				BigDecimal boxWeightSum = BigDecimal.ZERO;
 				List<ContainersReports> containersReportsList = new ArrayList<>();
@@ -6703,7 +6703,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					bills.setHpaymode(resDictBiz.getData().getRemark());
 				}
 //				bills.setFM(MagicValues.FM);
-				bills.setCapitalLetters(BigDecimalUtils.convertToEnglish(bills.getQuantity())+" "+bills.getPackingUnit());
+				bills.setCapitalLetters(BigDecimalUtils.convertToEnglish(bills.getQuantity()) + " " + bills.getPackingUnit());
 				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
 				BigDecimal boxWeightSum = BigDecimal.ZERO;
 				List<Containers> containersList = containersService.list(new LambdaQueryWrapper<Containers>()
@@ -6801,10 +6801,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				}
 //				bills.setFM(MagicValues.FM);
 				List<PreContainers> preContainersList = preContainersService.list(new LambdaQueryWrapper<PreContainers>()
-					.eq(PreContainers::getTenantId,AuthUtil.getTenantId())
-					.eq(PreContainers::getIsDeleted,0)
-					.eq(PreContainers::getPid,bills.getId()));
-				if (!preContainersList.isEmpty()){
+					.eq(PreContainers::getTenantId, AuthUtil.getTenantId())
+					.eq(PreContainers::getIsDeleted, 0)
+					.eq(PreContainers::getPid, bills.getId()));
+				if (!preContainersList.isEmpty()) {
 					String temperature = preContainersList.stream().map(PreContainers::getTemperature).filter(Objects::nonNull).collect(Collectors.joining(","));
 					bills.setTemperature(temperature);
 					String ventilation = preContainersList.stream().map(PreContainers::getVentilation).filter(Objects::nonNull).collect(Collectors.joining(","));
@@ -6979,6 +6979,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setExrate(item.getExrate());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -7105,6 +7109,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setExrate(item.getExrate());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -7230,6 +7238,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setExrate(item.getExrate());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -7346,6 +7358,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setExrate(item.getExrate());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -7982,6 +7998,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -8107,6 +8127,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -8231,6 +8255,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -8346,6 +8374,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -8485,6 +8517,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -8594,6 +8630,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -8702,6 +8742,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -8811,6 +8855,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -10913,6 +10961,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -11023,6 +11075,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -11132,6 +11188,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
@@ -11232,6 +11292,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReportsList.add(feeCenterReports);
 				}
+				if (!feeCenterList.isEmpty()){
+					bills.setTo(feeCenterList.get(0).getCorpCnName());
+					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
+				}
 				bills.setFeeCenterList(feeCenterReportsList);
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);