From b58e4aae8cfd5895feb9b34862cc7e26c7d9532e Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 7 Nov 2024 14:26:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/entity/collect/RelCodeBatch.java    | 8 ++++++++
 .../com/glxp/api/res/collect/RelCodeBatchResponse.java    | 3 +++
 .../com/glxp/api/service/collect/RelCodeBatchService.java | 4 ++++
 .../mybatis/mapper/collect/RelCodeBatchMapper.xml         | 4 +++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java b/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java
index 7056f3691..ba46bec97 100644
--- a/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java
+++ b/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java
@@ -127,4 +127,12 @@ public class RelCodeBatch implements Serializable {
     @ApiModelProperty(value = "")
     private String parentCode;
 
+
+    /**
+     * erpId
+     */
+
+    @TableField(value = "erpId")
+    @ApiModelProperty(value = "")
+    private String erpId;
 }
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 4cc2daf73..848b08a8f 100644
--- a/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/RelCodeBatchResponse.java
@@ -77,8 +77,11 @@ public class RelCodeBatchResponse {
      * 包装单位
      */
     private String packUnit;
+
     /**
      * 包装级别
      */
     private Integer packLayer;
+
+    private String erpId;
 }
diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
index 641b1c370..e85ed264c 100644
--- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
+++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
@@ -131,6 +131,8 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
                     relCodeBatch.setCreateUser(user.getUserName());
                     relCodeBatch.setUpdateTime(new Date());
                     relCodeBatch.setUpdateUser(user.getUserName());
+                    String customerId = String.valueOf(user.getCustomerId());
+                    relCodeBatch.setErpId(customerId);
                     this.save(relCodeBatch);
                 }
                 //batch下的节点code
@@ -191,6 +193,8 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
         relCodeBatch.setUpdateTime(new Date());
         relCodeBatch.setUpdateUser(user.getUserName());
         relCodeBatch.setParentCode(relCodeDetailRequest.getParentCode());
+        String customerId = String.valueOf(user.getCustomerId());
+        relCodeBatch.setErpId(customerId);
         this.save(relCodeBatch);
         List<RelCodeDetail> relCodeDetails = new ArrayList<>();
         for(RelCodeDetailRequest request : detailList){
diff --git a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml
index c399c288c..63bd3eb07 100644
--- a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml
@@ -16,11 +16,12 @@
     <result column="workShop" jdbcType="VARCHAR" property="workShop" />
     <result column="lineName" jdbcType="VARCHAR" property="lineName" />
     <result column="lineManager" jdbcType="VARCHAR" property="lineManager" />
+        <result column="erpId" jdbcType="VARCHAR" property="erpId" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, productCode, subTypeNo, `cascadeRatio`, packageSpec, `comment`, batchNo, madeDate,
-    validateDate, workShop, lineName, lineManager
+    validateDate, workShop, lineName, lineManager, erpId
   </sql>
 
   <select id="filterList" parameterType="com.glxp.api.req.collect.RelCodeBatchRequest" resultType="com.glxp.api.res.collect.RelCodeBatchResponse">
@@ -37,6 +38,7 @@
       a.workShop,
       a.lineName,
       a.lineManager,
+      a.erpId,
       bp.cpmctymc,
       bp.bhxjsl,
       bp.packLevel AS packLayer,