From 0014b8b1d3dbdfdd32ceb9bf96e25910c126c3d6 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 11 Oct 2024 16:14:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=8B=E5=8A=A8=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/res/collect/RelCodeBatchResponse.java  | 18 ++++++++++++++++++
 .../mapper/collect/RelCodeBatchMapper.xml      |  7 ++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java b/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java
index 83196f9cb..4cc2daf73 100644
--- a/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java
@@ -63,4 +63,22 @@ public class RelCodeBatchResponse {
      * 负责人
      */
     private String lineManager;
+
+    /**
+     * 产品名称，通用名称
+     */
+    private String cpmctymc;
+    /**
+     * 包含下级数量
+     */
+    private Integer bhxjsl;
+
+    /**
+     * 包装单位
+     */
+    private String packUnit;
+    /**
+     * 包装级别
+     */
+    private Integer packLayer;
 }
diff --git a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml
index 3ac701fce..c399c288c 100644
--- a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml
@@ -36,8 +36,13 @@
       a.validateDate,
       a.workShop,
       a.lineName,
-      a.lineManager
+      a.lineManager,
+      bp.cpmctymc,
+      bp.bhxjsl,
+      bp.packLevel AS packLayer,
+      bp.packUnit
     from rel_code_batch a
+    LEFT JOIN basic_products bp ON bp.nameCode = a.productCode
     <where>
       <if test="productCode != '' and productCode != null">
         AND a.productCode LIKE concat('%', #{productCode}, '%')