变更

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

@@ -132,30 +132,28 @@ public class LandVehicleController extends BladeController {
 	@ApiOperation(value = "车辆", notes = "传入landVehicle")
 	public R<List<LandVehicle>> vehicleList(LandVehicle landVehicle) {
 		List<LandVehicle> vehicleList = null;
-		if (ObjectUtil.isNotEmpty(landVehicle.getFleetId())){
-			landVehicle.setTenantId(AuthUtil.getTenantId());
-			landVehicle.setIsDeleted(0);
-			vehicleList = landVehicleService.list(new LambdaQueryWrapper<LandVehicle>()
-				.like(StringUtil.isNotBlank(landVehicle.getPlateNo()), LandVehicle::getPlateNo, landVehicle.getPlateNo())
-				.eq(ObjectUtil.isNotEmpty(landVehicle.getFleetId()), LandVehicle::getFleetId, landVehicle.getFleetId())
-				.eq(LandVehicle::getTenantId, AuthUtil.getTenantId())
-				.eq(LandVehicle::getIsDeleted, 0)
-			);
-			vehicleList.forEach(vehicle -> {
-				if (ObjectUtil.isNotEmpty(vehicle.getFleetId())) {
-					CorpsDesc fleet = corpsDescService.getById(vehicle.getFleetId());
-					vehicle.setFleetName(fleet.getCname());
-				}
+		landVehicle.setTenantId(AuthUtil.getTenantId());
+		landVehicle.setIsDeleted(0);
+		vehicleList = landVehicleService.list(new LambdaQueryWrapper<LandVehicle>()
+			.like(StringUtil.isNotBlank(landVehicle.getPlateNo()), LandVehicle::getPlateNo, landVehicle.getPlateNo())
+			.eq(ObjectUtil.isNotEmpty(landVehicle.getFleetId()), LandVehicle::getFleetId, landVehicle.getFleetId())
+			.eq(LandVehicle::getTenantId, AuthUtil.getTenantId())
+			.eq(LandVehicle::getIsDeleted, 0)
+		);
+		vehicleList.forEach(vehicle -> {
+			if (ObjectUtil.isNotEmpty(vehicle.getFleetId())) {
+				CorpsDesc fleet = corpsDescService.getById(vehicle.getFleetId());
+				vehicle.setFleetName(fleet.getCname());
+			}
 
-				if (ObjectUtil.isNotEmpty(vehicle.getDriverId())) {
-					LandDriver driver = landDriverService.getById(vehicle.getDriverId());
-					if (driver != null) {
-						vehicle.setDriverName(driver.getName());
-						vehicle.setTel(driver.getTel());
-					}
+			if (ObjectUtil.isNotEmpty(vehicle.getDriverId())) {
+				LandDriver driver = landDriverService.getById(vehicle.getDriverId());
+				if (driver != null) {
+					vehicle.setDriverName(driver.getName());
+					vehicle.setTel(driver.getTel());
 				}
-			});
-		}
+			}
+		});
 		return R.data(vehicleList);
 	}
 
@@ -163,7 +161,7 @@ public class LandVehicleController extends BladeController {
 	 * 派车根据车号检索
 	 */
 	@GetMapping("/driver-list")
-	@ApiOperation(value = "车辆", notes = "传入landVehicle")
+	@ApiOperation(value = "司机", notes = "传入landVehicle")
 	public R<List<LandVehicle>> plateNoVehicleList(String plateNo) {
 		LandVehicle landVehicle = new LandVehicle();
 		List<LandVehicle> vehicleList = null;

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

@@ -446,7 +446,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
 		orderQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId())
 			.eq(Order::getIsDeleted, 0)
-			.ne(Order::getShippingMode, "散货");
+			.ne(Order::getShippingMode, "散货")
+			.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), Order::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime());
 
 		if (order.getKind() == 1) {
 			orderIdList = baseMapper.selectList(orderQueryWrapper).stream().filter(orderTemp -> orderTemp.getStatus() == 0).map(Order::getId).collect(Collectors.toList());
@@ -503,7 +504,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
 		orderQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId())
 			.eq(Order::getShippingMode, "散货")
-			.eq(Order::getIsDeleted, 0);
+			.eq(Order::getIsDeleted, 0)
+			.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)) {//车队

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

@@ -105,7 +105,7 @@ public class UserController {
 
 	@GetMapping("/userList")
 	public R userList(UserVO userVO) {
-		if (AuthUtil.getTenantId().equals("234557") && !StringUtil.isNotBlank(userVO.getDeptPid())){
+		if (AuthUtil.getTenantId().equals("234557") && !StringUtil.isNotBlank(userVO.getDeptPid()) && !"业务员".equals(userVO.getRoleAlias())){
 			return R.data(new ArrayList<>());
 		}
 		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();

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

@@ -2,6 +2,7 @@ package com.trade.purchase.order.component.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.trade.purchase.order.assemble.mapstruct.OrderItemMapstructMapper;
 import com.trade.purchase.order.component.IOrderCodeMaker;
@@ -27,6 +28,7 @@ import org.springblade.system.feign.IDictBizClient;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -123,6 +125,8 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 		if (Func.isEmpty(order.getBusinesDate())) {
 			order.setBusinesDate(new Date());
 		}
+		order.setSalesPrice(ObjectUtils.isNull(order.getSalesPrice()) ? new BigDecimal(0) : order.getSalesPrice());
+		order.setContractWeight(ObjectUtils.isNull(order.getContractWeight()) ? new BigDecimal(0) : order.getContractWeight());
 		//新增采购订单
 		if (Objects.isNull(order.getId()))
 		{
@@ -149,7 +153,7 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 				order.setOrgOrderNo(order.getOrderNo());
 			}
 			if ("橡胶".equals(order.getOrderType())){
-				order.setOrderAmount(order.getSalesPrice().multiply(order.getCartonWeight()));
+				order.setOrderAmount(order.getSalesPrice().multiply(order.getContractWeight()));
 			}
 			//订单编号转大写
 			//order.setOrderNo(order.getOrderNo().toUpperCase());
@@ -160,7 +164,7 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 			orderService.insert(order);
 		} else {
 			if ("橡胶".equals(order.getOrderType())){
-				order.setOrderAmount(order.getSalesPrice().multiply(order.getCartonWeight()));
+				order.setOrderAmount(order.getSalesPrice().multiply(order.getContractWeight()));
 			}
 			//防止有人改成小写的字母
 			//order.setOrderNo(order.getOrderNo().toUpperCase());