From e7c061d2ba7b1428dc05853ca59fc3a8f6ca6caf Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Sat, 17 Jan 2026 14:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nov/KgLowDurable/constant/TwoOutApproverConstant.java    | 2 +-
 .../com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java    | 5 +++++
 .../service/Impl/LdOnePutStorageServiceImpl.java             | 2 +-
 .../service/Impl/LdTwoOutStorageServiceImpl.java             | 3 ++-
 src/main/resources/mapper/LdTwoOutStorageMapper.xml          | 1 +
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nov/KgLowDurable/constant/TwoOutApproverConstant.java b/src/main/java/com/nov/KgLowDurable/constant/TwoOutApproverConstant.java
index 9f61212..e458542 100644
--- a/src/main/java/com/nov/KgLowDurable/constant/TwoOutApproverConstant.java
+++ b/src/main/java/com/nov/KgLowDurable/constant/TwoOutApproverConstant.java
@@ -23,7 +23,7 @@ public class TwoOutApproverConstant {
     public static final String TEXT_ORDER_NO = "Text-1768182878024";
 
     /**
-     * 单号 - 出库组别
+     * 出库名称 - 出库组别
      */
     public static final String OUT_GROUP = "Text-1768268948529";
 
diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java
index 0e7277a..6ac0afa 100644
--- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java
+++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java
@@ -97,4 +97,9 @@ public class LdTwoOutStorage implements Serializable {
      * 出库状态：0-未出库；1-已出库；2-已驳回
      */
     private String status;
+
+    /**
+     * 分组名称
+     */
+    private String groupName;
 }
\ No newline at end of file
diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java
index 42279b9..a31c302 100644
--- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java
+++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java
@@ -343,7 +343,7 @@ public class LdOnePutStorageServiceImpl extends ServiceImpl<LdOnePutStorageMappe
             }
 
 
-            // 2. 创建主要内容（完全按照您的JSON结构）
+            // 2. 创建主要内容
             List<Content> contents = Arrays.asList(
                     new Content(OnePutApproverConstant.TEXT, OnePutApproverConstant.TEXT_INBOUND_PERSON, Value.textValue(dto.getUserInfoVO().getName())),
                     new Content(OnePutApproverConstant.TEXT, OnePutApproverConstant.TEXT_PURCHASE_ORDER_NAME, Value.textValue(dto.getPurchaseEndInfo())),
diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java
index c19d884..ef29838 100644
--- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java
+++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java
@@ -156,11 +156,12 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl<LdTwoOutStorageMappe
             tableRowList.add(tableRow);
         }
 
-        // 2. 创建主要内容（完全按照您的JSON结构）
+        // 2. 创建主要内容
         List<Content> contents = Arrays.asList(
                 new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.TEXT_RECEIVER, Value.textValue(dto.getLdTwoOutStorage().getProposerName())),
                 new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.TEXT_DEPARTMENT, Value.textValue(dto.getLdTwoOutStorage().getDepartment())),
                 new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.TEXT_ORDER_NO, Value.textValue(dto.getLdTwoOutStorage().getOrderNo())),
+                new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.OUT_GROUP, Value.textValue(dto.getLdTwoOutStorage().getGroupName().equals("自由出库") ? null : dto.getLdTwoOutStorage().getGroupName())),
                 new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.TEXTAREA_REASON, Value.textValue(dto.getLdTwoOutStorage().getReason())),
                 new Content(TwoOutApproverConstant.TABLE, TwoOutApproverConstant.TABLE_MATERIAL_LIST,
                         Value.tableValue(tableRowList))
diff --git a/src/main/resources/mapper/LdTwoOutStorageMapper.xml b/src/main/resources/mapper/LdTwoOutStorageMapper.xml
index 97ac564..9056b4f 100644
--- a/src/main/resources/mapper/LdTwoOutStorageMapper.xml
+++ b/src/main/resources/mapper/LdTwoOutStorageMapper.xml
@@ -17,6 +17,7 @@
         <result column="shipper_name" property="shipperName"/>
         <result column="sp_no" property="spNo"/>
         <result column="status" property="status"/>
+        <result column="group_name" property="groupName"/>
     </resultMap>
     <select id="selectTwoOutStorageList" resultType="com.nov.KgLowDurable.pojo.entity.LdTwoOutStorage">
         select * from ld_two_out_storage where 1=1