金蝶修改

blade-service-api/blade-land-api/src/main/java/org/springblade/land/constant/LandConst.java

@@ -31,6 +31,8 @@ public interface LandConst {
 
 	String ROLE_CD = "车队";
 
+	String ROLE_SJ = "司机";
+
 	String POST_ZJL = "总经理";
 
 	String POST_JL = "业务经理";

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -375,6 +375,9 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 			//=============生成凭证所需信息==============
 			String accountName = select.getBelongCompany();
+			if (!"青岛通用沃德轮胎有限公司".equals(accountName)) {
+				accountName="青岛达沃特轮胎有限公司";
+			}
 			JdTenant jdTenant = getJdTenant(accountName);
 			if(jdTenant != null) {
 				try {

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -31,6 +31,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
+import org.springblade.land.constant.LandConst;
 import org.springblade.land.entity.*;
 import org.springblade.land.mapper.*;
 import org.springblade.land.service.IOrderService;
@@ -488,6 +489,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq(Order::getShippingMode, "散货")
 			.eq(Order::getIsDeleted, 0);
 
+		String userRole = AuthUtil.getUserRole();
+		if (userRole.contains(LandConst.ROLE_CD)) {//车队
+			//未派车2，未受理3，未完工4，已关闭5
+			orderQueryWrapper.in(Order::getStatus,2,3,4,5);
+		}
+		if (userRole.contains(LandConst.ROLE_SJ)){
+			//未受理3，未完工4，已关闭5
+			orderQueryWrapper.in(Order::getStatus,3,4,5);
+		}
+
 		orderIdList = baseMapper.selectList(orderQueryWrapper);
 		if (CollectionUtil.isNotEmpty(orderIdList)) {
 			all = orderIdList.size();
@@ -495,12 +506,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			zero = orderIdList.stream().filter(item -> item.getStatus() == 1).count();
 			one = orderIdList.stream().filter(item -> item.getStatus() == 2).count();
 			two = orderIdList.stream().filter(item -> item.getStatus() == 3).count();
-			//three = orderIdList.stream().filter(item -> item.getStatus() == 4).count();
-			four = orderIdList.stream().filter(item -> item.getStatus() == 5).count();
 			three = orderIdList.stream().filter(item -> item.getStatus() != 0
 				&& item.getStatus() != 1 && item.getStatus() != 2
 				&& item.getStatus() != 3 && item.getStatus() != 5).count();
-
+			four = orderIdList.stream().filter(item -> item.getStatus() == 5).count();
 		}
 
 		Map<String, Object> data = new HashMap<>();
@@ -659,7 +668,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq(ObjectUtil.isNotEmpty(order.getSalesman()), Order::getSalesman, order.getSalesman())
 			.eq(ObjectUtil.isNotEmpty(order.getDispatchDept()), Order::getDispatchDept, order.getDispatchDept())
 			.eq(StringUtil.isNotBlank(order.getShippingMode()), Order::getShippingMode, order.getShippingMode())
-			.in(StringUtil.isNotBlank(order.getStatusIds()), Order::getStatus, Func.toIntList(order.getStatusIds()))
 			.eq(ObjectUtil.isNotEmpty(order.getCorpId()), Order::getCorpId, order.getCorpId())
 			.eq(ObjectUtil.isNotEmpty(order.getFleetId()), Order::getFleetId, order.getFleetId())
 			.eq(ObjectUtil.isNotEmpty(order.getPlateNo()), Order::getPlateNo, order.getPlateNo())
@@ -673,6 +681,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.between(StringUtil.isNotBlank(order.getBeginCrateTime()) && StringUtil.isNotBlank(order.getEndCrateTime()), Order::getCreateTime, order.getBeginCrateTime(), order.getEndCrateTime())
 			.orderByDesc(Order::getArrivalTime);
 
+		System.out.println("角色-=========================="+AuthUtil.getUserRole());
+		// 获取角色
+		String userRole = AuthUtil.getUserRole();
+		if (userRole.contains(LandConst.ROLE_CD)) {//车队
+			//未派车2，未受理3，未完工4，已关闭5
+			orderQueryWrapper.in(Order::getStatus,2,3,4,5);
+		}
+		if (userRole.contains(LandConst.ROLE_SJ)){
+			//未受理3，未完工4，已关闭5
+			orderQueryWrapper.in(Order::getStatus,3,4,5);
+		}
+
+		orderQueryWrapper.in(StringUtil.isNotBlank(order.getStatusIds()), Order::getStatus, Func.toIntList(order.getStatusIds()));
+
 		IPage<Order> pages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
 		pages.getRecords().forEach(record -> {
 

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -258,6 +258,9 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 						throw new SecurityException("原始单据不存在 或者 已被删除");
 					} else {
 						String accountName = settlement.getBelongCompany();
+						if (!"青岛通用沃德轮胎有限公司".equals(accountName)) {
+							accountName="青岛达沃特轮胎有限公司";
+						}
 						LambdaQueryWrapper<JdTenant> jdTenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
 						jdTenantLambdaQueryWrapper
 							.eq(JdTenant::getIsEnable, 1)