From 83a582de45f84a4a1ba5bbdc446a1554fcaac194 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 18 Jun 2026 13:21:24 +0800
Subject: [PATCH] =?UTF-8?q?2026-06-18=20=E6=89=93=E6=A0=B7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=A2=9E=E5=8A=A0=E2=80=9C=E6=89=B9=E6=AC=A1=E5=8F=B7?=
 =?UTF-8?q?=E2=80=9D=E5=92=8C=E3=80=90=E6=89=B9=E9=87=8F=E4=B8=8B=E8=BE=BE?=
 =?UTF-8?q?=E3=80=91=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProofingInformationController.java        |  2 +-
 .../entity/ProofingInformationEntity.java     |  4 ++++
 .../mapper/ProofingInformationMapper.java     |  2 ++
 .../impl/ProofingInformationServiceImpl.java  |  9 ++++++++
 .../proofing/ProofingInformationMapper.xml    | 21 +++++++++++++++++++
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/proofing/controller/ProofingInformationController.java b/src/main/java/com/spring/modules/proofing/controller/ProofingInformationController.java
index dce8d639..6d34ca03 100644
--- a/src/main/java/com/spring/modules/proofing/controller/ProofingInformationController.java
+++ b/src/main/java/com/spring/modules/proofing/controller/ProofingInformationController.java
@@ -64,7 +64,7 @@ public class ProofingInformationController {
     @ResponseBody
     public R proofingInformationService(@RequestBody ProofingInformationEntity data) {
         String proofingNo = proofingInformationService.proofingInformationSave(data);
-        return R.ok().put("proofingNo",proofingNo);
+        return R.ok().put("proofingNo", proofingNo).put("proofingBatchNo", data.getProofingBatchNo());
     }
 
     /**
diff --git a/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java b/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java
index c59c69d5..f3918871 100644
--- a/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java
+++ b/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java
@@ -28,6 +28,10 @@ public class ProofingInformationEntity extends QueryPage implements Serializable
      * 打样编码
      **/
     private String proofingNo;
+    /**
+     * 打样批次号
+     **/
+    private String proofingBatchNo;
     /**
      * 项目编码
      **/
diff --git a/src/main/java/com/spring/modules/proofing/mapper/ProofingInformationMapper.java b/src/main/java/com/spring/modules/proofing/mapper/ProofingInformationMapper.java
index 8da9536e..27598c07 100644
--- a/src/main/java/com/spring/modules/proofing/mapper/ProofingInformationMapper.java
+++ b/src/main/java/com/spring/modules/proofing/mapper/ProofingInformationMapper.java
@@ -20,6 +20,8 @@ public interface ProofingInformationMapper extends BaseMapper<ProofingInformatio
 
     String getProofingNo(ProofingInformationEntity data);
 
+    String getProofingBatchNo(@Param("site") String site, @Param("proofingBatchNoPrefix") String proofingBatchNoPrefix);
+
     List<ProofingDelegateAccessVo> searchDelegateAccess(ProofingDelegateAccess delegateAccess);
 
     List<ProofingDelegateAccessVo> searchDelegateAccessByUser(@Param("params") ProofingDelegateAccessVo delegateAccess,@Param("roleId")String roleId);
diff --git a/src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java b/src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java
index 849117fa..f71d860a 100644
--- a/src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java
@@ -59,6 +59,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -136,11 +138,18 @@ public class ProofingInformationServiceImpl extends ServiceImpl<ProofingInformat
         // 获取项目料号
         String[] testPartNoList = data.getTestPartNo().split(";");
         String docNo = "";
+        String proofingBatchNoPrefix = "DY" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
+        String proofingBatchNo = proofingInformationMapper.getProofingBatchNo(data.getSite(), proofingBatchNoPrefix);
+        if (!StringUtils.hasText(proofingBatchNo)) {
+            proofingBatchNo = proofingBatchNoPrefix + "001";
+        }
+        data.setProofingBatchNo(proofingBatchNo);
         // 新增
         for (String testPartNo : testPartNoList) {
             // 获取打样单号
             String proofingNo = "DY" + proofingInformationMapper.getProofingNo(data);
             data.setProofingNo(proofingNo);
+            data.setProofingBatchNo(proofingBatchNo);
             data.setTestPartNo(testPartNo);
             data.setStepId(10);
             data.setProofingResultStatus(data.getProofingResultStatus());
diff --git a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml
index e2c2d187..deb0c45d 100644
--- a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml
+++ b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml
@@ -7,6 +7,7 @@
         SELECT a.id,
                a.site,
                a.proofing_no,
+               a.proofing_batch_no,
                a.project_id,
                dbo.plm_get_project_name(a.site, a.project_id)                             as projectName,
                a.test_part_no,
@@ -79,6 +80,9 @@
             <if test="query.proofingNo != null and query.proofingNo != ''">
                 AND a.proofing_no like #{query.proofingNo}
             </if>
+            <if test="query.proofingBatchNo != null and query.proofingBatchNo != ''">
+                AND a.proofing_batch_no like #{query.proofingBatchNo}
+            </if>
             <if test="query.customerDesc != null and query.customerDesc != ''">
                 AND dbo.plm_get_customer_desc(a.site, a.customer_no) like #{query.customerDesc}
             </if>
@@ -145,6 +149,22 @@
         WHERE site = #{site}
     </select>
 
+    <!-- 获得打样批次号 -->
+    <select id="getProofingBatchNo" resultType="string">
+        SELECT CONCAT(
+                #{proofingBatchNoPrefix},
+                RIGHT('000' + CONVERT(VARCHAR(10),
+                                      ISNULL(MAX(CASE
+                                                     WHEN ISNUMERIC(RIGHT(proofing_batch_no, 3)) = 1
+                                                         THEN CONVERT(INT, RIGHT(proofing_batch_no, 3))
+                                                     ELSE 0
+                                          END), 0) + 1), 3)
+               )
+        FROM plm_proofing_information
+        WHERE site = #{site}
+          AND proofing_batch_no LIKE CONCAT(#{proofingBatchNoPrefix}, '%')
+    </select>
+
     <select id="searchDelegateAccess" resultType="com.spring.modules.proofing.vo.ProofingDelegateAccessVo">
         select
             site,
@@ -181,6 +201,7 @@
         SELECT a.id,
         a.site,
         a.proofing_no,
+        a.proofing_batch_no,
         a.project_id,
         dbo.plm_get_project_name(a.site, a.project_id)                             as projectName,
         a.test_part_no,