From 7706c040b148d16d38025e8ff243c544f4e49b72 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 9 Mar 2026 16:55:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E9=9C=80=E8=A6=81=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E8=AF=95=E9=AA=8C=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erf/controller/ErfExpApplyController.java |  3 ++-
 .../erf/service/ErfExpApplyService.java       |  2 +-
 .../service/impl/ErfExpApplyServiceImpl.java  | 26 +++++++++----------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/erf/controller/ErfExpApplyController.java b/src/main/java/com/xujie/sys/modules/erf/controller/ErfExpApplyController.java
index 63a76a7e..2f0c1778 100644
--- a/src/main/java/com/xujie/sys/modules/erf/controller/ErfExpApplyController.java
+++ b/src/main/java/com/xujie/sys/modules/erf/controller/ErfExpApplyController.java
@@ -235,6 +235,7 @@ public class ErfExpApplyController extends AbstractController {
     public R copyExpApply(@RequestBody Map<String, Object> params) {
         try {
             String sourceApplyNo = (String) params.get("sourceApplyNo");
+            String applyNo = (String) params.get("applyNo");
             Boolean copyTriConfirm = params.get("copyTriConfirm") != null
                     ? (Boolean) params.get("copyTriConfirm")
                     : false;
@@ -249,7 +250,7 @@ public class ErfExpApplyController extends AbstractController {
                     : null;
 
             String newApplyNo = erfExpApplyService.copyExpApply(
-                    sourceApplyNo, copyTriConfirm, copyAttachment,copyRawMaterialList, currentUserId);
+                    sourceApplyNo,applyNo, copyTriConfirm, copyAttachment,copyRawMaterialList, currentUserId);
 
             return R.ok("复制成功").put("newApplyNo", newApplyNo);
         } catch (Exception e) {
diff --git a/src/main/java/com/xujie/sys/modules/erf/service/ErfExpApplyService.java b/src/main/java/com/xujie/sys/modules/erf/service/ErfExpApplyService.java
index 96b6c991..49c78ce8 100644
--- a/src/main/java/com/xujie/sys/modules/erf/service/ErfExpApplyService.java
+++ b/src/main/java/com/xujie/sys/modules/erf/service/ErfExpApplyService.java
@@ -168,5 +168,5 @@ public interface ErfExpApplyService extends IService<ErfExpApply> {
      * @param currentUserId 当前操作用户ID
      * @return 新申请单号
      */
-    String copyExpApply(String sourceApplyNo, Boolean copyTriConfirm, Boolean copyAttachment,Boolean copyRawMaterialList, Long currentUserId);
+    String copyExpApply(String sourceApplyNo,String applyNo, Boolean copyTriConfirm, Boolean copyAttachment,Boolean copyRawMaterialList, Long currentUserId);
 }
diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
index 1da7166f..4970194a 100644
--- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
@@ -27,6 +27,7 @@ import com.xujie.sys.modules.sys.dao.SysUserDao;
 import com.xujie.sys.modules.sys.dto.ManagerInfoDto;
 import com.xujie.sys.modules.sys.dto.UserRoleDto;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -1379,10 +1380,13 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
     }
 
     @Override
-    public String copyExpApply(String sourceApplyNo, Boolean copyTriConfirm, Boolean copyAttachment,Boolean copyRawMaterialList, Long currentUserId) {
+    public String copyExpApply(String sourceApplyNo,String applyNo, Boolean copyTriConfirm, Boolean copyAttachment,Boolean copyRawMaterialList, Long currentUserId) {
         log.info("=== 开始复制申请单 === 源申请单号: {}, 复制三方确认: {}, 复制附件: {}",
                 sourceApplyNo, copyTriConfirm, copyAttachment);
 
+        if (StringUtils.isBlank(applyNo)) {
+            throw new XJException("新试验单号不能为空");
+        }
         // 1. 查询源申请单
         ErfExpApply sourceEntity = this.getById(sourceApplyNo);
         if (sourceEntity == null) {
@@ -1392,13 +1396,7 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
         // 2. 创建新申请单实体（复制基本信息）
         ErfExpApply newEntity = new ErfExpApply();
         BeanUtils.copyProperties(sourceEntity, newEntity);
-
-        // 3. 生成新的申请单号
-        String buCode = sourceEntity.getBuNo().split("-").length > 1
-                ? sourceEntity.getBuNo().split("-")[1]
-                : sourceEntity.getBuNo();
-        String newApplyNo = generateApplyNo(buCode);
-        newEntity.setApplyNo(newApplyNo);
+        newEntity.setApplyNo(applyNo);
 
         // 4. 重置状态和流程相关字段
         newEntity.setStatus("草稿");
@@ -1419,12 +1417,12 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
         newEntity.setCreateTime(new Date());
         // 6. 保存新申请单
         this.save(newEntity);
-        log.info("新申请单已创建: {}", newApplyNo);
+        log.info("新申请单已创建: {}", applyNo);
 
         // 7. 复制三方确认信息（仅High Risk）
         if (Boolean.TRUE.equals(copyTriConfirm) && "High Risk".equals(sourceEntity.getExperimentType())) {
             try {
-                erfTriConfirmService.copyTriConfirmRecords(sourceApplyNo, newApplyNo);
+                erfTriConfirmService.copyTriConfirmRecords(sourceApplyNo, applyNo);
                 log.info("三方确认信息复制成功");
             } catch (Exception e) {
                 log.warn("复制三方确认信息失败: {}", e.getMessage());
@@ -1436,7 +1434,7 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
         if (Boolean.TRUE.equals(copyAttachment)) {
             try {
                 // 调用附件服务复制附件
-                copyAttachments(sourceApplyNo, newApplyNo);
+                copyAttachments(sourceApplyNo, applyNo);
                 log.info("附件复制成功");
             } catch (Exception e) {
                 log.warn("复制附件失败: {}", e.getMessage());
@@ -1446,7 +1444,7 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
         // 9. 复制原材料清单
         if (Boolean.TRUE.equals(copyRawMaterialList)) {
             try {
-                erfExpRawMaterialService.copyRawMaterialList(sourceApplyNo, newApplyNo);
+                erfExpRawMaterialService.copyRawMaterialList(sourceApplyNo, applyNo);
                 log.info("原材料清单复制成功");
             } catch (Exception e) {
                 log.warn("复制原材料清单失败: {}", e.getMessage());
@@ -1454,8 +1452,8 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
             }
         }
 
-        log.info("=== 复制申请单完成 === 新申请单号: {}", newApplyNo);
-        return newApplyNo;
+        log.info("=== 复制申请单完成 === 新申请单号: {}", applyNo);
+        return applyNo;
     }
 
     /**