From 0cc6beb6f4d7cee0bd5c4ea95d93173a44817af4 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 18 十月 2024 17:29:36 +0800
Subject: [PATCH] 增加无对应项目判断
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index 98084ad..dfd263b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -287,6 +287,10 @@
int pdsfczhbxm = tjSamplingService.pdsfczhbxm(ids);
if (pdsfczhbxm == ids.size()) return AjaxResult.error("澶氫釜鍚堝苟椤圭洰涓嶅彲鍐嶇户缁悎骞�!");
if (pdsfczhbxm > 1) return AjaxResult.error("鏈�澶氬厑璁搁�夋嫨涓�涓悎骞惰繃鐨勯」鐩�!");
+ String string = tjSamplingService.getBuKeHebingProName(ids);
+ if(null !=string){
+ return AjaxResult.error(string+"杩欏嚑涓」鐩笉鍙悎骞�!");
+ }
if (pdsfczhbxm == 0) {
TjSampling tjSampling = tjSamplingService.getById(ids.get(0));
Map<String, Object> map = tjSamplingService.hebingCaiYangInFo(ids);
@@ -412,7 +416,10 @@
List<TjSampling> tjSamplings = tjSamplingService.listByIds(ids);
if (tjSamplings.isEmpty())
return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
+ String errorMsg = "";
for (TjSampling sampling : tjSamplings) {
+ if (sampling.getJyxmdm() == null)
+ errorMsg+=sampling.getProName()+"鍦╨is绯荤粺鏈壘鍒板搴旂紪鐮佹棤娉曞彂鍑虹敵璇�";
sampling.setIsSignFor("0");
// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
// wq.eq(TjProject::getProParentId, sampling.getProId());
@@ -433,6 +440,7 @@
// }
// }
TjOrder tjOrder = orderService.getOrderByTjNum(sampling.getTjNum());
+ if(null==tjOrder)return AjaxResult.error("浣撴璁板綍涓嶅瓨鍦�");
TjCustomer tjCustomer = customerService.getById(tjOrder.getUserId());
boolean updChild;
String config = configService.selectConfigByKey("sfkqdyhis");
@@ -463,6 +471,7 @@
return AjaxResult.error("鎿嶄綔澶辫触璇烽噸璇�");
}
}
+ if (StrUtil.isNotBlank(errorMsg)) return AjaxResult.error(errorMsg);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.8.0