2022年10月17日17:51:35

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

@@ -45,6 +45,10 @@ public interface LandConst {
 
 	String MOLD_TZ = "特种运输";
 
+	String MOLD_MANAGER = "散货经理";
+
+	String DDZX_MANAGER = "调度中心经理";
+
 	/**
 	 * 权限标识
 	 */

blade-service/blade-land/src/main/java/org/springblade/land/controller/OrderIndexController.java

@@ -156,19 +156,23 @@ public class OrderIndexController extends BladeController {
 
 		table = new HashMap<>();
 		tableTemp = new ArrayList<>();
+
 		// 今日总量
 		long all = itemList.size();
 
 		// 获取角色
 		String userRole = AuthUtil.getUserRole();
-
 		long inactive = 0;
 		// 未运行
 		if (userRole.contains(LandConst.ROLE_CD)) {//车队
 			inactive = itemList.stream().filter(item -> item.getStatus() == 2).count();
-		}else if (userRole.contains(LandConst.ROLE_SJ)) {//司机
+		} else if (userRole.contains(LandConst.ROLE_SJ)) {//司机
 			inactive = itemList.stream().filter(item -> item.getStatus() == 3).count();
-		}else {
+		} else if (userRole.contains(LandConst.MOLD_MANAGER)) {//散货经理
+			if (mold == 1) {
+				inactive = 0;
+			}
+		} else {
 			inactive = itemList.stream().filter(item -> item.getStatus() == 0 || item.getStatus() == 1).count();
 		}
 
@@ -180,15 +184,21 @@ public class OrderIndexController extends BladeController {
 
 		long active = 0;
 		// 运行中
-		if (mold == 2){
+		if (mold == 2) {
 			if (userRole.contains(LandConst.ROLE_CD)) {//车队
 				active = itemList.stream().filter(item -> item.getStatus() == 3 || item.getStatus() == 4 || item.getStatus() == 6).count();
-			}else if (userRole.contains(LandConst.ROLE_SJ)) {//司机
+			} else if (userRole.contains(LandConst.ROLE_SJ)) {//司机
 				active = itemList.stream().filter(item -> item.getStatus() == 4 || item.getStatus() == 6).count();
-			}else {
+			} else {
 				active = itemList.stream().filter(item -> item.getStatus() != 0 && item.getStatus() != 1 && item.getStatus() != 5).count();
 			}
-		}else {
+		} else if (mold == 1) {
+			if (userRole.contains(LandConst.MOLD_MANAGER)) {//散货经理
+				active = 0;
+			} else {
+				active = itemList.stream().filter(item -> item.getStatus() != 0 && item.getStatus() != 1 && item.getStatus() != 4).count();
+			}
+		} else {
 			active = itemList.stream().filter(item -> item.getStatus() != 0 && item.getStatus() != 1 && item.getStatus() != 4).count();
 		}
 		mapTemp = new HashMap<>();
@@ -199,11 +209,16 @@ public class OrderIndexController extends BladeController {
 
 		long finish = 0;
 		// 已完成
-		if (mold == 2)
-		{
+		if (mold == 2) {
 			finish = itemList.stream().filter(item -> item.getStatus() == 5).count();
 
-		}else {
+		} else if (mold == 1) {
+			if (userRole.contains(LandConst.MOLD_MANAGER)) {//散货经理
+				finish = 0;
+			} else {
+				finish = itemList.stream().filter(item -> item.getStatus() == 4).count();
+			}
+		} else {
 			finish = itemList.stream().filter(item -> item.getStatus() == 4).count();
 		}
 		mapTemp = new HashMap<>();
@@ -211,8 +226,15 @@ public class OrderIndexController extends BladeController {
 		mapTemp.put("value", finish);
 		mapTemp.put("mold", mold);
 		tableTemp.add(mapTemp);
-
-		table.put("all", all);
+		if (mold == 1) {
+			if (userRole.contains(LandConst.MOLD_MANAGER)) {//散货经理
+				table.put("all", 0);
+			} else {
+				table.put("all", all);
+			}
+		} else {
+			table.put("all", all);
+		}
 		table.put("list", tableTemp);
 		data.put("flow", table);
 		return R.data(data);
@@ -225,6 +247,15 @@ public class OrderIndexController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "业务详情")
 	public R bizDetail(Integer mold, Integer status) {
+
+		if (mold == 1) {
+			if (AuthUtil.getUserRole().contains(LandConst.MOLD_MANAGER)) {//散货经理
+				List<OrderAcctVO> orderAcctVOS = new ArrayList<>();
+				return R.data(orderAcctVOS);
+			} else {
+				return R.data(orderService.getAcctNoPage(getAcctQuery(mold, status)));
+			}
+		}
 		return R.data(orderService.getAcctNoPage(getAcctQuery(mold, status)));
 	}
 
@@ -263,7 +294,7 @@ public class OrderIndexController extends BladeController {
 				//未派车2，未受理3，未完工4，已关闭5
 				acctVO.setUserRoleControl(LandConst.ROLE_CD);
 			}
-			if (userRole.contains(LandConst.ROLE_SJ)){//司机
+			if (userRole.contains(LandConst.ROLE_SJ)) {//司机
 				//未受理3，未完工4，已关闭5
 				acctVO.setUserRoleControl(LandConst.ROLE_SJ);
 			}

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

@@ -19,10 +19,12 @@ package org.springblade.land.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
+import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
 import org.springblade.client.constant.LandConstant;
 import org.springblade.client.entity.*;
 import org.springblade.client.feign.*;
@@ -42,6 +44,7 @@ import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
+import org.springblade.system.user.feign.IUserSearchClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -85,6 +88,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	private final IPortClient portClient;
 
+	private final IUserSearchClient userSearchClient;
+
 	@Override
 	public IPage<OrderVO> selectOrderPage(IPage<OrderVO> page, OrderVO order) {
 		return page.setRecords(baseMapper.selectOrderPage(page, order));
@@ -244,6 +249,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (order.getKind() == 2) {
 			orderQueryWrapper.ne(Order::getStatus, 0);
 		}
+		if (AuthUtil.getUserRole().contains(LandConst.DDZX_MANAGER)) {
+			R<List<User>> r = userSearchClient.listByRole("1572039278093946882");
+			if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
+				/*List<String> ids = new ArrayList<>();
+				r.getData().stream().forEach(item->{
+					ids.add(item.getId()+"");
+				});*/
+				List<Long> ids = r.getData().stream().map(User::getId).collect(Collectors.toList());
+				orderQueryWrapper.apply("find_in_set(dispatcher,'" + StringUtils.join(ids, ",") + "')");
+			}
+		}
 
 		IPage<Order> pages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
 		String corpIds = "";//客户
@@ -251,20 +267,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		String salesmanIds = "";//业务员
 		String dispatcherIds = "";//调度员
 		String dispatchDeptIds = "";//调度部门
-		for (Order orderOne : pages.getRecords()){
-			if (ObjectUtil.isNotEmpty(orderOne.getCorpId())){
+		for (Order orderOne : pages.getRecords()) {
+			if (ObjectUtil.isNotEmpty(orderOne.getCorpId())) {
 				corpIds = corpIds + orderOne.getCorpId() + ",";
 			}
-			if (ObjectUtil.isNotEmpty(orderOne.getCreateUser())){
+			if (ObjectUtil.isNotEmpty(orderOne.getCreateUser())) {
 				createUserIds = createUserIds + orderOne.getCreateUser() + ",";
 			}
-			if (ObjectUtil.isNotEmpty(orderOne.getSalesman())){
+			if (ObjectUtil.isNotEmpty(orderOne.getSalesman())) {
 				salesmanIds = salesmanIds + orderOne.getSalesman() + ",";
 			}
-			if (ObjectUtil.isNotEmpty(orderOne.getDispatcher())){
+			if (ObjectUtil.isNotEmpty(orderOne.getDispatcher())) {
 				dispatcherIds = dispatcherIds + orderOne.getDispatcher() + ",";
 			}
-			if (ObjectUtil.isNotEmpty(orderOne.getDispatchDept())){
+			if (ObjectUtil.isNotEmpty(orderOne.getDispatchDept())) {
 				dispatchDeptIds = dispatchDeptIds + orderOne.getDispatchDept() + ",";
 			}
 		}
@@ -275,24 +291,24 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		R<List<Dept>> dispatchDeptList = sysClient.selectByDeptIds(dispatchDeptIds);
 		pages.getRecords().forEach(record -> {
 			if (!ObjectUtil.isEmpty(record.getCorpId())) {
-				if (ObjectUtil.isNotEmpty(corpsList)){
+				if (ObjectUtil.isNotEmpty(corpsList)) {
 					record.setCorpName(corpsList.stream().filter(e -> e.getId().equals(record.getCorpId())).findFirst().get().getCname());
 					record.setCorpShortName(corpsList.stream().filter(e -> e.getId().equals(record.getCorpId())).findFirst().get().getShortName());
 				}
 			}
 
 			if (!ObjectUtil.isEmpty(record.getCreateUser())) {
-				if (ObjectUtil.isNotEmpty(createUserList)){
+				if (ObjectUtil.isNotEmpty(createUserList)) {
 					record.setCreateUserName(createUserList.stream().filter(e -> e.getId().equals(record.getCreateUser())).findFirst().get().getRealName());
 				}
 			}
 			if (!ObjectUtil.isEmpty(record.getSalesman())) {
-				if (ObjectUtil.isNotEmpty(salesmanList)){
+				if (ObjectUtil.isNotEmpty(salesmanList)) {
 					record.setSalesmanName(salesmanList.stream().filter(e -> e.getId().equals(record.getSalesman())).findFirst().get().getRealName());
 				}
 			}
 			if (!ObjectUtil.isEmpty(record.getDispatcher())) {
-				if (ObjectUtil.isNotEmpty(dispatcherList)){
+				if (ObjectUtil.isNotEmpty(dispatcherList)) {
 					record.setDispatcherName(dispatcherList.stream().filter(e -> e.getId().equals(record.getDispatcher())).findFirst().get().getRealName());
 				}
 			}
@@ -517,16 +533,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		orderQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId())
 			.eq(Order::getShippingMode, "散货")
 			.eq(Order::getIsDeleted, 0)
-			.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), Order::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime());;
+			.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), Order::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime());
+		;
 
 		String userRole = AuthUtil.getUserRole();
 		if (userRole.contains(LandConst.ROLE_CD)) {//车队
 			//未派车2，未受理3，未完工4，已关闭5
-			orderQueryWrapper.in(Order::getStatus,2,3,4,5,6);
+			orderQueryWrapper.in(Order::getStatus, 2, 3, 4, 5, 6);
 		}
-		if (userRole.contains(LandConst.ROLE_SJ)){//司机
+		if (userRole.contains(LandConst.ROLE_SJ)) {//司机
 			//未受理3，未完工4，已关闭5
-			orderQueryWrapper.in(Order::getStatus,3,4,5,6);
+			orderQueryWrapper.in(Order::getStatus, 3, 4, 5, 6);
 		}
 
 		orderIdList = baseMapper.selectList(orderQueryWrapper);
@@ -564,7 +581,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			order.setCreateTime(new Date());
 			baseMapper.insert(order);
 		} else {
-			if (order.getShippingMode().equals("散货")){
+			if (order.getShippingMode().equals("散货")) {
 				LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 				lambdaQueryWrapper.eq(Order::getId, order.getId());
 				lambdaQueryWrapper.eq(Order::getShippingMode, "散货");
@@ -632,7 +649,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				.eq(OrderItem::getShippingMode, "散货");
 			OrderItem orderItem = orderItemMapper.selectOne(queryWrapper);
 			OrderItem item = new OrderItem();
-			if (ObjectUtil.isEmpty(orderItem)){
+			if (ObjectUtil.isEmpty(orderItem)) {
 				item.setOrderId(order.getId());
 				item.setShippingMode("散货");
 				item.setKind(2);
@@ -648,7 +665,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				item.setLandAmountD(order.getFreightCollect());
 				item.setLandAmountC(order.getFreightPay());
 				orderItemMapper.insert(item);
-			}else {
+			} else {
 				orderItem.setTenantId(AuthUtil.getTenantId());
 				orderItem.setUpdateUser(AuthUtil.getUserId());
 				orderItem.setUpdateTime(new Date());
@@ -672,17 +689,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 		order.setFreight(freight);
 		if (addressDetail.length() > 0) {//货运地址
-			if(order.getShippingMode().equals("散货")){
+			if (order.getShippingMode().equals("散货")) {
 				order.setArrivalTime(order.getLoadingAddressList().get(0).getFreightTime());
 			}
 			order.setAddressDetail(addressDetail.deleteCharAt(addressDetail.lastIndexOf("\n")).toString());
-		}else {
+		} else {
 			order.setAddressDetail("");
 		}
 
-		if (unloadingPlace.length() > 0){//卸货地址
+		if (unloadingPlace.length() > 0) {//卸货地址
 			order.setUnloadingPlace(unloadingPlace.deleteCharAt(unloadingPlace.lastIndexOf("\n")).toString());
-		}else {
+		} else {
 			order.setUnloadingPlace("");
 		}
 
@@ -722,21 +739,26 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.like(StringUtil.isNotBlank(order.getContractNo()), Order::getContractNo, order.getContractNo())//合同号
 			.like(StringUtil.isNotBlank(order.getDispatchNumber()), Order::getDispatchNumber, order.getDispatchNumber())//派车单号
 			.like(StringUtil.isNotBlank(order.getAddressDetail()), Order::getAddressDetail, order.getAddressDetail())//装货地址
-			.like(StringUtil.isNotBlank(order.getUnloadingPlace()),Order::getUnloadingPlace, order.getUnloadingPlace())//卸货地址
+			.like(StringUtil.isNotBlank(order.getUnloadingPlace()), Order::getUnloadingPlace, order.getUnloadingPlace())//卸货地址
 			.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), Order::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime())//货运日期
-			.between(StringUtil.isNotBlank(order.getBeginCrateTime()) && StringUtil.isNotBlank(order.getEndCrateTime()), Order::getCreateTime, order.getBeginCrateTime(), order.getEndCrateTime())//制单日期
-			.orderByDesc(Order::getArrivalTime);
+			.between(StringUtil.isNotBlank(order.getBeginCrateTime()) && StringUtil.isNotBlank(order.getEndCrateTime()), Order::getCreateTime, order.getBeginCrateTime(), order.getEndCrateTime());//制单日期
+
+		if (AuthUtil.getUserRole().equals(LandConst.MOLD_MANAGER)) {
+			orderQueryWrapper.eq(Order::getCorpId, 1508356683997454337l);
+		}
+
+		orderQueryWrapper.orderByDesc(Order::getArrivalTime);
 
 		// 获取角色 设置权限
 		String userRole = AuthUtil.getUserRole();
 		Long userId = AuthUtil.getUserId();
 		if (userRole.contains(LandConst.ROLE_CD)) {//车队
 			//未派车2，未受理3，未完工4，已关闭5
-			orderQueryWrapper.in(Order::getStatus,2,3,4,5,6);
+			orderQueryWrapper.in(Order::getStatus, 2, 3, 4, 5, 6);
 		}
-		if (userRole.contains(LandConst.ROLE_SJ)){//司机
+		if (userRole.contains(LandConst.ROLE_SJ)) {//司机
 			//未受理3，未完工4，已关闭5
-			orderQueryWrapper.in(Order::getStatus,3,4,5,6);
+			orderQueryWrapper.in(Order::getStatus, 3, 4, 5, 6);
 		}
 
 		orderQueryWrapper.in(StringUtil.isNotBlank(order.getStatusIds()), Order::getStatus, Func.toIntList(order.getStatusIds()));
@@ -751,26 +773,26 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		String fleetIds = "";//车队
 		String driverIds = "";//司机
 
-		for (Order orders : pages.getRecords()){
-			if (ObjectUtil.isNotEmpty(orders.getCorpId())){
+		for (Order orders : pages.getRecords()) {
+			if (ObjectUtil.isNotEmpty(orders.getCorpId())) {
 				corpIds = corpIds + orders.getCorpId() + ",";
 			}
-			if (ObjectUtil.isNotEmpty(orders.getCreateUser())){
+			if (ObjectUtil.isNotEmpty(orders.getCreateUser())) {
 				createUserIds = createUserIds + orders.getCreateUser() + ",";
 			}
-			if (ObjectUtil.isNotEmpty(orders.getSalesman())){
+			if (ObjectUtil.isNotEmpty(orders.getSalesman())) {
 				salesmanIds = salesmanIds + orders.getSalesman() + ",";
 			}
-			if (ObjectUtil.isNotEmpty(orders.getDispatcher())){
+			if (ObjectUtil.isNotEmpty(orders.getDispatcher())) {
 				dispatcherIds = dispatcherIds + orders.getDispatcher() + ",";
 			}
-			if (ObjectUtil.isNotEmpty(orders.getDispatchDept())){
+			if (ObjectUtil.isNotEmpty(orders.getDispatchDept())) {
 				dispatchDeptIds = dispatchDeptIds + orders.getDispatchDept() + ",";
 			}
-			if (ObjectUtil.isNotEmpty(orders.getFleetId())){
+			if (ObjectUtil.isNotEmpty(orders.getFleetId())) {
 				fleetIds = fleetIds + orders.getFleetId() + ",";
 			}
-			if (ObjectUtil.isNotEmpty(orders.getDriverId())){
+			if (ObjectUtil.isNotEmpty(orders.getDriverId())) {
 				driverIds = driverIds + orders.getDriverId() + ",";
 			}
 		}
@@ -785,7 +807,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 		pages.getRecords().forEach(record -> {
 			//杂费客户
-			if (!ObjectUtil.isEmpty(record.getId())){
+			if (!ObjectUtil.isEmpty(record.getId())) {
 				LambdaQueryWrapper<OrderFee> feeLambdaQueryWrapper = new LambdaQueryWrapper<>();
 				feeLambdaQueryWrapper.eq(OrderFee::getOrderId, record.getId())
 					.eq(OrderFee::getIsDeleted, 0)
@@ -793,18 +815,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				List<OrderFee> feeList = orderFeeMapper.selectList(feeLambdaQueryWrapper);
 
 				String feeCorpIds = "";
-				for (OrderFee orderFee : feeList){
-					if (ObjectUtil.isNotEmpty(orderFee.getCorpId())){
+				for (OrderFee orderFee : feeList) {
+					if (ObjectUtil.isNotEmpty(orderFee.getCorpId())) {
 						feeCorpIds = feeCorpIds + orderFee.getCorpId() + ",";
 					}
 				}
 
 				List<CorpsDesc> feeCorpList = corpsDescClient.selectByCorpIds(feeCorpIds);
 
-				if (!ObjectUtil.isEmpty(feeList)){
+				if (!ObjectUtil.isEmpty(feeList)) {
 					feeList.forEach(list -> {
 						if (list.getCorpId() != null) {
-							if (ObjectUtil.isNotEmpty(feeCorpList)){
+							if (ObjectUtil.isNotEmpty(feeCorpList)) {
 								list.setCorpName(feeCorpList.stream().filter(e -> e.getId().equals(list.getCorpId())).findFirst().get().getCname());
 							}
 						}
@@ -822,19 +844,19 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 			//创建人
 			if (!ObjectUtil.isEmpty(record.getCreateUser())) {
-				if (ObjectUtil.isNotEmpty(createUserList)){
+				if (ObjectUtil.isNotEmpty(createUserList)) {
 					record.setCreateUserName(createUserList.stream().filter(e -> e.getId().equals(record.getCreateUser())).findFirst().get().getRealName());
 				}
 			}
 			//业务员
 			if (!ObjectUtil.isEmpty(record.getSalesman())) {
-				if (ObjectUtil.isNotEmpty(salesmanList)){
+				if (ObjectUtil.isNotEmpty(salesmanList)) {
 					record.setSalesmanName(salesmanList.stream().filter(e -> e.getId().equals(record.getSalesman())).findFirst().get().getRealName());
 				}
 			}
 			//调度员
 			if (!ObjectUtil.isEmpty(record.getDispatcher())) {
-				if (ObjectUtil.isNotEmpty(dispatcherList)){
+				if (ObjectUtil.isNotEmpty(dispatcherList)) {
 					record.setDispatcherName(dispatcherList.stream().filter(e -> e.getId().equals(record.getDispatcher())).findFirst().get().getRealName());
 				}
 			}
@@ -852,7 +874,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			}
 			//司机
-			if (!ObjectUtil.isEmpty(record.getDriverId())){
+			if (!ObjectUtil.isEmpty(record.getDriverId())) {
 				if (ObjectUtil.isNotEmpty(driverList)) {
 					record.setDriverName(driverList.stream().filter(e -> e.getId().equals(record.getDriverId())).findFirst().get().getName());
 				}
@@ -865,10 +887,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				.eq(OrderAddress::getOrderId, record.getId());
 			List<OrderAddress> orderList = orderAddressMapper.selectList(orderLambdaQueryWrapper);
 			record.setVolumeSum(0.0);
-			if (!ObjectUtil.isEmpty(orderList)){
+			if (!ObjectUtil.isEmpty(orderList)) {
 				orderList.forEach(list -> {
-					if (ObjectUtil.isNotEmpty(list.getVolume())){
-						record.setVolumeSum(record.getVolumeSum()+list.getVolume());
+					if (ObjectUtil.isNotEmpty(list.getVolume())) {
+						record.setVolumeSum(record.getVolumeSum() + list.getVolume());
 					}
 				});
 			}
@@ -1013,13 +1035,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (ObjectUtil.isNotEmpty(id)) {
 			order.setId(id);
 			order.setStatus(status);
-			if (status == 4){
+			if (status == 4) {
 				order.setReachTime(new Date());
-			}else if (status == 0){
+			} else if (status == 0) {
 				order.setReachTime(null);
 			}
 			baseMapper.updateById(order);
-		}else {
+		} else {
 			throw new SecurityException("发送失败 请联系管理员！");
 		}
 		return order.getId();
@@ -1285,9 +1307,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			LambdaQueryWrapper<OrderFee> orderFeeLambda = new LambdaQueryWrapper<>();
 			orderFeeLambda.eq(OrderFee::getIsDeleted, 0);
 
-			if (!ObjectUtil.isEmpty(acct.getShippingMode()) && acct.getShippingMode().equals("散货")){
+			if (!ObjectUtil.isEmpty(acct.getShippingMode()) && acct.getShippingMode().equals("散货")) {
 				orderFeeLambda.eq(OrderFee::getOrderId, acct.getOrderId());
-			}else {
+			} else {
 				orderFeeLambda.eq(OrderFee::getItemId, acct.getItemId());
 			}
 			List<OrderFee> feeList = orderFeeMapper.selectList(orderFeeLambda);
@@ -1394,10 +1416,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					i++;
 				}
 			}
-		}else if (order.getShippingMode().equals("散货")){
+		} else if (order.getShippingMode().equals("散货")) {
 			//装货
 			int sort = 1;
-			for (OrderAddress address : order.getLoadingAddressList()){
+			for (OrderAddress address : order.getLoadingAddressList()) {
 				if (ObjectUtil.isEmpty(address.getId())) {
 					address.setOrderId(order.getId());
 					address.setTenantId(AuthUtil.getTenantId());
@@ -1440,7 +1462,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			sort = 1;
 
 			//卸货
-			for (OrderAddress unloadedAddress : order.getUnloadedAddressList()){
+			for (OrderAddress unloadedAddress : order.getUnloadedAddressList()) {
 				if (ObjectUtil.isEmpty(unloadedAddress.getId())) {
 					unloadedAddress.setOrderId(order.getId());
 					unloadedAddress.setTenantId(AuthUtil.getTenantId());
@@ -1482,7 +1504,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 
 		List<CommonFile> fileList = order.getFileList();
-		if (ObjectUtil.isNotEmpty(fileList)){
+		if (ObjectUtil.isNotEmpty(fileList)) {
 			fileList.forEach(file -> {
 				if (ObjectUtil.isEmpty(file.getId())) {
 					file.setPid(order.getId());

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.xml

@@ -404,8 +404,6 @@
         WHERE
         boi.is_deleted = 0
         AND bo.is_deleted = 0
-        and bo.status = 5
-        and bo.bill_type = 'RK'
         and bo.trade_type = 'JTMC'
         <if test="Order.sysNo!=null and Order.sysNo != ''">
             and bo.sys_no=#{Order.sysNo}
@@ -482,7 +480,6 @@
         JOIN business_order bo ON boi.pid = bo.id
         where boi.is_deleted = 0
           AND bo.is_deleted = 0
-          AND bo.status = 5
           AND bo.bill_type = 'RK'
           AND bo.trade_type = 'JTMC'
           and boi.is_Issue = '3'

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -2144,6 +2144,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq("tenant_id", AuthUtil.getTenantId())
 			.eq(ObjectUtils.isNotNull(order.getBillType()), "bill_type", order.getBillType())
 			.eq("trade_type", OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType())
+			.eq(ObjectUtils.isNotNull(order.getCaseNo()),"case_no", order.getCaseNo())
 			.eq(ObjectUtils.isNotNull(order.getBusinessType()), "business_type", order.getBusinessType());
 		if (ObjectUtils.isNotNull(order.getPurchaser())) {
 			//货权人