同步接口提交

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

+package com.topsunit.scanservice.ximai.controller;
+
+import com.topsunit.scanservice.ximai.dto.CmsmcCriteria;
+import com.topsunit.scanservice.ximai.dto.CmsmcDto;
+import com.topsunit.scanservice.ximai.dto.CmsniCriteria;
+import com.topsunit.scanservice.ximai.dto.CmsniDto;
+import com.topsunit.scanservice.ximai.service.CmsmcService;
+import com.topsunit.scanservice.ximai.service.CmsniService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * <p>Title: CmsmcController</p>
+ * <p>Description: 仓库库位档 Controller</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ */
+@RestController
+public class CmsmcController {
+    @Autowired
+    private CmsmcService cmsmcService;
+
+    @PostMapping("/cmsmc/getCmsmcList")
+    public List<CmsmcDto> getCmsmcList(@RequestBody CmsmcCriteria criteria){
+        return cmsmcService.getCmsmcList(criteria);
+    }
+}

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

+package com.topsunit.scanservice.ximai.controller;
+
+import com.topsunit.scanservice.ximai.dto.CopmaCriteria;
+import com.topsunit.scanservice.ximai.dto.CopmaDto;
+import com.topsunit.scanservice.ximai.dto.PurmaCriteria;
+import com.topsunit.scanservice.ximai.dto.PurmaDto;
+import com.topsunit.scanservice.ximai.service.CopmaService;
+import com.topsunit.scanservice.ximai.service.PurmaService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>Title: CopmaController</p>
+ * <p>Description: 客户</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/17
+ */
+@RestController
+public class CopmaController {
+
+    @Autowired
+    private CopmaService copmaService;
+
+    @ApiOperation("查询客户列表")
+    @PostMapping("/copma/getCopmaList")
+    public List<CopmaDto> getForCreate(@RequestBody CopmaCriteria criteria){
+        return copmaService.getCopmaDtoList(criteria);
+    }
+
+}

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

 package com.topsunit.scanservice.ximai.controller;
 
+import com.topsunit.scanservice.ximai.dto.InvmbCriteria;
 import com.topsunit.scanservice.ximai.dto.InvmbDto;
 import com.topsunit.scanservice.ximai.dto.InvmbIdCriteria;
 import com.topsunit.scanservice.ximai.service.InvmbService;
@@ -7,6 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -29,4 +31,14 @@ public class InvmbController {
     public Optional<InvmbDto> getForInvmbInfo(@RequestBody InvmbIdCriteria criteria) {
         return invmbService.getForInvmbInfo(criteria);
     }
+
+    @PostMapping("/invmb/getInvmbList")
+    public List<InvmbDto> getInvmbList(@RequestBody InvmbCriteria criteria) {
+        return invmbService.getInvmbList(criteria);
+    }
+
+    @PostMapping("/invml/getInvmlList")
+    public List<InvmbDto> getInvmlList(@RequestBody InvmbCriteria criteria) {
+        return invmbService.getInvmbList(criteria);
+    }
 }

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

 package com.topsunit.scanservice.ximai.controller;
 
-import com.topsunit.scanservice.ximai.dto.MoctaDocDto;
-import com.topsunit.scanservice.ximai.dto.MoctaIdCriteria;
+import com.topsunit.scanservice.ximai.dto.*;
 import com.topsunit.scanservice.ximai.service.MoctaService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -30,4 +31,15 @@ public class MoctaController {
     Optional<MoctaDocDto> getForDoc(@RequestBody MoctaIdCriteria criteria){
         return moctaService.getForDoc(criteria);
     }
+
+    @ApiOperation("工单查询")
+    @PostMapping("/mocta/getMoctaList")
+    List<MoctaDto> getMoctaList(@RequestBody MoctaCriteria criteria){
+        return moctaService.getMoctaList(criteria);
+    }
+    @ApiOperation("工单材料查询")
+    @PostMapping("/moctb/getMoctbList")
+    List<MoctbDto> getMoctaList(@RequestBody MoctbCriteria criteria){
+        return moctaService.getMoctbList(criteria);
+    }
 }

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

@@ -14,12 +14,12 @@ import java.util.List;
 import java.util.Optional;
 
 /**
- * <p>Title: PurtgController</p>
- * <p>Description: 进货单</p>
+ * <p>Title: PurmaController</p>
+ * <p>Description: 供应商</p>
  *
  * @author xi.feng
  * @version V1.0
- * @date 2021/10/25
+ * @date 2024/10/17
  */
 @RestController
 public class PurmaController {

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

+package com.topsunit.scanservice.ximai.dao;
+
+import com.topsunit.scanservice.ximai.entity.Copma;
+import com.topsunit.scanservice.ximai.entity.Purma;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+/**
+ * <p>Title: CopmaDao</p>
+ * <p>Description: CopmaDao</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/17
+ */
+public interface CopmaDao extends JpaRepository<Copma, String>, JpaSpecificationExecutor<Copma> {
+}

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

 package com.topsunit.scanservice.ximai.dao;
 
+import com.topsunit.scanservice.ximai.entity.Copma;
 import com.topsunit.scanservice.ximai.entity.Invmb;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 /**
  * <p>Title: InvmbDao</p>
@@ -11,5 +13,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
  * @version V1.0
  * @date 2021/10/26
  */
-public interface InvmbDao extends JpaRepository<Invmb, String> {
+public interface InvmbDao extends JpaRepository<Invmb, String>, JpaSpecificationExecutor<Invmb> {
 }

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

+package com.topsunit.scanservice.ximai.dto;
+
+import com.topsunit.scanservice.ximai.entity.EntityBase;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * <p>Title: Cmsmc</p>
+ * <p>Description: 仓库信息档</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/17
+ */
+@Data
+public class CmsmcCriteria  {
+    /**
+     * 仓库编号
+     */
+    @Id
+    @ApiModelProperty("仓库编号")
+    private String mc001;
+    /**
+     * 工厂编号
+     */
+    @ApiModelProperty("工厂编号")
+    private String mc003;
+
+}

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

+package com.topsunit.scanservice.ximai.dto;
+
+import com.topsunit.scanservice.ximai.entity.EntityBase;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * <p>Title: CmsmcDto</p>
+ * <p>Description: 仓库信息档</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/17
+ */
+@Data
+public class CmsmcDto {
+    /**
+     * 仓库编号
+     */
+    @ApiModelProperty("仓库编号")
+    private String mc001;
+    /**
+     *仓库名称
+     */
+    @ApiModelProperty("仓库名称")
+    private String mc002;
+    /**
+     * 工厂编号
+     */
+    @ApiModelProperty("工厂编号")
+    private String mc003;
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String mc007;
+
+}

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

+package com.topsunit.scanservice.ximai.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Id;
+
+/**
+ * <p>Title: CopmaCriteria</p>
+ * <p>Description: 客户查询</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/16
+ */
+@Data
+public class CopmaCriteria {
+
+    @ApiModelProperty("客户编号")
+    private String ma001;
+
+    @ApiModelProperty("客户简称")
+    private String ma002;
+
+    @ApiModelProperty("客户全称")
+    private String ma003;
+
+}

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

+package com.topsunit.scanservice.ximai.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>Title: CopmaDto</p>
+ * <p>Description: 客户</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/16
+ */
+@Data
+public class CopmaDto {
+
+    @ApiModelProperty("供应商编号")
+    private String ma001;
+
+    @ApiModelProperty("简称")
+    private String ma002;
+
+    @ApiModelProperty("公司全称")
+    private String ma003;
+
+    @ApiModelProperty("税号")
+    private String ma005;
+
+    /**
+     * 1:已核准、2:尚待核准、3:不准交易
+     */
+    @ApiModelProperty("核准状态")
+    private String ma016;
+
+    @ApiModelProperty("交易币种")
+    private String ma021;
+
+    /**
+     * 1.二联式、2.三联式、3.二联式收银机发票、4.三联式收银机发票、5.电子计算机发票、6.免用统一发票、S.可抵扣专用发票、B.普通发票、T.运输发票、N.不可抵扣专用发票 A.农产品收购凭证、G.海关代征完税凭证、W.废旧物资收购凭证、Z.其他 //901025 S06-9009036 MODI A~Z   //8
+     */
+    @ApiModelProperty("发票种类")
+    private String ma030;
+
+    @ApiModelProperty("备注")
+    private String ma040;
+}

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

+package com.topsunit.scanservice.ximai.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Id;
+
+/**
+ * <p>Title: InvmbCriteria</p>
+ * <p>Description: 品号基本信息档查询条件</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/17
+ */
+@Data
+public class InvmbCriteria {
+    @ApiModelProperty("品号")
+    private String mb001;
+    @ApiModelProperty("品名")
+    private String mb002;
+    @ApiModelProperty("创建日期")
+    private String gtCreate_date;
+    @ApiModelProperty("修改日期")
+    private String gtModi_date;
+}

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

+package com.topsunit.scanservice.ximai.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Id;
+
+/**
+ * <p>Title: InvmbCriteria</p>
+ * <p>Description: 品号基本信息档查询条件</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/17
+ */
+@Data
+public class InvmlCriteria {
+    @ApiModelProperty("品号")
+    private String ml001;
+
+    @ApiModelProperty("仓库")
+    private String ml002;
+}

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

+package com.topsunit.scanservice.ximai.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Author:   chicheng.li
+ * Date:     2024/10/17
+ * Description: 工单单头Dto
+ */
+@Data
+public class MoctaCriteria {
+    /*工单单别*/
+    private String ta001;
+    /*工单单号*/
+    private String ta002;
+    @ApiModelProperty("审核码")
+    private String ta013;
+    @ApiModelProperty("创建日期")
+    private String gtCreate_date;
+    @ApiModelProperty("修改日期")
+    private String gtModi_date;
+
+}

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

+package com.topsunit.scanservice.ximai.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Id;
+
+/**
+ * Author:   chicheng.li
+ * Date:     2024/10/17
+ * Description: 工单列头Dto
+ */
+@Data
+public class MoctbCriteria {
+    /*工单单别*/
+    @Id
+    private String tb001;
+    /*工单单号*/
+    @Id
+    private String tb002;
+
+}

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

+package com.topsunit.scanservice.ximai.dto.mapper;
+
+import com.topsunit.scanservice.ximai.dto.CmsmcDto;
+import com.topsunit.scanservice.ximai.dto.CopmaDto;
+import com.topsunit.scanservice.ximai.entity.Cmsmc;
+import com.topsunit.scanservice.ximai.entity.Copma;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>Title: CmsmcMapper</p>
+ * <p>Description: CmsmcMapper</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/16
+ */
+@Mapper(componentModel = "spring")
+public interface CmsmcMapper {
+    CmsmcDto toCmsmcDto(Cmsmc cmsmc);
+
+    List<CmsmcDto> toCmsmcDtoList(List<Cmsmc> cmsmcs);
+}

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

+package com.topsunit.scanservice.ximai.dto.mapper;
+
+import com.topsunit.scanservice.ximai.dto.CopmaDto;
+import com.topsunit.scanservice.ximai.dto.PurmaDto;
+import com.topsunit.scanservice.ximai.entity.Copma;
+import com.topsunit.scanservice.ximai.entity.Purma;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>Title: CopmaMapper</p>
+ * <p>Description: CopmaMapper</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/16
+ */
+@Mapper(componentModel = "spring")
+public interface CopmaMapper {
+    CopmaDto toCopmaDto(Copma copma);
+
+    List<CopmaDto> toCopmaDtoList(List<Copma> copmas);
+}

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

@@ -19,5 +19,6 @@ import java.util.List;
 @Mapper(componentModel = "spring")
 public interface InvmbMapper {
     InvmbDto toInvmbDto(Invmb invmb);
+    List<InvmbDto> toInvmbDtoList(List<Invmb> invmbs);
     List<InvmlDto> toInvmlDto(List<Invml> invmls);
 }

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

+package com.topsunit.scanservice.ximai.dto.mapper;
+
+import com.topsunit.scanservice.ximai.dto.InvmbDto;
+import com.topsunit.scanservice.ximai.dto.InvmlDto;
+import com.topsunit.scanservice.ximai.entity.Invmb;
+import com.topsunit.scanservice.ximai.entity.Invml;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>Title: InvmbMapper</p>
+ * <p>Description: 品号创库基本信息档 Mapper</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/17
+ */
+@Mapper(componentModel = "spring")
+public interface InvmlMapper {
+    InvmlDto toInvmbDto(Invml invml);
+    List<InvmbDto> toInvmbDtoList(List<Invmb> invmbs);
+    List<InvmlDto> toInvmlDto(List<Invml> invmls);
+}

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

@@ -25,4 +25,6 @@ public interface MoctaMapper {
     List<MoctbDto> toMoctbDto(List<Moctb> moctbs);
 
     MoctaDocDto toMoctaDocDto(Mocta mocta);
+
+    List<MoctaDto> toMoctaDtoList(List<Mocta> moctas);
 }

src/main/java/com/topsunit/scanservice/ximai/entity/Invma.java

@@ -9,7 +9,7 @@ import javax.persistence.IdClass;
 
 /**
  * <p>Title: Invmb</p>
- * <p>Description: 品号基本信息档</p>
+ * <p>Description: 品号分类基本信息档</p>
  *
  * @author xi.feng
  * @version V1.0

src/main/java/com/topsunit/scanservice/ximai/entity/Invmb.java

@@ -51,9 +51,6 @@ public class Invmb extends EntityBase {
     private String udf01;
     @ApiModelProperty("主要仓库")
     private String mb017;
-
-    @ApiModelProperty("会计")
-    private String test1;
     /**
      * Y:已核准、y:尚待核准、N:不准交易[DEF:"Y"]
      */

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

+package com.topsunit.scanservice.ximai.service;
+
+import com.topsunit.scanservice.ximai.dao.CmsmcDao;
+import com.topsunit.scanservice.ximai.dao.CmsniDao;
+import com.topsunit.scanservice.ximai.dto.CmsmcCriteria;
+import com.topsunit.scanservice.ximai.dto.CmsmcDto;
+import com.topsunit.scanservice.ximai.dto.CmsniCriteria;
+import com.topsunit.scanservice.ximai.dto.CmsniDto;
+import com.topsunit.scanservice.ximai.dto.mapper.CmsmcMapper;
+import com.topsunit.scanservice.ximai.dto.mapper.CmsniMapper;
+import com.topsunit.scanservice.ximai.entity.Cmsmc;
+import com.topsunit.scanservice.ximai.entity.Invml;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * <p>Title: CmsmcService</p>
+ * <p>Description: 仓库库位档 service</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ */
+@Service
+public class CmsmcService {
+    @Autowired
+    private CmsmcDao cmsmcDao;
+    @Autowired
+    private CmsmcMapper cmsmcMapper;
+
+
+    public List<CmsmcDto> getCmsmcList(CmsmcCriteria criteria){
+        Specification<Cmsmc> query = new Specification<Cmsmc>() {
+            @Override
+            public Predicate toPredicate(Root<Cmsmc> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                List<Predicate> predicates = new ArrayList<Predicate>();
+                if (StringUtils.isNotBlank(criteria.getMc001())) {
+                    Predicate predicate = criteriaBuilder.equal(root.get("mc001"), criteria.getMc001() );
+                    predicates.add(predicate);
+                }
+                if (StringUtils.isNotBlank(criteria.getMc003())) {
+                    Predicate predicate = criteriaBuilder.equal(root.get("mc003"), criteria.getMc003());
+                    predicates.add(predicate);
+                }
+                return criteriaQuery.where(predicates.toArray(new Predicate[0])).getRestriction();
+            }
+        };
+        List<Cmsmc> list = cmsmcDao.findAll(query);
+        return cmsmcMapper.toCmsmcDtoList(list);
+    }
+}

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

+package com.topsunit.scanservice.ximai.service;
+
+import com.topsunit.scanservice.ximai.dao.*;
+import com.topsunit.scanservice.ximai.dto.CopmaCriteria;
+import com.topsunit.scanservice.ximai.dto.CopmaDto;
+import com.topsunit.scanservice.ximai.dto.PurmaCriteria;
+import com.topsunit.scanservice.ximai.dto.PurmaDto;
+import com.topsunit.scanservice.ximai.dto.mapper.CopmaMapper;
+import com.topsunit.scanservice.ximai.dto.mapper.PurmaMapper;
+import com.topsunit.scanservice.ximai.dto.mapper.PurtgMapper;
+import com.topsunit.scanservice.ximai.entity.Copma;
+import com.topsunit.scanservice.ximai.entity.Purma;
+import com.topsunit.scanservice.ximai.security.CurrentActor;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>Title: CopmaService</p>
+ * <p>Description: 客户服务</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/16
+ */
+@Service
+public class CopmaService {
+
+    @Autowired
+    private CopmaMapper copmaMapper;
+    @Autowired
+    private CopmaDao copmaDao;
+
+    public List<CopmaDto> getCopmaDtoList(CopmaCriteria criteria) {
+        Specification<Copma> query = new Specification<Copma>() {
+            @Override
+            public Predicate toPredicate(Root<Copma> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                List<Predicate> predicates = new ArrayList<Predicate>();
+                if (StringUtils.isNotBlank(criteria.getMa001())) {
+                    Predicate predicate = criteriaBuilder.like(root.get("ma001"), criteria.getMa001() + "%");
+                    predicates.add(predicate);
+                }
+                if (StringUtils.isNotBlank(criteria.getMa002())) {
+                    Predicate predicate = criteriaBuilder.like(root.get("ma002"), criteria.getMa002() + "%");
+                    predicates.add(predicate);
+                }
+                if (StringUtils.isNotBlank(criteria.getMa003())) {
+                    Predicate predicate = criteriaBuilder.like(root.get("ma003"), criteria.getMa003() + "%");
+                    predicates.add(predicate);
+                }
+                return criteriaQuery.where(predicates.toArray(new Predicate[0])).getRestriction();
+            }
+        };
+        List<Copma> list = copmaDao.findAll(query);
+        return copmaMapper.toCopmaDtoList(list);
+    }
+
+}

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

@@ -2,12 +2,22 @@ package com.topsunit.scanservice.ximai.service;
 
 import com.topsunit.scanservice.ximai.dao.InvmbDao;
 import com.topsunit.scanservice.ximai.dao.InvmlDao;
-import com.topsunit.scanservice.ximai.dto.InvmbDto;
-import com.topsunit.scanservice.ximai.dto.InvmbIdCriteria;
+import com.topsunit.scanservice.ximai.dto.*;
 import com.topsunit.scanservice.ximai.dto.mapper.InvmbMapper;
+import com.topsunit.scanservice.ximai.entity.Copma;
+import com.topsunit.scanservice.ximai.entity.Invmb;
+import com.topsunit.scanservice.ximai.entity.Invml;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -44,4 +54,48 @@ public class InvmbService {
                     return i;
                 });
     }
+
+    public List<InvmbDto> getInvmbList(InvmbCriteria criteria) {
+        Specification<Invmb> query = new Specification<Invmb>() {
+            @Override
+            public Predicate toPredicate(Root<Invmb> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                List<Predicate> predicates = new ArrayList<Predicate>();
+                if (StringUtils.isNotBlank(criteria.getMb001())) {
+                    Predicate predicate = criteriaBuilder.like(root.get("mb001"), criteria.getMb001() + "%");
+                    predicates.add(predicate);
+                }
+                if (StringUtils.isNotBlank(criteria.getGtCreate_date())) {
+                    Predicate predicate = criteriaBuilder.greaterThan(root.get("create_date"), criteria.getGtCreate_date());
+                    predicates.add(predicate);
+                }
+                if (StringUtils.isNotBlank(criteria.getGtModi_date())) {
+                    Predicate predicate = criteriaBuilder.greaterThan(root.get("modi_date"), criteria.getGtModi_date());
+                    predicates.add(predicate);
+                }
+                return criteriaQuery.where(predicates.toArray(new Predicate[0])).getRestriction();
+            }
+        };
+        List<Invmb> list = invmbDao.findAll(query);
+        return invmbMapper.toInvmbDtoList(list);
+    }
+
+    public List<InvmlDto> getInvmlList(InvmlCriteria criteria) {
+        Specification<Invml> query = new Specification<Invml>() {
+            @Override
+            public Predicate toPredicate(Root<Invml> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                List<Predicate> predicates = new ArrayList<Predicate>();
+                if (StringUtils.isNotBlank(criteria.getMl001())) {
+                    Predicate predicate = criteriaBuilder.equal(root.get("ml001"), criteria.getMl001() );
+                    predicates.add(predicate);
+                }
+                if (StringUtils.isNotBlank(criteria.getMl002())) {
+                    Predicate predicate = criteriaBuilder.equal(root.get("ml002"), criteria.getMl002());
+                    predicates.add(predicate);
+                }
+                return criteriaQuery.where(predicates.toArray(new Predicate[0])).getRestriction();
+            }
+        };
+        List<Invml> list = invmlDao.findAll(query);
+        return invmbMapper.toInvmlDto(list);
+    }
 }

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

@@ -2,11 +2,23 @@ package com.topsunit.scanservice.ximai.service;
 
 import com.topsunit.scanservice.ximai.dao.InvmbDao;
 import com.topsunit.scanservice.ximai.dao.MoctaDao;
-import com.topsunit.scanservice.ximai.dto.MoctaDocDto;
-import com.topsunit.scanservice.ximai.dto.MoctaIdCriteria;
+import com.topsunit.scanservice.ximai.dao.MoctbDao;
+import com.topsunit.scanservice.ximai.dto.*;
 import com.topsunit.scanservice.ximai.dto.mapper.MoctaMapper;
+import com.topsunit.scanservice.ximai.entity.Invml;
+import com.topsunit.scanservice.ximai.entity.Mocta;
+import com.topsunit.scanservice.ximai.entity.Moctb;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -20,7 +32,10 @@ import java.util.Optional;
 @Service
 public class MoctaService {
 
+    @Autowired
+    private MoctbDao moctbDao;
     private final MoctaDao moctaDao;
+
     private final InvmbDao invmbDao;
     private final MoctaMapper moctaMapper;
 
@@ -38,4 +53,57 @@ public class MoctaService {
                     return i;
                 });
     }
+
+
+    public List<MoctaDto> getMoctaList(MoctaCriteria criteria) {
+        Specification<Mocta> query = new Specification<Mocta>() {
+            @Override
+            public Predicate toPredicate(Root<Mocta> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                List<Predicate> predicates = new ArrayList<Predicate>();
+                if (StringUtils.isNotBlank(criteria.getTa002())) {
+                    Predicate predicate = criteriaBuilder.equal(root.get("ta002"), criteria.getTa002() );
+                    predicates.add(predicate);
+                }
+                if (StringUtils.isNotBlank(criteria.getTa001())) {
+                    Predicate predicate = criteriaBuilder.equal(root.get("ta001"), criteria.getTa001() );
+                    predicates.add(predicate);
+                }
+                if (StringUtils.isNotBlank(criteria.getGtCreate_date())) {
+                    Predicate predicate = criteriaBuilder.greaterThan(root.get("create_date"), criteria.getGtCreate_date());
+                    predicates.add(predicate);
+                }
+                if (StringUtils.isNotBlank(criteria.getGtModi_date())) {
+                    Predicate predicate = criteriaBuilder.greaterThan(root.get("modi_date"), criteria.getGtModi_date());
+                    predicates.add(predicate);
+                }
+                return criteriaQuery.where(predicates.toArray(new Predicate[0])).getRestriction();
+            }
+        };
+        List<Mocta> list = moctaDao.findAll(query);
+        return moctaMapper.toMoctaDtoList(list);
+    }
+
+
+
+    public List<MoctbDto> getMoctbList(MoctbCriteria criteria) {
+        Specification<Moctb> query = new Specification<Moctb>() {
+            @Override
+            public Predicate toPredicate(Root<Moctb> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                List<Predicate> predicates = new ArrayList<Predicate>();
+                if (StringUtils.isNotBlank(criteria.getTb001())) {
+                    Predicate predicate = criteriaBuilder.equal(root.get("tb001"), criteria.getTb001() );
+                    predicates.add(predicate);
+                }
+                if (StringUtils.isNotBlank(criteria.getTb002())) {
+                    Predicate predicate = criteriaBuilder.equal(root.get("tb002"), criteria.getTb002() );
+                    predicates.add(predicate);
+                }
+                return criteriaQuery.where(predicates.toArray(new Predicate[0])).getRestriction();
+            }
+        };
+        List<Moctb> list = moctbDao.findAll(query);
+        return moctaMapper.toMoctbDto(list);
+    }
+
+
 }