From 4636b03d801662db1b8712d7a9ae9105462eca37 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 18 十一月 2025 09:53:26 +0800
Subject: [PATCH] 提交
---
tms/src/main/java/com/ruoyi/tms/service/impl/TmsQuoteDetailServiceImpl.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsQuoteDetailServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsQuoteDetailServiceImpl.java
index 5f5cc57..580ef51 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsQuoteDetailServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsQuoteDetailServiceImpl.java
@@ -126,17 +126,21 @@
.eq(TmsQuoteDetail::getQuotePlanId, quotePlanId)
.eq(TmsQuoteDetail::getVehicleType, tmsQuoteDetail.getVehicleType())
.eq(TmsQuoteDetail::getTransportRoute, tmsQuoteDetail.getTransportRoute())
+ .eq(TmsQuoteDetail::getPlanType, tmsQuotePlan.getPlanType())
+
);
if (l > 0){
throw new RuntimeException("鍚屼竴鎶ヤ环娓呭崟锛屼笉鑳芥坊鍔犵浉鍚屻�愯矾绾�-杞﹀瀷銆戞暟鎹�");
}
// 2銆佷笉鍚屾姤浠锋柟妗堬紝涓嶈兘娣诲姞鐩稿悓銆愬鎴�-璺嚎-杞﹀瀷銆戞暟鎹�
- int l1 = tmsQuoteDetailMapper.countSameCustomerRouteVehicle(new TmsQuoteDetail(){{
- setQuotePlanId(quotePlanId);
- setCustomerId(tmsQuotePlan.getCustomerId());
- setTransportRoute(tmsQuoteDetail.getTransportRoute());
- setVehicleType(tmsQuoteDetail.getVehicleType());
- }});
+ Long l1 = tmsQuoteDetailMapper.selectCount(new LambdaQueryWrapper<TmsQuoteDetail>()
+ .ne(TmsQuoteDetail::getQuotePlanId, quotePlanId)
+ .eq(TmsQuoteDetail::getCustomerId, tmsQuotePlan.getCustomerId())
+ .eq(TmsQuoteDetail::getTransportRoute, tmsQuoteDetail.getTransportRoute())
+ .eq(TmsQuoteDetail::getPlanType, tmsQuotePlan.getPlanType())
+ .eq(TmsQuoteDetail::getVehicleType, tmsQuoteDetail.getVehicleType())
+ );
+
if (l1 > 0){
throw new RuntimeException("涓嶅悓鎶ヤ环鏂规锛屼笉鑳芥坊鍔犵浉鍚屻�愬鎴�-璺嚎-杞﹀瀷銆戞暟鎹�");
@@ -148,6 +152,8 @@
tmsQuoteDetail.setSystemCode(noByKey);
tmsQuoteDetail.setCreateBy(SecurityUtils.getUsername());
tmsQuoteDetail.setCreateTime(DateUtils.getNowDate());
+ tmsQuoteDetail.setPlanType(tmsQuotePlan.getPlanType());
+ tmsQuoteDetail.setCustomerId(tmsQuotePlan.getCustomerId());
return tmsQuoteDetailMapper.insertTmsQuoteDetail(tmsQuoteDetail);
}
@@ -193,13 +199,14 @@
throw new RuntimeException("鍚屼竴鎶ヤ环娓呭崟锛屼笉鑳芥坊鍔犵浉鍚屻�愯矾绾�-杞﹀瀷銆戞暟鎹�");
}
// 2銆佷笉鍚屾姤浠锋柟妗堬紝涓嶈兘娣诲姞鐩稿悓銆愬鎴�-璺嚎-杞﹀瀷銆戞暟鎹�
- int l1 = tmsQuoteDetailMapper.countSameCustomerRouteVehicle(new TmsQuoteDetail(){{
- setQuotePlanId(quotePlanId);
- setCustomerId(tmsQuotePlan.getCustomerId());
- setTransportRoute(tmsQuoteDetail.getTransportRoute());
- setVehicleType(tmsQuoteDetail.getVehicleType());
- setId(tmsQuoteDetail.getId());
- }});
+ Long l1 = tmsQuoteDetailMapper.selectCount(new LambdaQueryWrapper<TmsQuoteDetail>()
+ .ne(TmsQuoteDetail::getQuotePlanId, quotePlanId)
+ .ne(TmsQuoteDetail::getId, tmsQuoteDetail.getId())
+ .eq(TmsQuoteDetail::getCustomerId, tmsQuotePlan.getCustomerId())
+ .eq(TmsQuoteDetail::getTransportRoute, tmsQuoteDetail.getTransportRoute())
+ .eq(TmsQuoteDetail::getPlanType, tmsQuotePlan.getPlanType())
+ .eq(TmsQuoteDetail::getVehicleType, tmsQuoteDetail.getVehicleType())
+ );
if (l1 > 0){
throw new RuntimeException("涓嶅悓鎶ヤ环鏂规锛屼笉鑳芥坊鍔犵浉鍚屻�愬鎴�-璺嚎-杞﹀瀷銆戞暟鎹�");
--
Gitblit v1.8.0