项目组套新增供应商ID

src/main/java/com/glxp/api/entity/basic/BasicSkProjectDetailEntity.java

@@ -22,6 +22,13 @@ public class BasicSkProjectDetailEntity {
     @TableField(value = "relId")
     private Long relId;
 
+    /**
+     * 供应商ID
+     */
+    @TableField(value = "supId")
+    private Long supId;
+
+
     /**
      * 定数包模板id
      */

src/main/java/com/glxp/api/req/basic/BasicDestinyRelRequest.java

@@ -1,17 +1,20 @@
 package com.glxp.api.req.basic;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.glxp.api.entity.basic.UdiRlSupEntity;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class BasicDestinyRelRequest {
-    private List<Long> list;
+    private List<UdiRlSupEntity> list;
     private Long pId;
     private Long id;
     private int count;
-    public List<Long> getList() {
+    private Long unitFk;
+
+    public List<UdiRlSupEntity> getList() {
         return list;
     }
 

src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java

@@ -15,6 +15,7 @@ import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.entity.basic.BasicSkProjectDetailEntity;
 import com.glxp.api.entity.basic.BasicSkProjectEntity;
 import com.glxp.api.entity.basic.BasicSkSickerEntity;
+import com.glxp.api.entity.basic.UdiRlSupEntity;
 import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.req.basic.BasicDestinyRelRequest;
 import com.glxp.api.req.basic.DlThirdDestinyRequest;
@@ -46,10 +47,11 @@ public class BasicDestinyRelService extends ServiceImpl<BasicDestinyRelMapper, B
     public Boolean addModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest) {
 
         List<BasicSkProjectDetailEntity> basicDestinyRelEntitList = new ArrayList<>();
-        for (Long str : basicDestinyRelRequest.getList()) {
+        for (UdiRlSupEntity str : basicDestinyRelRequest.getList()) {
             BasicSkProjectDetailEntity basicSkProjectDetailEntity = new BasicSkProjectDetailEntity();
             basicSkProjectDetailEntity.setId(IdUtil.getSnowflakeNextId());
-            basicSkProjectDetailEntity.setRelId(str);
+            basicSkProjectDetailEntity.setRelId(Long.parseLong(str.getUdiRlIdFk()));
+            basicSkProjectDetailEntity.setSupId(Long.parseLong(str.getUnitFk()));
             basicSkProjectDetailEntity.setPId(basicDestinyRelRequest.getpId());
             basicDestinyRelEntitList.add(basicSkProjectDetailEntity);
         }

src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml

@@ -74,7 +74,7 @@
         FROM basic_udirel
                      inner JOIN basic_products
                 ON basic_products.uuid = basic_udirel.uuid
-                     left join company_product_relevance
+                     inner join company_product_relevance
                 on basic_udirel.id = company_product_relevance.udiRlIdFk
                      left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
                      left join basic_hosp_type bht on basic_udirel.relCode = bht.code
@@ -291,5 +291,4 @@
                      RIGHT join basic_sk_project_detail pd ON pd.pId = p.id
         where p.code = #{thrCode}
     </select>
-
 </mapper>

src/main/resources/schemas/schema_v2.4.sql

@@ -599,6 +599,9 @@ CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'sickerName',' varchar(30)  NUL
 CALL Pro_Temp_ColumnWork('thr_inv_order', 'thirdSysFk', ' varchar(30) NULL DEFAULT NULL COMMENT ''第三方系统标识'' AFTER `remark`', 1);
 CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'supId',' varchar(30)  NULL DEFAULT NULL COMMENT ''供应商ID'' AFTER `remark`', 1);
 
+
+CALL Pro_Temp_ColumnWork('basic_sk_project_detail', 'supId',' varchar(30)  NULL DEFAULT NULL COMMENT ''供应商ID'' AFTER `remark`', 1);
+
 INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`)
 VALUES (75, '收费出入库明细下载', 'invSfOrderUrl', '/udiwms/erp/inv/getInvSfResult', 1, '1', '', 'thirdId', 1, 3, 1440, NULL);
 INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`)