diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java new file mode 100644 index 00000000..3899591e --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java @@ -0,0 +1,19 @@ +package com.wh.pojo.api; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.List; + +@Data +public class InStoreHouseMainDetailVo implements Vo { + private String no; //varchar 50 编号 + private String applicationDate; //date 50 制单日期 + private String creatorName; /// varchar 50 制单人姓名 + private String custerName; // varchar 100 客户名称（企业） + private String storeHouseName; // varchar 100 仓库名称 + private String auditorName; // varchar 50 审核人姓名 + private String state; // varchar 50 审核状态 + private String approvedDate; // varchar 50 审核日期 + private List list; +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java new file mode 100644 index 00000000..fad54da3 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java @@ -0,0 +1,19 @@ +package com.wh.pojo.api; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +@Data +public class InStoreHouseMainVo implements Vo { + private String no; //varchar 50 编号 + private String applicationDate; //date 50 制单日期 + private String creatorName; /// varchar 50 制单人姓名 + private String custerName; // varchar 100 客户名称（企业） + private String storeHouseName; // varchar 100 仓库名称 + private String auditorName; // varchar 50 审核人姓名 + private String state; // varchar 50 审核状态 + private String approvedDate; // varchar 50 审核日期 +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java new file mode 100644 index 00000000..cf8c3635 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java @@ -0,0 +1,26 @@ +package com.wh.pojo.api; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import com.yxt.common.core.query.Query; +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class InStorehouseMainQuery implements Query { + private String sid; + private String no; //varchar 50 编号 + private String applicationDateStart; //date 50 制单日期开始 + private String applicationDateEnd; //date 50 制单日期结束 + private String creatorSid; //varchar 64 制单人Sid + private String creatorName; /// varchar 50 制单人姓名 + private String custerSid; //varchar 64 客户Sid（企业） + private String custerName; // varchar 100 客户名称（企业） + private String storeHouseSid; // varchar 64 仓库Sid + private String storeHouseName; // varchar 100 仓库名称 + private String auditorSid; //varchar 64 审核人Sid + private String auditorName; // varchar 50 审核人姓名 + private String approvedDate; // varchar 50 审核日期 + private String approvedRemark; // varchar 50 审核备注 +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseDetailVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseDetailVo.java new file mode 100644 index 00000000..619caf59 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseDetailVo.java @@ -0,0 +1,21 @@ +package com.wh.pojo.api; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + + +@Data +@Accessors(chain = true) +public class OutStorehouseDetailVo implements Vo { + private String no; //varchar 50 编号 + private String applicationDate; //date 50 制单日期 + private String creatorName; /// varchar 50 制单人姓名 + private String custerName; // varchar 100 客户名称（企业） + private String storeHouseName; // varchar 100 仓库名称 + private String auditorName; // varchar 50 审核人姓名 + private String approvedDate; // varchar 50 审核日期 + private List list; +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseMainQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseMainQuery.java new file mode 100644 index 00000000..2ee8602b --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseMainQuery.java @@ -0,0 +1,19 @@ +package com.wh.pojo.api; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import com.yxt.common.core.query.Query; +import lombok.Data; +import lombok.experimental.Accessors; + + +@Data +@Accessors(chain = true) +public class OutStorehouseMainQuery implements Query { + private String no; //varchar 50 编号 + private String applicationDateEnd; //date 50 制单日期 + private String applicationDateStart; //date 50 制单日期 + private String creatorName; /// varchar 50 制单人姓名 + private String custerName; // varchar 100 客户名称（企业） + private String mainSid; // varchar 100 mainSid +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseVo.java new file mode 100644 index 00000000..fc44f4a3 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseVo.java @@ -0,0 +1,20 @@ +package com.wh.pojo.api; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import com.yxt.common.core.vo.Vo; +import lombok.Data; +import lombok.experimental.Accessors; + + +@Data +@Accessors(chain = true) +public class OutStorehouseVo implements Vo { + private String no; //varchar 50 编号 + private String applicationDate; //date 50 制单日期 + private String creatorName; /// varchar 50 制单人姓名 + private String custerName; // varchar 100 客户名称（企业） + private String storeHouseName; // varchar 100 仓库名称 + private String auditorName; // varchar 50 审核人姓名 + private String approvedDate; // varchar 50 审核日期 +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/config/MybatisPlusConfig.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/config/MybatisPlusConfig.java new file mode 100644 index 00000000..03539bb3 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/config/MybatisPlusConfig.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.config; + +import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * Project: yxt-common
+ * File: MybatisPlusConfig.java
+ * Class: com.yxt.common.base.config.MybatisPlusConfig
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2020/8/24 下午12:42
+ * + * @author popo + * @version 1.0 + * @since 1.0 + */ +@Configuration +public class MybatisPlusConfig { + /* + * 分页插件，自动识别数据库类型 多租户，请参考官网【插件扩展】 + */ +// @Bean +// public MybatisPlusInterceptor paginationInterceptor() { +// return new MybatisPlusInterceptor(); +// } + + @Bean + public PaginationInterceptor paginationInterceptor() { + PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); + // 设置请求的页面大于最大页后操作， true调回到首页，false 继续请求 默认false + // paginationInterceptor.setOverflow(false); + // 设置最大单页限制数量，默认 500 条，-1 不受限制 + // paginationInterceptor.setLimit(500); + // 开启 count 的 join 优化,只针对部分 left join + paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true)); + return paginationInterceptor; + } +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java index 7b73fc56..faa615fd 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java @@ -1,10 +1,12 @@ package com.wh.controller.api.input; -import com.wh.pojo.api.InStoreHouseMainDto; +import com.wh.pojo.api.*; import com.wh.service.api.instorehouse.InStorehouseMainService; import com.wh.vo.SysResult; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,6 +23,16 @@ public class InStoreHouseMainController { ResultBean resultBean = inStorehouseMainService.addInStorehouse(inStoreHouseMainDto); return resultBean; } + @PostMapping("listPage") + public ResultBean listPage(@RequestBody PagerQuery pq){ + PagerVo pv = inStorehouseMainService.listPage(pq); + ResultBean> r = ResultBean.fireSuccess(); + return r.setData(pv); + } + @GetMapping("getInStorehouse/{sid}") + public ResultBean getInStorehouse(@PathVariable(value = "sid") String sid){ + return inStorehouseMainService.getInStorehouse(sid); + } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java index 42bc1873..d2b71b8f 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java @@ -1,10 +1,11 @@ package com.wh.controller.api.output; -import com.wh.pojo.api.OutStorehouseMain; -import com.wh.pojo.api.OutStorehouseMainDto; +import com.wh.pojo.api.*; import com.wh.service.api.outstorehouse.OutStorehouseMainService; import com.wh.vo.SysResult; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,5 +23,15 @@ public class OutStorehouseMainController { ResultBean resultBean = outStorehouseMainService.addOutStorehouse(outStorehouseMainDto); return resultBean; } + @PostMapping("listPage") + public ResultBean listPage(@RequestBody PagerQuery pq){ + PagerVo pv = outStorehouseMainService.listPage(pq); + ResultBean> r = ResultBean.fireSuccess(); + return r.setData(pv); + } + @GetMapping("getOutStorehouse/{sid}") + public ResultBean getOutStorehouse(@PathVariable(value = "sid") String sid){ + return outStorehouseMainService.getOutStorehouse(sid); + } } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/prodstock/ProdStockController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/prodstock/ProdStockController.java index 4f0fbd41..4bc4f2f5 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/prodstock/ProdStockController.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/prodstock/ProdStockController.java @@ -1,11 +1,28 @@ package com.wh.controller.api.prodstock; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.wh.pojo.api.OutStorehouseMainQuery; +import com.wh.pojo.api.OutStorehouseVo; +import com.wh.pojo.api.ProdStockQuery; +import com.wh.pojo.api.ProdStockVo; +import com.wh.service.api.outstorehouse.OutStorehouseMainService; +import com.wh.service.api.prodstock.ProdStockService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @CrossOrigin @RequestMapping("/stock/") public class ProdStockController { + @Autowired + private ProdStockService prodStockService; + + @PostMapping("listPage") + public ResultBean listPage(@RequestBody PagerQuery pq){ + PagerVo pv = prodStockService.listPage(pq); + ResultBean> r = ResultBean.fireSuccess(); + return r.setData(pv); + } } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/instorehouse/InStorehouseMainMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/instorehouse/InStorehouseMainMapper.java index ae77ed8f..2e70c310 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/instorehouse/InStorehouseMainMapper.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/instorehouse/InStorehouseMainMapper.java @@ -1,9 +1,19 @@ package com.wh.mapper.api.instorehouse; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.wh.pojo.InStorehouse; +import com.wh.pojo.api.InStoreHouseMainVo; import com.wh.pojo.api.InStorehouseMain; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; - +@Mapper public interface InStorehouseMainMapper extends BaseMapper { + IPage selectPageVo(IPage page, + @Param(Constants.WRAPPER) Wrapper qw); + } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/outstorehouse/OutStorehouseMainMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/outstorehouse/OutStorehouseMainMapper.java index 73d8e941..c8557cb4 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/outstorehouse/OutStorehouseMainMapper.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/outstorehouse/OutStorehouseMainMapper.java @@ -1,9 +1,19 @@ package com.wh.mapper.api.outstorehouse; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.wh.pojo.api.InStoreHouseMainVo; import com.wh.pojo.api.InStorehouseMain; import com.wh.pojo.api.OutStorehouseMain; +import com.wh.pojo.api.OutStorehouseVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; - +@Mapper public interface OutStorehouseMainMapper extends BaseMapper { + IPage selectPageVo(IPage page, + @Param(Constants.WRAPPER) Wrapper qw); + } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseListingService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseListingService.java index e9da3c57..5f54391e 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseListingService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseListingService.java @@ -1,13 +1,16 @@ package com.wh.service.api.instorehouse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.wh.mapper.api.instorehouse.InStorehouseListingMapper; import com.wh.pojo.*; -import com.wh.pojo.api.InStorehouseListing; +import com.wh.pojo.api.*; import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service @@ -19,4 +22,21 @@ public class InStorehouseListingService extends MybatisBaseService selectInStorehouseListingsByMainSid(String sid) { + List list=baseMapper.selectList( + new QueryWrapper().eq("main_sid",sid)); + return list; + } + + private QueryWrapper createQueryWrapper(OutStorehouseMainQuery query) { + // todo: 这里根据具体业务调整查询条件 + QueryWrapper qw = new QueryWrapper<>(); + + if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getApplicationDateStart())) { + qw.eq("main_sid", query.getMainSid()); + } + + return qw; + } } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java index bb6bee25..1378f327 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java @@ -1,12 +1,15 @@ package com.wh.service.api.instorehouse; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.wh.mapper.api.instorehouse.InStorehouseMainMapper; import com.wh.pojo.api.*; import com.wh.service.api.prodstock.ProdStockService; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -50,7 +53,39 @@ public class InStorehouseMainService extends MybatisBaseService listPage(PagerQuery pq) { + InStorehouseMainQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + private QueryWrapper createQueryWrapper(InStorehouseMainQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wraInStorehouseMainpper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getNo())) { + qw.like("no", query.getNo()); + } + if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getApplicationDateStart())) { + qw.ge("application_date", query.getApplicationDateStart()); + } + if (StrUtil.isNotBlank(query.getApplicationDateEnd())) { + qw.lt("application_date", query.getApplicationDateEnd()); + } + if (StrUtil.isNotBlank(query.getCreatorName())) { + qw.like("creator_name", query.getCreatorName()); + } + if (StrUtil.isNotBlank(query.getCusterName())) { + qw.like("custer_name", query.getCusterName()); + } + if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getStoreHouseName())) { + qw.like("store_house_name", query.getStoreHouseName()); + } + return qw; + } /** * 新增商品信息 * @param in @@ -137,4 +172,18 @@ public class InStorehouseMainService extends MybatisBaseService proStocks = prodStockService.getProStocks(pq); return proStocks; } + + public ResultBean getInStorehouse(String sid) { + ResultBean r = ResultBean.fireFail(); + InStorehouseMain inStorehouseMain = baseMapper.selectOne( + new QueryWrapper().eq("sid",sid)); + if(inStorehouseMain==null){ + return r.setMsg("数据不存在"); + } + InStoreHouseMainDetailVo ihmdv=new InStoreHouseMainDetailVo(); + BeanUtils.copyProperties(inStorehouseMain,ihmdv); + List list=inStorehouseListingService.selectInStorehouseListingsByMainSid(sid); + ihmdv.setList(list); + return ResultBean.fireSuccess().setData(ihmdv); + } } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseListingService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseListingService.java index aa5927cf..e35e742a 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseListingService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseListingService.java @@ -1,17 +1,26 @@ package com.wh.service.api.outstorehouse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.wh.mapper.api.instorehouse.InStorehouseMainMapper; import com.wh.mapper.api.outstorehouse.OutStorehouseListingMapper; import com.wh.mapper.api.outstorehouse.OutStorehouseMainMapper; +import com.wh.pojo.api.InStorehouseListing; import com.wh.pojo.api.InStorehouseMain; import com.wh.pojo.api.OutStorehouseListing; import com.wh.pojo.api.OutStorehouseMain; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class OutStorehouseListingService extends MybatisBaseService { + public List selectInStorehouseListingsByMainSid(String sid) { + List list=baseMapper.selectList( + new QueryWrapper().eq("main_sid",sid)); + return list; + } } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseMainService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseMainService.java index 2ec30abe..1a1be8e1 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseMainService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseMainService.java @@ -1,7 +1,9 @@ package com.wh.service.api.outstorehouse; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wh.api.Api; @@ -20,6 +22,7 @@ import com.wh.service.api.instorehouse.InStorehouseListingService; import com.wh.service.api.prodstock.ProdStockService; import com.wh.vo.PageResult; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -168,4 +171,49 @@ public class OutStorehouseMainService extends MybatisBaseService proStocks = prodStockService.getProStocks(pq); return proStocks; } + + public PagerVo listPage(PagerQuery pq) { + OutStorehouseMainQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + private QueryWrapper createQueryWrapper(OutStorehouseMainQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wraInStorehouseMainpper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getNo())) { + qw.like("no", query.getNo()); + } + if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getApplicationDateStart())) { + qw.ge("application_date", query.getApplicationDateStart()); + } + if (StrUtil.isNotBlank(query.getApplicationDateEnd())) { + qw.lt("application_date", query.getApplicationDateEnd()); + } + if (StrUtil.isNotBlank(query.getCreatorName())) { + qw.like("creator_name", query.getCreatorName()); + } + if (StrUtil.isNotBlank(query.getCusterName())) { + qw.like("custer_name", query.getCusterName()); + } + return qw; + } + + public ResultBean getOutStorehouse(String sid) { + ResultBean r = ResultBean.fireFail(); + OutStorehouseMain outStorehouseMain = baseMapper.selectOne( + new QueryWrapper().eq("sid",sid)); + if(outStorehouseMain==null){ + return r.setMsg("数据不存在"); + } + OutStorehouseDetailVo osv=new OutStorehouseDetailVo(); + BeanUtils.copyProperties(outStorehouseMain,osv); + List list=outStorehouseListingService.selectInStorehouseListingsByMainSid(sid); + osv.setList(list); + return ResultBean.fireSuccess().setData(osv); + } } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java index d718cd30..10ef39ad 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java @@ -29,7 +29,14 @@ public class ProdStockService extends MybatisBaseService listPage(PagerQuery pq) { + ProdStockQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage prodStockIPage = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(prodStockIPage, null); + return p; + } private QueryWrapper createQueryWrapper(ProdStockQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); diff --git a/warehousing-system/project/wh-manage/src/main/resources/mappers/InStorehouseMainMapper.xml b/warehousing-system/project/wh-manage/src/main/resources/mappers/InStorehouseMainMapper.xml new file mode 100644 index 00000000..ce16b0e7 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/resources/mappers/InStorehouseMainMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/resources/mappers/OutStorehouseMainMapper.xml b/warehousing-system/project/wh-manage/src/main/resources/mappers/OutStorehouseMainMapper.xml new file mode 100644 index 00000000..999085fd --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/resources/mappers/OutStorehouseMainMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file