物料分类接口添加

src/main/java/com/topsunit/scanservice/ximai/controller/InvmbController.java

@@ -43,4 +43,10 @@ public class InvmbController {
         invmbService.syncMark(updateParams);
     }
 
+    @ApiOperation("查询物料分类")
+    @PostMapping("/invma/getInvmaList")
+    public List<InvmaDto> getInvmaList(@RequestBody InvmaCriteria criteria){
+        return invmbService.getInvmaList(criteria);
+    }
+
 }

src/main/java/com/topsunit/scanservice/ximai/dao/InvmaDao.java

+package com.topsunit.scanservice.ximai.dao;
+
+import com.topsunit.scanservice.ximai.entity.Invma;
+import com.topsunit.scanservice.ximai.entity.Invmb;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+/**
+ * <p>Title: InvmaDao</p>
+ * <p>Description: InvmaDao</p>
+ *
+ * @author xi.feng
+ * @version V1.0
+ * @date 2024/10/28
+ */
+public interface InvmaDao extends JpaRepository<Invma, String>, JpaSpecificationExecutor<Invma> {
+
+
+
+}

src/main/java/com/topsunit/scanservice/ximai/dto/InvmaCriteria.java

+package com.topsunit.scanservice.ximai.dto;
+
+import com.topsunit.scanservice.ximai.common.PageParams;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>Title: InvmbCriteria</p>
+ * <p>Description: 品号基本信息档查询条件</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/17
+ */
+@Data
+public class InvmaCriteria extends PageParams {
+}

src/main/java/com/topsunit/scanservice/ximai/dto/InvmaDto.java

+package com.topsunit.scanservice.ximai.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Id;
+import java.util.List;
+
+/**
+ * <p>Title: InvmaDto</p>
+ * <p>Description: 品号分类信息档</p>
+ *
+ * @author xi.feng
+ * @version V1.0
+ * @date 2024/10/28
+ */
+@Data
+public class InvmaDto {
+    @ApiModelProperty("分类方式")
+    private String ma001;
+    @ApiModelProperty("品号类别编号")
+    private String ma002;
+    @ApiModelProperty("品号类别名称")
+    private String ma003;
+}

src/main/java/com/topsunit/scanservice/ximai/dto/InvmbDto.java

@@ -54,6 +54,8 @@ public class InvmbDto {
     private String mb149;
     @ApiModelProperty("客户品号")
     private String udf01;
+    @ApiModelProperty("内部图号")
+    private String udf07;
     @ApiModelProperty("主要仓库")
     private String mb017;
     /**

src/main/java/com/topsunit/scanservice/ximai/dto/mapper/InvmbMapper.java

 package com.topsunit.scanservice.ximai.dto.mapper;
 
+import com.topsunit.scanservice.ximai.dto.InvmaDto;
 import com.topsunit.scanservice.ximai.dto.InvmbDto;
 import com.topsunit.scanservice.ximai.dto.InvmcDto;
 import com.topsunit.scanservice.ximai.dto.InvmlDto;
+import com.topsunit.scanservice.ximai.entity.Invma;
 import com.topsunit.scanservice.ximai.entity.Invmb;
 import com.topsunit.scanservice.ximai.entity.Invmc;
 import com.topsunit.scanservice.ximai.entity.Invml;
@@ -22,6 +24,7 @@ import java.util.List;
 public interface InvmbMapper {
     InvmbDto toInvmbDto(Invmb invmb);
     List<InvmbDto> toInvmbDtoList(List<Invmb> invmbs);
+    List<InvmaDto> toInvmaDtoList(List<Invma> invmas);
     List<InvmlDto> toInvmlDto(List<Invml> invmls);
     List<InvmcDto> toInvmcDto(List<Invmc> invmcs);
 }

src/main/java/com/topsunit/scanservice/ximai/service/InvmbService.java

 package com.topsunit.scanservice.ximai.service;
 
+import com.topsunit.scanservice.ximai.dao.InvmaDao;
 import com.topsunit.scanservice.ximai.dao.InvmbDao;
 import com.topsunit.scanservice.ximai.dao.InvmcDao;
 import com.topsunit.scanservice.ximai.dao.InvmlDao;
@@ -38,6 +39,8 @@ import java.util.stream.Collectors;
 @Service
 public class InvmbService {
 
+    @Autowired
+    private InvmaDao invmaDao;
     @Autowired
     private InvmcDao invmcDao;
     private final InvmbDao invmbDao;
@@ -103,6 +106,21 @@ public class InvmbService {
         return rstList;
     }
 
+
+    public List<InvmaDto> getInvmaList(InvmaCriteria criteria) {
+        Specification<Invma> query = new Specification<Invma>() {
+            @Override
+            public Predicate toPredicate(Root<Invma> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                List<Predicate> predicates = new ArrayList<Predicate>();
+                return criteriaQuery.where(predicates.toArray(new Predicate[0])).getRestriction();
+            }
+        };
+        Page<Invma> list = invmaDao.findAll(query, criteria.toPageable());
+        List<InvmaDto> rstList = invmbMapper.toInvmaDtoList(list.toList());
+        return rstList;
+    }
+
+
     public List<InvmlDto> getInvmlList(InvmlCriteria criteria) {
         Specification<Invml> query = new Specification<Invml>() {
             @Override