From 98b10918729412915b1df30d97a27dd47abc8670 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Thu, 9 Mar 2023 15:28:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B7=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=202023=E5=B9=B43=E6=9C=889=E6=97=A5=20=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gaotao/config/MybatisPlusConfig.java | 3 +- .../controller/TransController.java | 40 +++++++++++++ .../dao/TransdetailsubDao.java | 14 +++++ .../service/TransdetailsubService.java | 12 ++++ .../impl/TransdetailsubServiceImpl.java | 13 ++++ .../modules/finishedProduct/vo/TransVo.java | 48 +++++++++++++++ .../finishedProduct/TransdetailsubDao.xml | 59 ++++++++++++------- 7 files changed, 168 insertions(+), 21 deletions(-) create mode 100644 src/main/java/com/gaotao/modules/finishedProduct/controller/TransController.java create mode 100644 src/main/java/com/gaotao/modules/finishedProduct/vo/TransVo.java diff --git a/src/main/java/com/gaotao/config/MybatisPlusConfig.java b/src/main/java/com/gaotao/config/MybatisPlusConfig.java index d481bca..9ded561 100644 --- a/src/main/java/com/gaotao/config/MybatisPlusConfig.java +++ b/src/main/java/com/gaotao/config/MybatisPlusConfig.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.gaotao.common.batch.NoahSqlInjector; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.transaction.annotation.EnableTransactionManagement; /** * mybatis-plus配置 @@ -24,6 +23,8 @@ public class MybatisPlusConfig { PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); // 当前页码大于总页数返回首页 paginationInterceptor.setOverflow(true); + // 设置最大分页条数 10000条记录 + paginationInterceptor.setLimit(10000); return paginationInterceptor; } diff --git a/src/main/java/com/gaotao/modules/finishedProduct/controller/TransController.java b/src/main/java/com/gaotao/modules/finishedProduct/controller/TransController.java new file mode 100644 index 0000000..c17009f --- /dev/null +++ b/src/main/java/com/gaotao/modules/finishedProduct/controller/TransController.java @@ -0,0 +1,40 @@ +package com.gaotao.modules.finishedProduct.controller; + +import com.gaotao.common.utils.PageUtils; +import com.gaotao.common.utils.R; +import com.gaotao.modules.finishedProduct.service.TransdetailsubService; +import com.gaotao.modules.finishedProduct.vo.TransVo; +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.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Classname TransController + * @Description TODO + * @Date 2023/3/8 13:16 + * @Created by sxm + */ +@RestController +@RequestMapping("trans") +public class TransController { + + + @Autowired + private TransdetailsubService transdetailsubService; + + + /** + * @author: sxm + * @description: 获取出入库记录 + * @param [TransVo] + * @return: com.gaotao.common.utils.R + * @date: 2023/3/8 13:19 + */ + @PostMapping("getTransInfoList") + public R getTransInfoList(@RequestBody TransVo transVo){ + PageUtils page = transdetailsubService.getTransInfoList(transVo); + return R.ok().put("page", page); + } +} diff --git a/src/main/java/com/gaotao/modules/finishedProduct/dao/TransdetailsubDao.java b/src/main/java/com/gaotao/modules/finishedProduct/dao/TransdetailsubDao.java index ece0e10..9f0d212 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/dao/TransdetailsubDao.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/dao/TransdetailsubDao.java @@ -2,10 +2,24 @@ package com.gaotao.modules.finishedProduct.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.modules.finishedProduct.entity.Transdetailsub; +import com.gaotao.modules.finishedProduct.vo.TransVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper public interface TransdetailsubDao extends BaseMapper { + + /** + * @author: sxm + * @description: 获取卷出入库记录 + * @param [transdetailsubPage, transVo] + * @return: com.baomidou.mybatisplus.core.metadata.IPage + * @date: 2023/3/8 17:07 + */ + IPage getTransInfoList(Page transdetailsubPage,@Param("query") TransVo transVo); + } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/TransdetailsubService.java b/src/main/java/com/gaotao/modules/finishedProduct/service/TransdetailsubService.java index cabe168..c47d25c 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/service/TransdetailsubService.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/service/TransdetailsubService.java @@ -1,7 +1,19 @@ package com.gaotao.modules.finishedProduct.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.gaotao.common.utils.PageUtils; import com.gaotao.modules.finishedProduct.entity.Transdetailsub; +import com.gaotao.modules.finishedProduct.vo.TransVo; public interface TransdetailsubService extends IService { + + /** + * @author: sxm + * @description: 获取出入库记录 + * @param [transVo] + * @return: com.gaotao.common.utils.PageUtils + * @date: 2023/3/8 17:05 + */ + PageUtils getTransInfoList(TransVo transVo); + } diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/TransdetailsubServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/TransdetailsubServiceImpl.java index e324b3b..1f20634 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/TransdetailsubServiceImpl.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/TransdetailsubServiceImpl.java @@ -1,11 +1,24 @@ package com.gaotao.modules.finishedProduct.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gaotao.common.utils.PageUtils; import com.gaotao.modules.finishedProduct.dao.TransdetailsubDao; import com.gaotao.modules.finishedProduct.entity.Transdetailsub; import com.gaotao.modules.finishedProduct.service.TransdetailsubService; +import com.gaotao.modules.finishedProduct.vo.TransVo; import org.springframework.stereotype.Service; @Service public class TransdetailsubServiceImpl extends ServiceImpl implements TransdetailsubService { + + + @Override + public PageUtils getTransInfoList(TransVo transVo) { + + IPage transInfoList = this.baseMapper.getTransInfoList( + new Page(transVo.getPage(), transVo.getLimit()), transVo); + return new PageUtils(transInfoList); + } } diff --git a/src/main/java/com/gaotao/modules/finishedProduct/vo/TransVo.java b/src/main/java/com/gaotao/modules/finishedProduct/vo/TransVo.java new file mode 100644 index 0000000..7ae2c7c --- /dev/null +++ b/src/main/java/com/gaotao/modules/finishedProduct/vo/TransVo.java @@ -0,0 +1,48 @@ +package com.gaotao.modules.finishedProduct.vo; + +import com.gaotao.common.utils.QueryPage; +import lombok.Data; + +/** + * @Classname TransVo + * @Description TODO + * @Date 2023/3/8 17:02 + * @Created by sxm + */ +@Data +public class TransVo extends QueryPage { + + private String startDate; + private String endDate; + private String partno; + private String partdescription; + private String site; + private String transno; + private String transDate; + private String transtypeDb; + private String typedesc; + private String userid; + + private Double itemno; + + private Double seqno; + + private String subno; + private Double subqty; + + private String direction; + + private String orderref1; + + private String orderref2; + + private String orderref3; + + private String orderref4; + + private String orderref5; + + private String remark; + + private String orderref6; +} diff --git a/src/main/resources/mapper/finishedProduct/TransdetailsubDao.xml b/src/main/resources/mapper/finishedProduct/TransdetailsubDao.xml index 1999a76..10aeb8f 100644 --- a/src/main/resources/mapper/finishedProduct/TransdetailsubDao.xml +++ b/src/main/resources/mapper/finishedProduct/TransdetailsubDao.xml @@ -1,25 +1,44 @@ - - - - - - - - - - - - - - - - - - site, transNo, itemNo, SeqNo, subNo, subQty, direction, orderRef1, orderRef2, orderRef3, - orderRef4, orderRef5, remark, orderRef6 - + + + \ No newline at end of file