From 1373ed9ad503cd850b80a6b4800b0f4a9ec6f9c8 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 26 三月 2025 16:27:31 +0800
Subject: [PATCH] 修改填充字段

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

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 2604291..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
@@ -1109,7 +1109,8 @@
 //        if(StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber=makeLisTmhPrefix+tjNumber;
 
 
-        String tjNumber = (SecurityUtils.getUsername() + idUtils.getTjNumber());
+//        String tjNumber = (SecurityUtils.getUsername() + idUtils.getTjNumber());
+        String tjNumber = idUtils.getTjNumber();
         if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
         tjOrder.setTjNumber(tjNumber);
 
@@ -1467,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());
@@ -1909,7 +1912,8 @@
 
             //鑾峰彇鎷兼帴鍓嶇紑
             String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
-            String tjNumber = (sysUser.getUserName() + idUtils.getTjNumber());
+//            String tjNumber = (sysUser.getUserName() + idUtils.getTjNumber());
+            String tjNumber = idUtils.getTjNumber();
             if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
 
 

--
Gitblit v1.8.0