From 1585b5611a92163102edbe694ca8e2a2cde39131 Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Tue, 28 Oct 2025 16:53:05 +0800 Subject: [PATCH] =?UTF-8?q?erp=E7=89=A9=E6=96=99=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/base/CompanyRelativityMapper.xml | 10 ++++++-- .../module/erp/api/ErpExternalApiImpl.java | 3 +++ .../admin/erp/vo/ErpMaterialPageReqVO.java | 16 ++++++++++++ .../admin/erp/vo/ErpMaterialRespVO.java | 20 +++++++++++++++ .../admin/erp/vo/ErpMaterialSaveReqVO.java | 15 +++++++++++ .../erp/dal/dataobject/erp/ErpMaterialDO.java | 25 +++++++++++++++++++ 6 files changed, 87 insertions(+), 2 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml index 7a1a3b8..86abdfb 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml @@ -30,11 +30,17 @@ left join SPLY_ERP_CPN c on r.ERP_NUM = c.NUM where d.DELETED = 0 and d.IS_COMPANY = 1 + + and c.NUM = #{erpNumber} + + + and d.CODE = #{number} + - and d.NAME = #{name} + and d.NAME like concat('%', #{name}, '%') - and c.NAME = #{erpName} + and c.NAME like concat('%', #{erpName}, '%') and d.LEADER_USER_ID = #{manager} diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java index 4532369..1ea6c56 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java @@ -8,6 +8,8 @@ import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO; import com.zt.plat.module.erp.service.erp.ErpProductiveVersionService; import com.zt.plat.module.erp.utils.ErpConfig; import jakarta.annotation.Resource; +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Component; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -25,6 +27,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success; */ @RestController @Validated +@Component public class ErpExternalApiImpl implements ErpExternalApi { @Resource diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialPageReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialPageReqVO.java index 43dc25b..723de5d 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialPageReqVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialPageReqVO.java @@ -58,4 +58,20 @@ public class ErpMaterialPageReqVO extends PageParam { @Schema(description = "类型") private String type; + @Schema(description = "金属元素缩写") + private String abbreviation; + + @Schema(description = "金属元素名称", example = "赵六") + private String name; + + @Schema(description = "金属元素编码") + private String coding; + + @Schema(description = "品位单位") + private String gradeUnit; + + @Schema(description = "小数位数") + private Long decimalValue; + + } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialRespVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialRespVO.java index 49a6361..85dbce1 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialRespVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialRespVO.java @@ -77,6 +77,26 @@ public class ErpMaterialRespVO { @ExcelProperty("类型") private String type; + @Schema(description = "金属元素缩写") + @ExcelProperty("金属元素缩写") + private String abbreviation; + + @Schema(description = "金属元素名称", example = "赵六") + @ExcelProperty("金属元素名称") + private String name; + + @Schema(description = "金属元素编码") + @ExcelProperty("金属元素编码") + private String coding; + + @Schema(description = "品位单位") + @ExcelProperty("品位单位") + private String gradeUnit; + + @Schema(description = "小数位数") + @ExcelProperty("小数位数") + private Long decimalValue; + private List materialOtherDTOS; } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialSaveReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialSaveReqVO.java index 5d18788..5267701 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialSaveReqVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialSaveReqVO.java @@ -69,4 +69,19 @@ public class ErpMaterialSaveReqVO { @Schema(description = "类型") private String type; + @Schema(description = "金属元素缩写") + private String abbreviation; + + @Schema(description = "金属元素名称", example = "赵六") + private String name; + + @Schema(description = "金属元素编码") + private String coding; + + @Schema(description = "品位单位") + private String gradeUnit; + + @Schema(description = "小数位数") + private Long decimalValue; + } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java index 00d0b39..84926ce 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpMaterialDO.java @@ -100,5 +100,30 @@ public class ErpMaterialDO extends BusinessBaseDO { @TableField("TP") private String type; + /** + * 金属元素缩写 + */ + @TableField("ABBR") + private String abbreviation; + /** + * 金属元素名称 + */ + @TableField("NAME") + private String name; + /** + * 金属元素编码 + */ + @TableField("CDG") + private String coding; + /** + * 品位单位 + */ + @TableField("GRD_UNT") + private String gradeUnit; + /** + * 小数位数 + */ + @TableField("DEC") + private Long decimalValue; } \ No newline at end of file