fix:优化关联关系

src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java

@@ -127,4 +127,12 @@ public class RelCodeBatch implements Serializable {
     @TableField(value = "parentCode")
     @ApiModelProperty(value = "")
     private String parentCode;
+
+    /**
+     * erpId
+     */
+
+    @TableField(value = "erpId")
+    @ApiModelProperty(value = "")
+    private String erpId;
 }

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;
 }

src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java

@@ -126,6 +126,8 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
                     relCodeBatch.setCreateUser(user.getUserName());
                     relCodeBatch.setUpdateTime(new Date());
                     relCodeBatch.setUpdateUser(user.getUserName());
+                    String customerId = user.getCustomerId();
+                    relCodeBatch.setErpId(customerId);
                     this.save(relCodeBatch);
                 }
                 //batch下的节点code
@@ -174,6 +176,9 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
         relCodeBatch.setUpdateTime(new Date());
         relCodeBatch.setUpdateUser(user.getUserName());
         relCodeBatch.setParentCode(relCodeDetailRequest.getParentCode());
+        //添加供应商id name
+        String customerId = user.getCustomerId();
+        relCodeBatch.setErpId(customerId);
         this.save(relCodeBatch);
         List<RelCodeDetail> relCodeDetails = new ArrayList<>();
         for(RelCodeDetailRequest request : detailList){

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,