202303225 12:25

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxController.java

@@ -172,11 +172,15 @@ public class TradingBoxController extends BladeController {
 						TransportItem transportItem = new TransportItem();
 						transportItem.setId(tradingBoxItem.getSrcId());
 						transportItem.setStockpilingStatus("1");
+						transportItem.setStackingStatus("未堆存");
+						transportItem.setStackingDate(null);
 						transportItemService.updateById(transportItem);
 					}else{
 						TradingBoxItem old = new TradingBoxItem();
 						old.setId(tradingBoxItem.getSrcId());
 						old.setStockpilingStatus("1");
+						old.setStackingStatus("未堆存");
+						old.setStackingDate(null);
 						tradingBoxItemService.updateById(old);
 					}
 					tradingBoxItemService.updateById(tradingBoxItem);

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransferServiceImpl.java

@@ -133,6 +133,9 @@ public class TransferServiceImpl implements ITransferService {
 			}
 			for (TradingBoxItem tradingBoxItem : tradingBoxItemList) {
 				if (ObjectUtils.isNotNull(tradingBox.getSource())) {
+					if ("已堆存".equals(tradingBoxItem.getStackingStatus())){
+						throw new SecurityException("明细已堆存请勿重复堆存");
+					}
 					if ("JKFC".equals(tradingBox.getSource()) || "CKZY".equals(tradingBox.getSource())) {
 						TransportItem transportItem = new TransportItem();
 						transportItem.setId(tradingBoxItem.getId());

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -367,6 +367,9 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 				if (transport.getExpiryDate().compareTo(newDate) < 0) {
 					//计算超期金额 并增加一条费用明细
 					BigDecimal amount = new BigDecimal("0.00");
+					if (ObjectUtils.isEmpty(transportItem.getPrice()) || transportItem.getPrice().compareTo(BigDecimal.ZERO) <= 0){
+						throw new SecurityException("请维护超期单价/天 和 租金收入");
+					}
 					if (!transportItem.getPrice().equals(new BigDecimal("0"))) {
 						amount = transportItem.getPrice().multiply(new BigDecimal(days), MathContext.DECIMAL32).setScale(2, BigDecimal.ROUND_HALF_UP);
 					}

blade-service/blade-client/src/main/java/org/springblade/client/vehicle/controller/VehicleModelController.java

@@ -197,23 +197,13 @@ public class VehicleModelController extends BladeController {
 		lambdaQueryWrapper.eq(VehicleModel::getIsDeleted, 0)
 			.eq(VehicleModel::getBrandId, vehicleModel.getBrandId())
 			.eq(VehicleModel::getSeriesId, vehicleModel.getSeriesId())
-			.eq(ObjectUtil.isNotEmpty(vehicleModel.getEngine()), VehicleModel::getEngine, vehicleModel.getEngine())
 			.eq(ObjectUtil.isNotEmpty(vehicleModel.getModelYear()), VehicleModel::getModelYear, vehicleModel.getModelYear());
 		List<VehicleModel> list = vehicleModelService.list(lambdaQueryWrapper);
 
 		List<VehicleModel> modelList = new ArrayList<>();
-		//发动机排量为空
-		if (ObjectUtil.isEmpty(vehicleModel.getEngine())){
-			//根据发动机排量去重
-			if (ObjectUtil.isNotEmpty(list)){
-				modelList = list.stream().collect(Collectors.collectingAndThen(
-					Collectors.toCollection(() -> new TreeSet<>(
-						Comparator.comparing(VehicleModel::getEngine))), ArrayList::new));
-			}
-			return R.data(modelList);
-		}
-		//发动机排量不为空，年款为空
-		if (ObjectUtil.isNotEmpty(vehicleModel.getEngine()) && ObjectUtil.isEmpty(vehicleModel.getModelYear())){
+
+		//年款为空
+		if (ObjectUtil.isEmpty(vehicleModel.getModelYear())){
 			//根据年款去重
 			if (ObjectUtil.isNotEmpty(list)){
 				modelList = list.stream().collect(Collectors.collectingAndThen(

blade-service/blade-client/src/main/java/org/springblade/client/vehicle/service/impl/VehicleModelServiceImpl.java

@@ -77,9 +77,6 @@ public class VehicleModelServiceImpl extends ServiceImpl<VehicleModelMapper, Veh
 			if (ObjectUtil.isEmpty(modelExcel.getModelYear())){
 				throw new SecurityException("第"+(i+2)+"行,年款为空");
 			}
-			if (ObjectUtil.isEmpty(modelExcel.getEngine())){
-				throw new SecurityException("第"+(i+2)+"行,发动机为空");
-			}
 			if (ObjectUtil.isEmpty(modelExcel.getFrontTireSpecification())){
 				throw new SecurityException("第"+(i+2)+"行,前轮胎规格为空");
 			}

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

@@ -993,13 +993,13 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				tradingBoxFeesR.getData().setReconciliationAmount(tradingBoxFeesR.getData().getReconciliationAmount() != null ? tradingBoxFeesR.getData().getReconciliationAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
 				accMapper.updateById(acc);
 				BeanUtils.copyProperties(tradingBoxFeesR.getData(), tradingBoxFees);
-				tradingBoxFees.setReconciliationDate(new Date());
+				tradingBoxFees.setReconciliationDate(settlementDTO.getSettlementDate());
 			}else {
 				acc.setSettlementAmount(acc.getSettlementAmount() != null ? acc.getSettlementAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
 				tradingBoxFeesR.getData().setSettlementAmount(tradingBoxFeesR.getData().getSettlementAmount() != null ? tradingBoxFeesR.getData().getSettlementAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
 				accMapper.updateById(acc);
 				BeanUtils.copyProperties(tradingBoxFeesR.getData(), tradingBoxFees);
-				tradingBoxFees.setSettlementDate(new Date());
+				tradingBoxFees.setSettlementDate(settlementDTO.getSettlementDate());
 			}
 			tradingBoxClient.updateTradingBoxFees(tradingBoxFees);
 		} else if (type == 6) {
@@ -1016,12 +1016,12 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				acc.setCheckAmount(acc.getCheckAmount() != null ? acc.getCheckAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
 				transportItemFeesR.getData().setReconciliationAmount(transportItemFeesR.getData().getReconciliationAmount() != null ? transportItemFeesR.getData().getReconciliationAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
 				accMapper.updateById(acc);
-				transportItemFeesR.getData().setReconciliationDate(new Date());
+				transportItemFeesR.getData().setReconciliationDate(settlementDTO.getSettlementDate());
 			}else {
 				acc.setSettlementAmount(acc.getSettlementAmount() != null ? acc.getSettlementAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
 				transportItemFeesR.getData().setSettlementAmount(transportItemFeesR.getData().getSettlementAmount() != null ? transportItemFeesR.getData().getSettlementAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
 				accMapper.updateById(acc);
-				transportItemFeesR.getData().setSettlementDate(new Date());
+				transportItemFeesR.getData().setSettlementDate(settlementDTO.getSettlementDate());
 			}
 			transportClient.updateTransportItemFees(transportItemFeesR.getData());
 		} else if (type == 7) {