diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkProjectDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkProjectDetailEntity.java index dc7615544..ac15ed93d 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkProjectDetailEntity.java +++ b/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 */ diff --git a/src/main/java/com/glxp/api/req/basic/BasicDestinyRelRequest.java b/src/main/java/com/glxp/api/req/basic/BasicDestinyRelRequest.java index 79c2e4c70..8a07f61e7 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicDestinyRelRequest.java +++ b/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 list; + private List list; private Long pId; private Long id; private int count; - public List getList() { + private Long unitFk; + + public List getList() { return list; } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java b/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java index d1e67551a..97ac5aca0 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java +++ b/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 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); } diff --git a/src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml index 900c80017..93ecc8ca3 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml +++ b/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 @@ -285,11 +285,10 @@ group by basic_products.uuid - + select pd.* + from basic_sk_project p + RIGHT join basic_sk_project_detail pd ON pd.pId = p.id + where p.code = #{thrCode} - diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 6b9188a46..eafe798a0 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/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`)