1.确认结算，撤销结算汇率问题修改

2.物流提交查询人员数据不对修改
3.提单号不允许重复规则修改

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/storage/entity/StorageFees.java

@@ -16,13 +16,13 @@
  */
 package org.springblade.los.basic.storage.entity;
 
+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 java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -98,9 +98,21 @@ public class StorageFees implements Serializable {
 	private String tenantId;
 
 	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private String createUserName;
+	/**
+	 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private String updateUserName;
+
+	/**
 	 * 明细
 	 */
 
+	@TableField(exist = false)
 	private List<StorageFeesItems> storageFeesItemsList;
 
 

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/storage/entity/StorageFeesItems.java

@@ -118,5 +118,16 @@ public class StorageFeesItems implements Serializable {
 	@ApiModelProperty(value = "币别")
 	private String curCode;
 
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private String createUserName;
+	/**
+	 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private String updateUserName;
+
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/storage/service/impl/StorageFeesServiceImpl.java

@@ -59,20 +59,17 @@ public class StorageFeesServiceImpl extends ServiceImpl<StorageFeesMapper, Stora
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R submit(StorageFees storageFees) {
-		String deptId;
 		String deptName = "";
 		String branchId = null;
-		if (ObjectUtils.isNotNull(storageFees.getBranchId())) {
-			deptId = storageFees.getBranchId();
-			branchId = storageFees.getBranchId();
-			deptName = storageFees.getBranchName();
+		if (ObjectUtils.isNull(storageFees.getBranchId())) {
+			branchId = AuthUtil.getDeptId();
 		} else {
-			deptId = AuthUtil.getDeptId();
+			branchId = storageFees.getBranchId();
 		}
 		//获取部门ids对应中文名
-		R<List<String>> res = sysClient.getDeptNames(deptId);
+		R<String> res = sysClient.getDeptName(Long.parseLong(branchId));
 		if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
-			deptName = String.join(",", res.getData());
+			deptName = res.getData();
 		}
 		List<StorageFees> cname = baseMapper.selectList(new LambdaQueryWrapper<StorageFees>()
 			.eq(StorageFees::getType, storageFees.getType())
@@ -86,6 +83,7 @@ public class StorageFeesServiceImpl extends ServiceImpl<StorageFeesMapper, Stora
 			storageFees.setCreateUser(AuthUtil.getUserId());
 			storageFees.setBranchId(branchId);
 			storageFees.setBranchName(deptName);
+			storageFees.setCreateUserName(AuthUtil.getUserName());
 		} else {
 			List<Long> ids = cname.stream().map(StorageFees::getId).distinct().collect(Collectors.toList());
 			if (!cname.isEmpty() && !ids.contains(storageFees.getId())) {
@@ -93,6 +91,7 @@ public class StorageFeesServiceImpl extends ServiceImpl<StorageFeesMapper, Stora
 			}
 			storageFees.setUpdateUser(AuthUtil.getUserId());
 			storageFees.setUpdateTime(new Date());
+			storageFees.setUpdateUserName(AuthUtil.getUserName());
 		}
 		this.saveOrUpdate(storageFees);
 		//客户银行
@@ -103,9 +102,14 @@ public class StorageFeesServiceImpl extends ServiceImpl<StorageFeesMapper, Stora
 					item.setCreateTime(new Date());
 					item.setCreateUser(AuthUtil.getUserId());
 					item.setBranchId(branchId);
+					item.setBranchName(deptName);
+					item.setCreateUserName(AuthUtil.getUserName());
 				} else {
+					item.setBranchId(branchId);
+					item.setBranchName(deptName);
 					item.setUpdateUser(AuthUtil.getUserId());
 					item.setUpdateTime(new Date());
+					item.setUpdateUserName(AuthUtil.getUserName());
 				}
 			}
 			storageFeesItemsService.saveOrUpdateBatch(storageFees.getStorageFeesItemsList());

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

@@ -108,7 +108,7 @@ public class RouteCostController extends BladeController {
 				.apply(ObjectUtils.isNotNull(routeCost.getEffectiveEndDate()), "DATE_FORMAT(effective_end_date,'%Y-%m-%d') <= '" + formatter.format(routeCost.getEffectiveEndDate()) + "'");
 		}
 		if ("0".equals(routeCost.getSort())) {
-			lambdaQueryWrapper.orderByAsc(RouteCost::getTotalProfit);
+			lambdaQueryWrapper.orderByDesc(RouteCost::getTotalProfit);
 		} else if ("1".equals(routeCost.getSort())) {
 			lambdaQueryWrapper.orderByAsc(RouteCost::getPodCname);
 		} else if ("2".equals(routeCost.getSort())) {

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

@@ -179,7 +179,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		}
 		List<Bills> count = baseMapper.selectList(new LambdaQueryWrapper<Bills>()
 			.select(Bills::getId)
-			.eq(Bills::getCreateDept, branchId)
+			.eq(Bills::getBranchId, branchId)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getMblno, bills.getMblno())

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -838,7 +838,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 						}
 					} else {
 						finAccBills.setStlAmountDrUsd(finAccBills.getStlAmountDrUsd().add(item.getCurrentStlAmount()));
-						BigDecimal cny = currencyUtils.converter(item.getCurCode(), curExrateList, item.getCurrentStlAmount(), item.getCurrentStlCurCode(), "2");
+						BigDecimal cny = currencyUtils.converter(item.getDc(), curExrateList, item.getCurrentStlAmount(), item.getCurrentStlCurCode(), "2");
 						finAccBills.setStlAmountDrLoc(finAccBills.getStlAmountDrLoc().add(cny));
 						if (!ids.isEmpty()) {
 							finAccBills.setAppliedAmountStlUsd(finAccBills.getAppliedAmountStl().add(item.getCurrentStlAmount()));
@@ -862,7 +862,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 						}
 					} else {
 						finAccBills.setStlAmountCrUsd(finAccBills.getStlAmountCrUsd().add(item.getCurrentStlAmount()));
-						BigDecimal cny = currencyUtils.converter(item.getCurCode(), curExrateList, item.getCurrentStlAmount(), item.getCurrentStlCurCode(), "2");
+						BigDecimal cny = currencyUtils.converter(item.getDc(), curExrateList, item.getCurrentStlAmount(), item.getCurrentStlCurCode(), "2");
 						finAccBills.setStlAmountCrLoc(finAccBills.getStlAmountCrLoc().add(cny));
 						if (!ids.isEmpty()) {
 							finAccBills.setAppliedAmountStlUsd(finAccBills.getAppliedAmountStlUsd().add(item.getCurrentStlAmount()));
@@ -914,7 +914,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 						e.setStlBillId(detail.getId());
 						e.setStlBillNo(detail.getBillNo());
 						e.setStlDate(detail.getBillDate());
-						e.setStlOrgAmount(currencyUtils.converter(item.getCurCode(), curExrateList, item.getCurrentStlAmount(), e.getDc(), "2"));
+						e.setStlOrgAmount(currencyUtils.converter(e.getDc(), curExrateList, item.getCurrentStlAmount(), item.getCurCode(), "2"));
 						e.setStlCurCode(item.getCurrentStlCurCode());
 						e.setStlExrate(item.getExrate());
 						e.setStlExrateLoc(item.getCurrentStlExrate());
@@ -1140,7 +1140,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 						finAccBills.setStlAmountDrLoc(finAccBills.getStlAmountDrLoc().subtract(item.getCurrentStlAmount()));
 					} else {
 						finAccBills.setStlAmountDrUsd(finAccBills.getStlAmountDrUsd().subtract(item.getCurrentStlAmount()));
-						BigDecimal cny = currencyUtils.converter(item.getCurCode(), curExrateList, item.getCurrentStlAmount(), item.getDc(), "2");
+						BigDecimal cny = currencyUtils.converter(item.getDc(), curExrateList, item.getCurrentStlAmount(), item.getCurCode(), "2");
 						finAccBills.setStlAmountDrLoc(finAccBills.getStlAmountDrLoc().subtract(cny));
 					}
 					if (finAccBills.getAmountDr().compareTo(new BigDecimal("0.00")) == 0 &&
@@ -1170,7 +1170,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 						}
 					} else {
 						finAccBills.setStlAmountCrUsd(finAccBills.getStlAmountCrUsd().subtract(item.getCurrentStlAmount()));
-						BigDecimal cny = currencyUtils.converter(item.getCurCode(), curExrateList, item.getCurrentStlAmount(), item.getDc(), "2");
+						BigDecimal cny = currencyUtils.converter(item.getDc(), curExrateList, item.getCurrentStlAmount(), item.getCurCode(), "2");
 						finAccBills.setStlAmountCrLoc(finAccBills.getStlAmountCrLoc().subtract(cny));
 						if (!ids.isEmpty()) {
 							finAccBills.setAppliedAmountStlUsd(finAccBills.getAppliedAmountStlUsd().subtract(item.getCurrentStlAmount()));

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

@@ -517,10 +517,14 @@ public class UserController {
 			.eq(User::getTenantId, AuthUtil.getTenantId())
 			.like(ObjectUtil.isNotEmpty(userVO.getRealName()), User::getRealName, userVO.getRealName())
 			.eq(User::getIsDeleted, 0);
-		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
-			lambdaQueryWrapper.eq(User::getDeptId, AuthUtil.getDeptId());
-		} else {
-			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(userVO.getDeptId()), User::getDeptId, userVO.getDeptId());
+		if (ObjectUtils.isNotNull(userVO.getDeptId())){
+			lambdaQueryWrapper.eq(User::getDeptId, userVO.getDeptId());
+		}else{
+			if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+				lambdaQueryWrapper.eq(User::getDeptId, AuthUtil.getDeptId());
+			} else {
+				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(userVO.getDeptId()), User::getDeptId, userVO.getDeptId());
+			}
 		}
 		if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
 			R<Long> roleR = sysClient.getRoleByAlias(userVO.getRoleAlias());