1.申请修改审批通过计算逻辑修改

2.账单中心，费用中心，财务模块增加箱型箱量，teu字段
3.海运客户托书保存增加状态判断
4.费用-申请修改报表打印接口修改
5.海运出口第二次保存判断分单号是否重复
6.海运出口主单保存同步分单信息修改
7.获取菜单接口增加中英文判断
8.主单同步分单信息，将主单ETA同步到分单
9.决策分析增加检索条件和字段
10.海运进出口增加检索条件

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/FeeCenter.java

@@ -1012,6 +1012,17 @@ public class FeeCenter implements Serializable {
 	 */
 	@ApiModelProperty(value = "订舱代理英文名称")
 	private String bookingAgentEnName;
+	/**
+	 * teu箱数
+	 */
+	@ApiModelProperty(value = "teu箱数")
+	private Integer teu;
+	/**
+	 * 集装箱箱数英文,
+	 */
+	@ApiModelProperty(value = "集装箱箱数英文, ")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String quantityCntrDescr;
 
 }
 

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/FeeCenterUpdateRecord.java

@@ -16,12 +16,14 @@
  */
 package org.springblade.los.finance.fee.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.los.check.entity.LosAuditPathsLevels;
+import org.springblade.los.utils.LosSpecialHandle;
 import org.springblade.system.entity.Dept;
 
 import java.io.Serializable;
@@ -357,4 +359,88 @@ public class FeeCenterUpdateRecord implements Serializable {
 	@TableField(exist = false)
 	private Dept dept;
 
+	/**
+	 * OP
+	 */
+	@TableField(exist = false)
+	private String operatorName;
+
+	/**
+	 * 客服
+	 */
+	@TableField(exist = false)
+	private String customerServiceName;
+
+	/**
+	 * 船公司中文名称
+	 */
+	@TableField(exist = false)
+	private String carrierShortName;
+	/**
+	 * 船公司中文名称
+	 */
+	@TableField(exist = false)
+	private String carrierCnName;
+	/**
+	 * 船公司英文名称
+	 */
+	@TableField(exist = false)
+	private String carrierEnName;
+
+	/**
+	 * 中文船名
+	 */
+	@TableField(exist = false)
+	private String vesselCnName;
+	/**
+	 * 英文船名
+	 */
+	@TableField(exist = false)
+	private String vesselEnName;
+	/**
+	 * 航次
+	 */
+	@TableField(exist = false)
+	private String voyageNo;
+	/**
+	 * 装货港英文名称
+	 */
+	@TableField(exist = false)
+	private String polCnName;
+	/**
+	 * 装货港英文名称
+	 */
+	@TableField(exist = false)
+	private String polEnName;
+	/**
+	 * 装货港英文名称打印
+	 */
+	@TableField(exist = false)
+	private String polNamePrint;
+	/**
+	 * 卸货港中文名称
+	 */
+	@TableField(exist = false)
+	private String podCnName;
+	/**
+	 * 卸货港英文名称
+	 */
+	@TableField(exist = false)
+	private String podEnName;
+	/**
+	 * 卸货港英文名称打印
+	 */
+	@TableField(exist = false)
+	private String podNamePrint;
+	/**
+	 * teu箱数
+	 */
+	@TableField(exist = false)
+	private Integer teu;
+	/**
+	 * 箱型箱量
+	 */
+	@TableField(exist = false)
+	private String quantityCntrDescr;
+
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/FinAccBills.java

@@ -796,6 +796,11 @@ public class FinAccBills implements Serializable {
 	 */
 	@ApiModelProperty(value = "订舱代理英文名称")
 	private String bookingAgentEnName;
+	/**
+	 * teu箱数
+	 */
+	@ApiModelProperty(value = "teu箱数")
+	private Integer teu;
 
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/invoices/entity/FinInvoicesItems.java

@@ -612,6 +612,17 @@ public class FinInvoicesItems implements Serializable {
 	 */
 	@ApiModelProperty(value = "订舱代理英文名称")
 	private String bookingAgentEnName;
+	/**
+	 * teu箱数
+	 */
+	@ApiModelProperty(value = "teu箱数")
+	private Integer teu;
+	/**
+	 * 集装箱箱数英文,
+	 */
+	@ApiModelProperty(value = "集装箱箱数英文, ")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String quantityCntrDescr;
 
 
 

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/stl/dto/FinStlBillsItemsReports.java

@@ -16,7 +16,10 @@
  */
 package org.springblade.los.finance.stl.dto;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -121,5 +124,14 @@ public class FinStlBillsItemsReports implements Serializable {
 	 */
 	private String salesman;
 
+	/**
+	 * teu箱数
+	 */
+	private Integer teu;
+	/**
+	 *箱型箱量
+	 */
+	private String quantityCntrDescr;
+
 
 }

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

@@ -697,6 +697,17 @@ public class FinStlBillsItems implements Serializable {
 	 */
 	@ApiModelProperty(value = "订舱代理英文名称")
 	private String bookingAgentEnName;
+	/**
+	 * teu箱数
+	 */
+	@ApiModelProperty(value = "teu箱数")
+	private Integer teu;
+	/**
+	 * 集装箱箱数英文,
+	 */
+	@ApiModelProperty(value = "集装箱箱数英文, ")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String quantityCntrDescr;
 
 
 	/**

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/BoxNumberProfitQ.java

@@ -73,6 +73,19 @@ public class BoxNumberProfitQ {
 	 * 单据类型
 	 */
 	private String billType;
+	private String mblno;
+	/**
+	 * 分单号
+	 */
+	private String hblno;
+	/**
+	 * 船名 id
+	 */
+	private Long vesselId;
+	/**
+	 * 航次
+	 */
+	private String voyageNo;
 
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FeeSettlementExcel.java

@@ -75,5 +75,16 @@ public class FeeSettlementExcel {
 	@ExcelIgnore
 	private String branchId;
 
+	/**
+	 * 船名 id
+	 */
+	@ExcelIgnore
+	private Long vesselId;
+	/**
+	 * 航次
+	 */
+	@ExcelIgnore
+	private String voyageNo;
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FeeSummaryDetailNotRD.java

@@ -35,10 +35,12 @@ public class FeeSummaryDetailNotRD {
 	private String etd;
 	@ExcelProperty(value = "提单号")
 	private String mblNo;
+	@ExcelProperty(value = "分单号")
+	private String hblNo;
 	@ExcelProperty(value = "起运港")
-	private String pod;
-	@ExcelProperty(value = "目的港")
 	private String pol;
+	@ExcelProperty(value = "目的港")
+	private String pod;
 	@ExcelProperty(value = "汇率")
 	private BigDecimal rate;
 	@ExcelProperty(value = "箱型箱量")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FeeSummaryDetailRD.java

@@ -24,6 +24,8 @@ public class FeeSummaryDetailRD {
 	private String billNo;
 	@ExcelProperty(value = "MBLNO")
 	private String mblNo;
+	@ExcelProperty(value = "分单号")
+	private String hblNo;
 	@ExcelProperty(value = "ETD")
 	private String etdDate;
 	/**

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FeeSummaryQ.java

@@ -1,5 +1,6 @@
 package org.springblade.los.statisticAnalysis;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -69,5 +70,17 @@ public class FeeSummaryQ {
 
 	private String billNo;
 	private String mblNo;
+	/**
+	 * 分单号
+	 */
+	private String hblNo;
+	/**
+	 * 船名 id
+	 */
+	private Long vesselId;
+	/**
+	 * 航次
+	 */
+	private String voyageNo;
 
 }

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

@@ -195,12 +195,31 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		if ((MagicValues.COST_APPLY_MODIFY.equals(groupCode) || MagicValues.COST_APPLY_DELETE.equals(groupCode))) {
 			FeeCenterUpdateRecord feeCenterUpdateRecord = feeCenterUpdateRecordService.getById(billId);
 			if (feeCenterUpdateRecord != null) {
+				Bills bills = billsService.getById(feeCenterUpdateRecord.getPid());
+				if (bills != null) {
+					feeCenterUpdateRecord.setOperatorName(bills.getOperatorName());
+					feeCenterUpdateRecord.setCustomerServiceName(bills.getCustomerServiceName());
+					feeCenterUpdateRecord.setCarrierShortName(bills.getCarrierShortName());
+					feeCenterUpdateRecord.setCarrierCnName(bills.getCarrierCnName());
+					feeCenterUpdateRecord.setCarrierEnName(bills.getCarrierEnName());
+					feeCenterUpdateRecord.setVesselCnName(bills.getVesselCnName());
+					feeCenterUpdateRecord.setVesselEnName(bills.getVesselEnName());
+					feeCenterUpdateRecord.setVoyageNo(bills.getVoyageNo());
+					feeCenterUpdateRecord.setPolCnName(bills.getPolCnName());
+					feeCenterUpdateRecord.setPolEnName(bills.getPolEnName());
+					feeCenterUpdateRecord.setPolNamePrint(bills.getPolNamePrint());
+					feeCenterUpdateRecord.setPodCnName(bills.getPodCnName());
+					feeCenterUpdateRecord.setPodEnName(bills.getPodEnName());
+					feeCenterUpdateRecord.setPodNamePrint(bills.getPodNamePrint());
+					feeCenterUpdateRecord.setTeu(bills.getTeu());
+					feeCenterUpdateRecord.setQuantityCntrDescr(bills.getQuantityCntrDescr());
+				}
 				feeCenterUpdateRecord.setDept(dept);
 				map.put(MagicValues.DATA, feeCenterUpdateRecord);
 			} else {
 				map.put(MagicValues.DATA, null);
 			}
-		}else{
+		} else {
 			if (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type)) {
 				return this.getReportDataHY(billId, reportCode, groupCode, corpIds, itemIds, type, curCode);
 			} else if (MagicValues.AMEND.equals(type)) {
@@ -328,6 +347,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								finStlBillsItemsReports.setSalesman(item.getSrcCnName());
 								finStlBillsItemsReports.setPodEnName(item.getPodEnName());
 								finStlBillsItemsReports.setPodCnName(item.getPodCnName());
+								finStlBillsItemsReports.setQuantityCntrDescr(item.getQuantityCntrDescr());
+								finStlBillsItemsReports.setTeu(item.getTeu());
 								if (!billsList.isEmpty()) {
 									String quantityCntrDescr = billsList.stream().filter(e -> e.getMblno().equals(item.getMblno())).map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
 									finStlBillsItemsReports.setQuantityCntrTypesDescr(quantityCntrDescr);
@@ -417,6 +438,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								finStlBillsItemsReports.setSalesman(item.getSrcCnName());
 								finStlBillsItemsReports.setPodEnName(item.getPodEnName());
 								finStlBillsItemsReports.setPodCnName(item.getPodCnName());
+								finStlBillsItemsReports.setQuantityCntrDescr(item.getQuantityCntrDescr());
+								finStlBillsItemsReports.setTeu(item.getTeu());
 								if (!billsList.isEmpty()) {
 									String quantityCntrDescr = billsList.stream().filter(e -> e.getMblno().equals(item.getMblno())).map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
 									finStlBillsItemsReports.setQuantityCntrTypesDescr(quantityCntrDescr);
@@ -488,6 +511,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								finStlBillsItemsReports.setSalesman(item.getSrcCnName());
 								finStlBillsItemsReports.setPodEnName(item.getPodEnName());
 								finStlBillsItemsReports.setPodCnName(item.getPodCnName());
+								finStlBillsItemsReports.setQuantityCntrDescr(item.getQuantityCntrDescr());
+								finStlBillsItemsReports.setTeu(item.getTeu());
 								if (!billsList.isEmpty()) {
 									String quantityCntrDescr = billsList.stream().filter(e -> e.getMblno().equals(item.getMblno())).map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
 									finStlBillsItemsReports.setQuantityCntrTypesDescr(quantityCntrDescr);
@@ -558,6 +583,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								finStlBillsItemsReports.setSalesman(item.getSrcCnName());
 								finStlBillsItemsReports.setPodEnName(item.getPodEnName());
 								finStlBillsItemsReports.setPodCnName(item.getPodCnName());
+								finStlBillsItemsReports.setQuantityCntrDescr(item.getQuantityCntrDescr());
+								finStlBillsItemsReports.setTeu(item.getTeu());
 								if (!billsList.isEmpty()) {
 									String quantityCntrDescr = billsList.stream().filter(e -> e.getMblno().equals(item.getMblno())).map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
 									finStlBillsItemsReports.setQuantityCntrTypesDescr(quantityCntrDescr);
@@ -626,6 +653,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								finStlBillsItemsReports.setSalesman(item.getSrcCnName());
 								finStlBillsItemsReports.setPodEnName(item.getPodEnName());
 								finStlBillsItemsReports.setPodCnName(item.getPodCnName());
+								finStlBillsItemsReports.setQuantityCntrDescr(item.getQuantityCntrDescr());
+								finStlBillsItemsReports.setTeu(item.getTeu());
 								if (MagicValues.D.equals(item.getDc())) {
 									if (exrateType.equals(item.getCurCode())) {
 										finStlBillsItemsReports.setAmount(item.getCurrentAmount());
@@ -692,6 +721,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								finStlBillsItemsReports.setSalesman(item.getSrcCnName());
 								finStlBillsItemsReports.setPodEnName(item.getPodEnName());
 								finStlBillsItemsReports.setPodCnName(item.getPodCnName());
+								finStlBillsItemsReports.setQuantityCntrDescr(item.getQuantityCntrDescr());
+								finStlBillsItemsReports.setTeu(item.getTeu());
 								if (!billsList.isEmpty()) {
 									String quantityCntrDescr = billsList.stream().filter(e -> e.getMblno().equals(item.getMblno())).map(Bills::getQuantityCntrDescr).collect(Collectors.joining(","));
 									finStlBillsItemsReports.setQuantityCntrTypesDescr(quantityCntrDescr);

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

@@ -151,6 +151,7 @@ public class BillsController extends BladeController {
 				.and(ObjectUtils.isNotNull(bills.getSrcCnName()), i -> i.like(Bills::getSrcCnName, bills.getSrcCnName()).or()
 					.like(Bills::getSrcEnName, bills.getSrcCnName()));
 			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getBranchId()), Bills::getBranchId, bills.getBranchId());
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getOperatorId()), Bills::getOperatorId, bills.getOperatorId());
 		}
 		lambdaQueryWrapper.and(ObjectUtils.isNotNull(bills.getBookingAgentCnName()), i -> i.like(Bills::getBookingAgentCnName, bills.getBookingAgentCnName()).or()
 				.like(Bills::getBookingAgentEnName, bills.getBookingAgentCnName()))

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

@@ -261,8 +261,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			// 旧数据处理
 			int version = StringUtil.isBlank(dataSourceBill.getVersion()) ? 1 : Integer.parseInt(dataSourceBill.getVersion());
 			bills.setVersion(String.valueOf(version + 1));
-			List<Long> ids = count.stream().map(Bills::getId).distinct().collect(Collectors.toList());
 			if (!"MH".equals(bills.getBillType())) {
+				List<Long> ids = count.stream().map(Bills::getId).distinct().collect(Collectors.toList());
 				if (ObjectUtils.isNotNull(bills.getMblno())) {
 					if (!count.isEmpty() && !ids.contains(bills.getId())) {
 						throw new RuntimeException("提单号不允许重复:" + bills.getMblno());
@@ -270,7 +270,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				}
 			} else {
 				if (ObjectUtils.isNotNull(bills.getHblno())) {
-					if (!count.isEmpty() && !ids.contains(bills.getId())) {
+					List<Long> ids = count1.stream().map(Bills::getId).distinct().collect(Collectors.toList());
+					if (!count1.isEmpty() && !ids.contains(bills.getId())) {
 						throw new RuntimeException("分单号不允许重复:" + bills.getHblno());
 					}
 				}
@@ -447,6 +448,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setRefno(bills.getRefno());
 				item.setBookingNo(bills.getBookingNo());
 				item.setCntrNo(bills.getQuantityCntrTypesDescr());
+				item.setQuantityCntrDescr(bills.getQuantityCntrDescr());
+				item.setTeu(bills.getTeu());
 				if (exrateType.equals(item.getCurCode())) {
 					amountCr = amountCr.add(item.getAmount());
 					amountCrLoc = amountCrLoc.add(item.getAmount());
@@ -505,6 +508,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setRefno(bills.getRefno());
 				item.setBookingNo(bills.getBookingNo());
 				item.setCntrNo(bills.getQuantityCntrTypesDescr());
+				item.setQuantityCntrDescr(bills.getQuantityCntrDescr());
+				item.setTeu(bills.getTeu());
 				if (exrateType.equals(item.getCurCode())) {
 					amountDr = amountDr.add(item.getAmount());
 					amountDrLoc = amountDrLoc.add(item.getAmount());
@@ -881,10 +886,11 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			boolean carrierId = ObjectUtils.isNotNull(bills.getCarrierId()) && !bills.getCarrierId().equals(details.getCarrierId());
 			boolean foreignAgencyId = ObjectUtils.isNotNull(bills.getForeignAgencyId()) && !bills.getForeignAgencyId().equals(details.getForeignAgencyId());
 			boolean issueDate = ObjectUtils.isNotNull(bills.getIssueDate()) && !bills.getIssueDate().equals(details.getIssueDate());
+			boolean issueAtId = ObjectUtils.isNotNull(bills.getIssueAtId()) && !bills.getIssueAtId().equals(details.getIssueAtId());
 			boolean boxBelongsTo = ObjectUtils.isNotNull(bills.getBoxBelongsTo()) && !bills.getBoxBelongsTo().equals(details.getBoxBelongsTo());
 			if (statusEtd || statusEta || statusAtd || statusAta || statusVessel || statusVoyageNo || statusMblno || statusPolId
 				|| statusPodId || statusCyTrailerTime || statusCyReturnTime || statusLineId || statusForwarding || statusBookingAgentId
-				|| shippingAgencyId || bookingDate || carrierId || foreignAgencyId || issueDate || boxBelongsTo) {
+				|| shippingAgencyId || bookingDate || carrierId || foreignAgencyId || issueDate || boxBelongsTo || issueAtId) {
 				billsList = baseMapper.selectList(new LambdaQueryWrapper<Bills>()
 					.eq(Bills::getTenantId, AuthUtil.getTenantId())
 					.eq(Bills::getIsDeleted, 0)
@@ -905,11 +911,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 						item.setPolCnName(bills.getPolCnName());
 						item.setPolEnName(bills.getPolEnName());
 						item.setPolCode(bills.getPolCode());
-						item.setPolNamePrint(bills.getPolNamePrint());
 						item.setPodId(bills.getPodId());
 						item.setPodCnName(bills.getPodCnName());
 						item.setPodEnName(bills.getPodEnName());
-						item.setPodNamePrint(bills.getPodNamePrint());
 						item.setPodCode(bills.getPodCode());
 						item.setMblno(bills.getMblno());
 						item.setCyTrailerTime(bills.getCyTrailerTime());
@@ -935,6 +939,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 						item.setForeignAgencyEnName(bills.getForeignAgencyEnName());
 						item.setForeignAgencyDetails(bills.getForeignAgencyDetails());
 						item.setForeignCntyName(bills.getForeignCntyName());
+						item.setIssueAtId(bills.getIssueAtId());
+						item.setIssueAt(bills.getIssueAt());
 					}
 					this.updateBatchById(billsList);
 					List<Long> billIds = billsList.stream().map(Bills::getId).collect(Collectors.toList());
@@ -1441,6 +1447,13 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				containersBillsService.saveBatch(containersBillsListNew);
 			}
 		}
+		for (Bills item : billsList){
+			item.setEta(bills.getEta());
+			item.setActualEta(bills.getActualEta());
+		}
+		if (!billsList.isEmpty()){
+			this.updateBatchById(billsList);
+		}
 	}
 
 	@Override
@@ -4656,6 +4669,21 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			bills.setVersion("1");
 			this.save(bills);
 		} else {
+			Bills dataSourceBill = baseMapper.selectOne(new LambdaQueryWrapper<Bills>().select(Bills::getId, Bills::getVersion,
+				Bills::getIssueStatus,Bills::getStatus).eq(Bills::getId, bills.getId()));
+			if (!Objects.equals(dataSourceBill.getVersion(), bills.getVersion())) {
+				return R.fail(601, "数据已被其他用户更新，请等待刷新后重试");
+			}
+			if ("1".equals(dataSourceBill.getIssueStatus())){
+				throw new RuntimeException("单据已生成订单");
+			}
+			if (0 != dataSourceBill.getStatus()){
+				throw new RuntimeException("单据状态不是录入，保存失败");
+			}
+			// 每更新一次往上累加一次版本
+			// 旧数据处理
+			int version = StringUtil.isBlank(dataSourceBill.getVersion()) ? 1 : Integer.parseInt(dataSourceBill.getVersion());
+			bills.setVersion(String.valueOf(version + 1));
 			bills.setUpdateUser(AuthUtil.getUserId());
 			bills.setUpdateTime(new Date());
 			bills.setUpdateUserName(AuthUtil.getUserName());

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

@@ -2025,7 +2025,12 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 			feeCenter.setCurCode(feeCenterUpdateRecord.getCurCodeUpdate());
 			feeCenter.setExrate(feeCenterUpdateRecord.getExrateUpdate());
 			feeCenter.setAmount(feeCenterUpdateRecord.getAmountUpdate());
+			feeCenter.setAmountNet(feeCenterUpdateRecord.getAmountUpdate());
+			feeCenter.setUnsettledAmount(feeCenterUpdateRecord.getAmountUpdate());
 			feeCenter.setAmountLoc(feeCenterUpdateRecord.getAmountLocUpdate());
+			feeCenter.setAmountNetLoc(feeCenterUpdateRecord.getAmountLocUpdate());
+			feeCenter.setAmountDiscountLoc(feeCenterUpdateRecord.getAmountLocUpdate());
+			feeCenter.setAccAmount(feeCenterUpdateRecord.getAmountLocUpdate());
 			feeCenter.setRemarks(feeCenterUpdateRecord.getRemarksUpdate());
 			feeCenterService.updateById(feeCenter);
 			if (feeCenter.getAccBillId() == null) {
@@ -2111,6 +2116,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				data.setBookingAgentId(item.getBookingAgentId());
 				data.setBookingAgentCnName(item.getBookingAgentCnName());
 				data.setBookingAgentEnName(item.getBookingAgentEnName());
+				data.setQuantityCntrDescr(item.getQuantityCntrDescr());
+				data.setTeu(item.getTeu());
 				BusinessBillNo businessBillNo = new BusinessBillNo();
 				businessBillNo.setBusinessTypeId(businessType.getId());
 				businessBillNo.setCode("YWZD");

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.xml

@@ -352,6 +352,7 @@
         </if>
         acc.bill_no billNo,
         acc.mblno mblNo,
+        acc.hblNo hblNo,
         acc.business_type businessType,
         CASE
         acc.business_type
@@ -384,6 +385,15 @@
         <if test="fee.mblNo != null and fee.mblNo != ''">
             and acc.mblno like concat('%', #{fee.mblNo}, '%')
         </if>
+        <if test="fee.hblNo != null and fee.hblNo != ''">
+            and acc.hblNo like concat('%', #{fee.hblNo}, '%')
+        </if>
+        <if test='fee.vesselId != null and fee.vesselId != ""'>
+            and acc.vessel_id = #{fee.vesselId}
+        </if>
+        <if test='fee.voyageNo != null and fee.voyageNo != ""'>
+            and acc.voyage_no = #{fee.voyageNo}
+        </if>
         <if test='fee.branchId != null and fee.branchId != ""'>
             and acc.branch_id = #{fee.branchId}
         </if>
@@ -431,12 +441,12 @@
             GROUP BY acc.bill_corp_id, acc.branch_id
         </if>
         <if test='fee.type != null and fee.type != "" and fee.type == "3"'>
-            GROUP BY acc.mblno, acc.branch_id
+            GROUP BY acc.mblno,acc.hblno, acc.branch_id
         </if>
         <if test='fee.type == null or fee.type == ""'>
-            GROUP BY acc.mblno, acc.branch_id
+            GROUP BY acc.mblno,acc.hblno, acc.branch_id
         </if>
-        ORDER BY acc.corp_id
+        ORDER BY acc.corp_id,acc.mblno,acc.hblno
     </select>
     <select id="feeSummaryDetailExportList" resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailRD">
         SELECT
@@ -454,6 +464,7 @@
         </if>
         acc.bill_no billNo,
         acc.mblno mblNo,
+        acc.hblno hblNo,
         acc.business_type businessType,
         CASE
         acc.business_type
@@ -486,6 +497,15 @@
         <if test="fee.mblNo != null and fee.mblNo != ''">
             and acc.mblno like concat('%', #{fee.mblNo}, '%')
         </if>
+        <if test="fee.hblNo != null and fee.hblNo != ''">
+            and acc.hblNo like concat('%', #{fee.hblNo}, '%')
+        </if>
+        <if test='fee.vesselId != null and fee.vesselId != ""'>
+            and acc.vessel_id = #{fee.vesselId}
+        </if>
+        <if test='fee.voyageNo != null and fee.voyageNo != ""'>
+            and acc.voyage_no = #{fee.voyageNo}
+        </if>
         <if test='fee.branchId != null and fee.branchId != ""'>
             and acc.branch_id = #{fee.branchId}
         </if>
@@ -533,12 +553,12 @@
             GROUP BY acc.bill_corp_id, acc.branch_id
         </if>
         <if test='fee.type != null and fee.type != "" and fee.type == "3"'>
-            GROUP BY acc.mblno, acc.branch_id
+            GROUP BY acc.mblno,acc.hblno, acc.branch_id
         </if>
         <if test='fee.type == null or fee.type == ""'>
-            GROUP BY acc.mblno, acc.branch_id
+            GROUP BY acc.mblno,acc.hblno, acc.branch_id
         </if>
-        ORDER BY acc.corp_id
+        ORDER BY acc.corp_id,acc.mblno,acc.hblno
     </select>
     <select id="feeSummaryDetailNotList" resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailNotRD">
         SELECT
@@ -558,6 +578,7 @@
             acc.vessel_en_name vesselName,
             acc.voyage_no voyageNo,
             acc.mblno mblNo,
+            acc.hblno hblNo,
             acc.business_type businessType,
             CASE
             acc.business_type
@@ -591,6 +612,15 @@
         <if test="fee.mblNo != null and fee.mblNo != ''">
             and acc.mblno like concat('%', #{fee.mblNo}, '%')
         </if>
+        <if test="fee.hblNo != null and fee.hblNo != ''">
+            and acc.hblNo like concat('%', #{fee.hblNo}, '%')
+        </if>
+        <if test='fee.vesselId != null and fee.vesselId != ""'>
+            and acc.vessel_id = #{fee.vesselId}
+        </if>
+        <if test='fee.voyageNo != null and fee.voyageNo != ""'>
+            and acc.voyage_no = #{fee.voyageNo}
+        </if>
         <if test='fee.branchId != null and fee.branchId != ""'>
             and acc.branch_id = #{fee.branchId}
         </if>
@@ -635,12 +665,12 @@
             GROUP BY acc.bill_corp_id, acc.branch_id
         </if>
         <if test='fee.type != null and fee.type != "" and fee.type == "3"'>
-            GROUP BY acc.mblno, acc.branch_id
+            GROUP BY acc.mblno,acc.hblno, acc.branch_id
         </if>
         <if test='fee.type == null or fee.type == ""'>
-            GROUP BY acc.mblno, acc.branch_id
+            GROUP BY acc.mblno,acc.hblno, acc.branch_id
         </if>
-        ORDER BY acc.corp_id
+        ORDER BY acc.corp_id,acc.mblno,acc.hblno
     </select>
     <select id="feeSummaryDetailExportNotList"
             resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailNotRD">
@@ -661,6 +691,7 @@
         acc.vessel_en_name vesselName,
         acc.voyage_no voyageNo,
         acc.mblno mblNo,
+        acc.hblno hblNo,
         acc.business_type businessType,
         CASE
         acc.business_type
@@ -694,6 +725,15 @@
         <if test="fee.mblNo != null and fee.mblNo != ''">
             and acc.mblno like concat('%', #{fee.mblNo}, '%')
         </if>
+        <if test="fee.hblNo != null and fee.hblNo != ''">
+            and acc.hblNo like concat('%', #{fee.hblNo}, '%')
+        </if>
+        <if test='fee.vesselId != null and fee.vesselId != ""'>
+            and acc.vessel_id = #{fee.vesselId}
+        </if>
+        <if test='fee.voyageNo != null and fee.voyageNo != ""'>
+            and acc.voyage_no = #{fee.voyageNo}
+        </if>
         <if test='fee.branchId != null and fee.branchId != ""'>
             and acc.branch_id = #{fee.branchId}
         </if>
@@ -738,12 +778,12 @@
             GROUP BY acc.bill_corp_id, acc.branch_id
         </if>
         <if test='fee.type != null and fee.type != "" and fee.type == "3"'>
-            GROUP BY acc.mblno, acc.branch_id
+            GROUP BY acc.mblno,acc.hblno, acc.branch_id
         </if>
         <if test='fee.type == null or fee.type == ""'>
-            GROUP BY acc.mblno, acc.branch_id
+            GROUP BY acc.mblno,acc.hblno, acc.branch_id
         </if>
-        ORDER BY acc.corp_id
+        ORDER BY acc.corp_id,acc.mblno,acc.hblno
     </select>
     <select id="agingAnalysis" resultType="org.springblade.los.statisticAnalysis.AgingAnalysisRD">
         SELECT

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

@@ -255,6 +255,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				feeCenter.setBookingAgentId(bills.getBookingAgentId());
 				feeCenter.setBookingAgentCnName(bills.getBookingAgentCnName());
 				feeCenter.setBookingAgentEnName(bills.getBookingAgentEnName());
+				feeCenter.setQuantityCntrDescr(bills.getQuantityCntrDescr());
+				feeCenter.setTeu(bills.getTeu());
 				feeCenter.setPid(bills.getId());
 				feeCenter.setCntrNo(bills.getQuantityCntrTypesDescr());
 				feeCenter.setBillNo(bills.getBillNo());
@@ -658,6 +660,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				feeCenter.setBookingAgentId(bills.getBookingAgentId());
 				feeCenter.setBookingAgentCnName(bills.getBookingAgentCnName());
 				feeCenter.setBookingAgentEnName(bills.getBookingAgentEnName());
+				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) {
@@ -1178,6 +1182,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				feeCenter.setBookingAgentId(bills.getBookingAgentId());
 				feeCenter.setBookingAgentCnName(bills.getBookingAgentCnName());
 				feeCenter.setBookingAgentEnName(bills.getBookingAgentEnName());
+				feeCenter.setQuantityCntrDescr(bills.getQuantityCntrDescr());
+				feeCenter.setTeu(bills.getTeu());
 				feeCenter.setPid(bills.getId());
 				feeCenter.setCntrNo(bills.getQuantityCntrTypesDescr());
 				feeCenter.setBillNo(bills.getBillNo());
@@ -1541,6 +1547,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 								feeCenter.setBookingAgentId(item.getBookingAgentId());
 								feeCenter.setBookingAgentCnName(item.getBookingAgentCnName());
 								feeCenter.setBookingAgentEnName(item.getBookingAgentEnName());
+								feeCenter.setQuantityCntrDescr(item.getQuantityCntrDescr());
+								feeCenter.setTeu(item.getTeu());
 								feeCenterC.setPid(item.getId());
 								feeCenterC.setCntrNo(item.getQuantityCntrTypesDescr());
 								feeCenterC.setBillNo(item.getBillNo());
@@ -1603,6 +1611,11 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 							this.updateBills(feeCenterSum, item, exrateType);
 							BigDecimal amount = feeCenterSum.stream().map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 							FeeCenter feeCenterD = new FeeCenter();
+							feeCenterD.setBookingAgentId(bills.getBookingAgentId());
+							feeCenterD.setBookingAgentCnName(bills.getBookingAgentCnName());
+							feeCenterD.setBookingAgentEnName(bills.getBookingAgentEnName());
+							feeCenterD.setQuantityCntrDescr(bills.getQuantityCntrDescr());
+							feeCenterD.setTeu(bills.getTeu());
 							feeCenterD.setBranchId(bills.getBranchId());
 							feeCenterD.setBranchName(bills.getBranchName());
 							feeCenterD.setPid(bills.getId());
@@ -2168,6 +2181,11 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 		FeeCenter feeCenter = new FeeCenter();
 		feeCenter.setBranchId(bills.getBranchId());
 		feeCenter.setBranchName(bills.getBranchName());
+		feeCenter.setBookingAgentId(bills.getBookingAgentId());
+		feeCenter.setBookingAgentCnName(bills.getBookingAgentCnName());
+		feeCenter.setBookingAgentEnName(bills.getBookingAgentEnName());
+		feeCenter.setQuantityCntrDescr(bills.getQuantityCntrDescr());
+		feeCenter.setTeu(bills.getTeu());
 		feeCenter.setPid(bills.getId());
 		feeCenter.setCntrNo(bills.getQuantityCntrTypesDescr());
 		feeCenter.setBillNo(bills.getBillNo());

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

@@ -25,6 +25,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.los.Util.CurrencyUtils;
 import org.springblade.los.check.dto.LosAuditProecessDTO;
 import org.springblade.los.check.entity.LosAuditPathsActs;
 import org.springblade.los.check.entity.LosAuditPathsLevels;
@@ -50,6 +51,7 @@ import org.springblade.los.finance.stl.mapper.FinStlBillsMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.ArrayList;
@@ -84,6 +86,8 @@ public class FeeCenterUpdateRecordServiceImpl extends ServiceImpl<FeeCenterUpdat
 
 	private final FinPeriodMapper finPeriodMapper;
 
+	private final CurrencyUtils currencyUtils;
+
 	@Override
 	public IPage<FeeCenterUpdateRecordVO> selectFeeCenterUpdateRecordPage(IPage<FeeCenterUpdateRecordVO> page, FeeCenterUpdateRecordVO feeCenterUpdateRecord) {
 		return page.setRecords(baseMapper.selectFeeCenterUpdateRecordPage(page, feeCenterUpdateRecord));
@@ -96,6 +100,7 @@ public class FeeCenterUpdateRecordServiceImpl extends ServiceImpl<FeeCenterUpdat
 			throw new RuntimeException("缺少必要参数");
 		}
 		FeeCenter feeCenter = feeCenterService.getById(feeCenterUpdateRecord.getItemId());
+		String exrateType = currencyUtils.standardCurrency(feeCenter.getBranchId());
 		if (feeCenter == null) {
 			throw new RuntimeException("未查到费用明细");
 		}
@@ -206,6 +211,19 @@ public class FeeCenterUpdateRecordServiceImpl extends ServiceImpl<FeeCenterUpdat
 		feeCenterUpdateRecord.setBranchId(feeCenter.getBranchId());
 		feeCenterUpdateRecord.setBranchName(feeCenter.getBranchName());
 		feeCenterUpdateRecord.setStatus("1");
+		// 金额
+		BigDecimal amount = feeCenterUpdateRecord.getAmountUpdate();
+
+		//计算字段null值处理
+		feeCenterUpdateRecord.setQuantityUpdate(ObjectUtils.isNotNull(feeCenterUpdateRecord.getQuantityUpdate()) ? feeCenterUpdateRecord.getQuantityUpdate() : new BigDecimal("0.00"));
+		feeCenterUpdateRecord.setPriceUpdate(ObjectUtils.isNotNull(feeCenterUpdateRecord.getPriceUpdate()) ? feeCenterUpdateRecord.getPriceUpdate() : new BigDecimal("0.00"));
+		//判断是否是本位币
+		if (exrateType.equals(feeCenterUpdateRecord.getCurCodeUpdate())) {
+			feeCenterUpdateRecord.setAmountLocUpdate(amount);
+		} else {
+			feeCenterUpdateRecord.setAmountLocUpdate(feeCenterUpdateRecord.getAmountUpdate().multiply(feeCenterUpdateRecord.getExrateUpdate()));
+		}
+		feeCenterUpdateRecord.setAmountUpdate(amount);
 		baseMapper.insert(feeCenterUpdateRecord);
 		int actId;
 		String processType;

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java

@@ -1326,6 +1326,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			.like(ObjectUtils.isNotNull(feeSettlementExcel.getMblno()), FeeCenter::getMblno, feeSettlementExcel.getMblno())
 			.like(ObjectUtils.isNotNull(feeSettlementExcel.getHblno()), FeeCenter::getHblno, feeSettlementExcel.getHblno())
 			.like(ObjectUtils.isNotNull(feeSettlementExcel.getSrcNo()), FeeCenter::getMblno, feeSettlementExcel.getSrcNo())
+			.eq(ObjectUtils.isNotNull(feeSettlementExcel.getVesselId()), FeeCenter::getVesselId, feeSettlementExcel.getVesselId())
+			.like(ObjectUtils.isNotNull(feeSettlementExcel.getVoyageNo()), FeeCenter::getVoyageNo, feeSettlementExcel.getVoyageNo())
 			.ge(ObjectUtils.isNotNull(feeSettlementExcel.getStartDate()), FeeCenter::getBillDate, feeSettlementExcel.getStartDate())
 			.le(ObjectUtils.isNotNull(feeSettlementExcel.getEndDate()), FeeCenter::getBillDate, feeSettlementExcel.getEndDate());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
@@ -1402,6 +1404,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			.like(ObjectUtils.isNotNull(feeSettlementExcel.getMblno()), FeeCenter::getMblno, feeSettlementExcel.getMblno())
 			.like(ObjectUtils.isNotNull(feeSettlementExcel.getHblno()), FeeCenter::getHblno, feeSettlementExcel.getHblno())
 			.like(ObjectUtils.isNotNull(feeSettlementExcel.getSrcNo()), FeeCenter::getMblno, feeSettlementExcel.getSrcNo())
+			.eq(ObjectUtils.isNotNull(feeSettlementExcel.getVesselId()), FeeCenter::getVesselId, feeSettlementExcel.getVesselId())
+			.like(ObjectUtils.isNotNull(feeSettlementExcel.getVoyageNo()), FeeCenter::getVoyageNo, feeSettlementExcel.getVoyageNo())
 			.ge(ObjectUtils.isNotNull(feeSettlementExcel.getStartDate()), FeeCenter::getBillDate, feeSettlementExcel.getStartDate())
 			.le(ObjectUtils.isNotNull(feeSettlementExcel.getEndDate()), FeeCenter::getBillDate, feeSettlementExcel.getEndDate());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {

blade-service/blade-los/src/main/java/org/springblade/los/view/mapper/BoxNumberProfitMapper.xml

@@ -74,6 +74,18 @@
         <if test="data.srcCnName != null and data.srcCnName != ''">
             and src_cn_name like concat('%', #{data.srcCnName}, '%')
         </if>
+        <if test="data.mblno != null and data.mblno != ''">
+            and mblno like concat('%', #{data.mblno}, '%')
+        </if>
+        <if test="data.hblno != null and data.hblno != ''">
+            and hblNo like concat('%', #{data.hblno}, '%')
+        </if>
+        <if test='data.vesselId != null and data.vesselId != ""'>
+            and vessel_id = #{data.vesselId}
+        </if>
+        <if test='data.voyageNo != null and data.voyageNo != ""'>
+            and voyage_no = #{data.voyageNo}
+        </if>
         <if test="data.carrierCnName != null and data.carrierCnName != ''">
             and carrier_cn_name like concat('%', #{data.carrierCnName}, '%')
         </if>
@@ -149,6 +161,18 @@
         <if test="data.srcCnName != null and data.srcCnName != ''">
             and src_cn_name like concat('%', #{data.srcCnName}, '%')
         </if>
+        <if test="data.mblno != null and data.mblno != ''">
+            and mblno like concat('%', #{data.mblno}, '%')
+        </if>
+        <if test="data.hblno != null and data.hblno != ''">
+            and hblNo like concat('%', #{data.hblno}, '%')
+        </if>
+        <if test='data.vesselId != null and data.vesselId != ""'>
+            and vessel_id = #{data.vesselId}
+        </if>
+        <if test='data.voyageNo != null and data.voyageNo != ""'>
+            and voyage_no = #{data.voyageNo}
+        </if>
         <if test="data.carrierCnName != null and data.carrierCnName != ''">
             and carrier_cn_name like concat('%', #{data.carrierCnName}, '%')
         </if>

blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java

@@ -177,8 +177,8 @@ public class MenuController extends BladeController {
 	@GetMapping("/routes")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "前端菜单数据", notes = "前端菜单数据")
-	public R<List<MenuVO>> routes(BladeUser user, Long topMenuId) {
-		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId);
+	public R<List<MenuVO>> routes(BladeUser user, Long topMenuId,String type) {
+		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId,type);
 		return R.data(list);
 	}
 

blade-service/blade-system/src/main/java/org/springblade/system/service/IMenuService.java

@@ -57,7 +57,7 @@ public interface IMenuService extends IService<Menu> {
 	 * @param topMenuId
 	 * @return
 	 */
-	List<MenuVO> routes(String roleId, Long topMenuId);
+	List<MenuVO> routes(String roleId, Long topMenuId,String type);
 
 	/**
 	 * 按钮树形结构

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java

@@ -83,7 +83,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 
 
 	@Override
-	public List<MenuVO> routes(String roleId, Long topMenuId) {
+	public List<MenuVO> routes(String roleId, Long topMenuId,String type) {
 		if (StringUtil.isBlank(roleId)) {
 			return null;
 		}
@@ -111,14 +111,19 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 				routes.stream().anyMatch(route -> route.getId().longValue() == x.getId().longValue())
 			).collect(Collectors.toList());
 		}
-		return buildRoutes(allMenus, roleMenus);
+		return buildRoutes(allMenus, roleMenus,type);
 	}
 
-	private List<MenuVO> buildRoutes(List<Menu> allMenus, List<Menu> roleMenus) {
+	private List<MenuVO> buildRoutes(List<Menu> allMenus, List<Menu> roleMenus,String type) {
 		List<Menu> routes = new LinkedList<>(roleMenus);
 		roleMenus.forEach(roleMenu -> recursion(allMenus, routes, roleMenu));
 		routes.sort(Comparator.comparing(Menu::getSort));
 		MenuWrapper menuWrapper = new MenuWrapper();
+		for (Menu item : routes){
+			if ("1".equals(type)){
+				item.setName(item.getAlias());
+			}
+		}
 		List<Menu> collect = routes.stream().filter(x -> Func.equals(x.getCategory(), 1)).collect(Collectors.toList());
 		return menuWrapper.listNodeVO(collect);
 	}