erp物料增加字段

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
+        <if test="erpNumber != null">
+            and c.NUM = #{erpNumber}
+        </if>
+        <if test="number != null">
+            and d.CODE = #{number}
+        </if>
         <if test="name != null">
-            and d.NAME = #{name}
+            and d.NAME like concat('%', #{name}, '%')
         </if>
         <if test="erpName != null">
-            and c.NAME = #{erpName}
+            and c.NAME like concat('%', #{erpName}, '%')
         </if>
         <if test="manager != null">
             and d.LEADER_USER_ID = #{manager}

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

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

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

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

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