Просмотр исходного кода

1.海运进出口-应收应付报表打印增加费用明细结算单位地址,信用代码
2.费用明细一键保存业务员字段值为空问题修改
3.海运进出口报表打印增加箱号,铅封号自动换行字段

纪新园 12 часов назад
Родитель
Сommit
c2154a875f

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

@@ -2298,6 +2298,21 @@ public class Bills implements Serializable {
 	@TableField(exist = false)
 	private String uscc;
 	/**
+	 * 客户地址-费用明细
+	 */
+	@TableField(exist = false)
+	private String corpAddress1;
+	/**
+	 * 客户地址英文-费用明细
+	 */
+	@TableField(exist = false)
+	private String corpAddressEn1;
+	/**
+	 * 统一社会信用代码-费用明细
+	 */
+	@TableField(exist = false)
+	private String uscc1;
+	/**
 	 * Swift Code
 	 */
 	@TableField(exist = false)
@@ -2319,6 +2334,11 @@ public class Bills implements Serializable {
 	@TableField(exist = false)
 	private String cntrSealNo;
 	/**
+	 * 箱信息字符串
+	 */
+	@TableField(exist = false)
+	private String cntrSealNos;
+	/**
 	 * 本位币利润(CNY)
 	 */
 	@TableField(exist = false)

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

@@ -1407,6 +1407,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				bills.setBoxWeightSum(boxWeightSum);
 				StringBuilder text = new StringBuilder();
 				StringBuilder cntrSealNo = new StringBuilder();
+				StringBuilder cntrSealNos = new StringBuilder();
 				for (Containers item : containersList) {
 					ContainersReports containersReports = new ContainersReports();
 					BeanUtil.copyProperties(item, containersReports);
@@ -1424,6 +1425,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						.append(item.getMeasurement()).append("CBM").append("<br/>");
 					if (ObjectUtils.isNotNull(item.getCntrNo()) || ObjectUtils.isNotNull(item.getSealNo())) {
 						cntrSealNo.append(item.getCntrNo()).append("/").append(item.getSealNo()).append("  ");
+						cntrSealNos.append(item.getCntrNo()).append("/").append(item.getSealNo()).append("<br/>");
 					}
 				}
 				bills.setCntryString(text.toString());
@@ -1431,6 +1433,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					+bills.getHpaymode()+bills.getServiceTerms()+bills.getCapitalLetters());*/
 				bills.setMarks(bills.getMarks() + "<br/><br/>" + bills.getCntryString());
 				bills.setCntrSealNo(cntrSealNo.toString());
+				bills.setCntrSealNos(cntrSealNos.toString());
 				bills.setContainersReportsList(containersReportsList);
 				bills.setDept(dept);
 				map.put(MagicValues.DATA, bills);
@@ -1470,6 +1473,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				bills.setBoxWeightSum(boxWeightSum);
 				StringBuilder text = new StringBuilder();
 				StringBuilder cntrSealNo = new StringBuilder();
+				StringBuilder cntrSealNos = new StringBuilder();
 				for (Containers item : containersList) {
 					ContainersReports containersReports = new ContainersReports();
 					BeanUtil.copyProperties(item, containersReports);
@@ -1487,11 +1491,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						.append(item.getMeasurement()).append("CBM").append("<br/>");
 					if (ObjectUtils.isNotNull(item.getCntrNo()) || ObjectUtils.isNotNull(item.getSealNo())) {
 						cntrSealNo.append(item.getCntrNo()).append("/").append(item.getSealNo()).append("  ");
+						cntrSealNos.append(item.getCntrNo()).append("/").append(item.getSealNo()).append("<br/>");
 					}
 				}
 				bills.setCntryString(text.toString());
 				bills.setMarks(bills.getMarks() + "<br/><br/>" + bills.getCntryString());
 				bills.setCntrSealNo(cntrSealNo.toString());
+				bills.setCntrSealNos(cntrSealNos.toString());
 				bills.setContainersReportsList(containersReportsList);
 				List<Bills> billsList = billsService.list(new LambdaQueryWrapper<Bills>()
 					.eq(Bills::getTenantId, AuthUtil.getTenantId())
@@ -1536,6 +1542,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				bills.setBoxWeightSum(boxWeightSum);
 				StringBuilder text = new StringBuilder();
 				StringBuilder cntrSealNo = new StringBuilder();
+				StringBuilder cntrSealNos = new StringBuilder();
 				int count = 0;
 				for (Containers item : containersList) {
 					boolean isLast = (count == containersList.size() - 1);
@@ -1551,6 +1558,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					count++;
 					if (ObjectUtils.isNotNull(item.getCntrNo()) || ObjectUtils.isNotNull(item.getSealNo())) {
 						cntrSealNo.append(item.getCntrNo()).append("  ").append(item.getSealNo()).append("  ");
+						cntrSealNo.append(item.getCntrNo()).append("  ").append(item.getSealNo()).append("<br/>");
 					}
 				}
 				bills.setCntryString(text.toString());
@@ -1572,6 +1580,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 
 				bills.setMarks(bills.getMarks());//+ bills.getCntryString() + "<br/><br/>"
 				bills.setCntrSealNo(cntrSealNo.toString());
+				bills.setCntrSealNos(cntrSealNos.toString());
 				bills.setDept(dept);
 				BCorps bCorps = bCorpsService.getById(bills.getCorpId());
 				if (bCorps != null) {
@@ -1715,6 +1724,12 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					} else {
 						bills.setExrate(new BigDecimal("1"));
 					}
+					BCorps bCorps = bCorpsService.getById(feeCenterList.get(0).getCorpId());
+					if (bCorps != null) {
+						bills.setCorpAddress1(bCorps.getCnAddr());
+						bills.setCorpAddressEn1(bCorps.getEnAddr());
+						bills.setUscc1(bCorps.getUscc());
+					}
 				}
 				BCorps bCorps = bCorpsService.getById(bills.getCorpId());
 				if (bCorps != null) {
@@ -1805,6 +1820,12 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					} else {
 						bills.setExrate(new BigDecimal("1"));
 					}
+					BCorps bCorps = bCorpsService.getById(feeCenterList.get(0).getCorpId());
+					if (bCorps != null) {
+						bills.setCorpAddress1(bCorps.getCnAddr());
+						bills.setCorpAddressEn1(bCorps.getEnAddr());
+						bills.setUscc1(bCorps.getUscc());
+					}
 				}
 				bills.setDept(dept);
 				BCorps bCorps = bCorpsService.getById(bills.getCorpId());

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

@@ -794,6 +794,12 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					feeCenter.setBillBranchId(deptId);
 					feeCenter.setBillBranchName(deptName);
 				}
+				feeCenter.setSrcType(bills.getSrcType());
+				feeCenter.setSrcId(bills.getSrcId());
+				feeCenter.setSrcCnName(bills.getSrcCnName());
+				feeCenter.setSrcEnName(bills.getSrcEnName());
+				feeCenter.setQuantityCntrDescr(bills.getQuantityCntrDescr());
+				feeCenter.setTeu(bills.getTeu());
 				if (!bCorpsList.isEmpty()) {
 					BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(feeCenter.getCorpId())).findFirst().orElse(null);
 					if (bCorps != null) {