From 57b41b18aa3472be34b8b13d725db8578a14b836 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 十月 2024 16:44:13 +0800
Subject: [PATCH] zjh20241018
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 5 +++++
1 files changed, 5 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..c2f9f49 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);
@@ -433,6 +437,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");
--
Gitblit v1.8.0