From 46444efb4a1995b31aa0196ce193887a400198ce Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 26 三月 2025 10:50:49 +0800
Subject: [PATCH] zjh20250326
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java | 2 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 5 +++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java | 5 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java | 5 +++++
5 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 6e660b0..dcdd26e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -458,6 +458,8 @@
if (null != detailList && detailList1) {
String format = DateUtil.format(new Date(), "yyMMddHHmmssSSS");
for (TjOrderDetail detail : detailList) {
+ int i = samplingService.isExistProId(order.getTjNumber(), String.valueOf(detail.getProId()));
+ if(i>0) continue;
TjSampling sampling = new TjSampling();
if (null == projectService.getById(detail.getProId())) continue;
TjProject project = projectService.getById(detail.getProId());
@@ -873,6 +875,9 @@
Date date = new Date();
String format = DateUtil.format(date, "yyMMddHHmmssSSS");
for (TjOrderDetail detail : detailList) {
+ int i = samplingService.isExistProId(order.getTjNumber(), String.valueOf(detail.getProId()));
+ if(i>0) continue;
+
TjSampling sampling = new TjSampling();
if (null == projectService.getById(detail.getProId())) continue;
TjProject project = projectService.getById(detail.getProId());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 1ac6726..6e9b4a2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1468,6 +1468,8 @@
Date date = new Date();
String format = DateUtil.format(date, "yyMMddHHmmssSSS");
for (TjOrderDetail detail : detailList) {
+ int i = samplingService.isExistProId(order.getTjNumber(), String.valueOf(detail.getProId()));
+ if(i>0) continue;
TjSampling sampling = new TjSampling();
if (null == projectService.getById(detail.getProId())) continue;
TjProject project = projectService.getById(detail.getProId());
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java
index 58f8184..245a1bd 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java
@@ -195,4 +195,9 @@
"a.create_id = #{userId}\n"+
"WHERE a.tj_num=#{tjNum} AND a.jxbz = #{jxbz}")
boolean updateUserIdByTjNumAndJxbz(@Param("tjNum")String tjNum,@Param("userName")String userName,@Param("userId") String userId,@Param("jxbz") String jxbz);
+
+
+
+ @Select("SELECT COUNT(*) FROM tj_sampling a WHERE a.deleted=0 AND a.tj_num=#{tjh} AND LOCATE(#{proId},a.pro_id)")
+ int isExistProId(@Param("tjh") String tjh,@Param("proId") String proId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
index fa797ee..bad2931 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
@@ -99,4 +99,6 @@
* @return
*/
int isMergeItem(String id);
+
+ int isExistProId(String tjh,String proId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java
index b6ca330..18c3ed1 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java
@@ -226,4 +226,9 @@
public int isMergeItem(String id) {
return baseMapper.isMergeItem(id);
}
+
+ @Override
+ public int isExistProId(String tjh, String proId) {
+ return baseMapper.isExistProId(tjh,proId);
+ }
}
--
Gitblit v1.8.0