From f97623dff1a0ede6b0eb835dbd6d8ef6cede5a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Mon, 14 Jul 2025 17:57:30 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E8=8F=9C=E5=8D=95=202.=E4=BC=98=E5=8C=96=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ErpMaterialPickingInfoController.java | 16 +- .../ErpMaterialPutawayInfoController.java | 10 +- .../ErpMaterialReturnsInfoController.java | 12 +- .../business/domain/ErpMaterialReturns.java | 4 +- .../domain/bo/ErpMaterialPickingInfoBo.java | 9 +- .../domain/bo/ErpMaterialReturnsBo.java | 4 +- .../domain/vo/ErpMaterialPickingInfoVo.java | 44 ++- .../domain/vo/ErpMaterialPutawayInfoVo.java | 1 + .../domain/vo/ErpMaterialReturnsInfoVo.java | 39 +- .../domain/vo/ErpMaterialReturnsVo.java | 4 +- .../mapper/ErpMaterialPickingInfoMapper.java | 23 ++ .../mapper/ErpMaterialReturnsInfoMapper.java | 23 ++ .../IErpMaterialPickingInfoService.java | 4 +- .../IErpMaterialPutawayInfoService.java | 2 +- .../IErpMaterialReturnsInfoService.java | 4 +- .../ErpMaterialPickingInfoServiceImpl.java | 24 +- .../ErpMaterialPutawayInfoServiceImpl.java | 5 +- .../ErpMaterialReturnsInfoServiceImpl.java | 22 +- .../impl/ErpMaterialReturnsServiceImpl.java | 6 +- .../mapper/ErpMaterialPickingInfoMapper.xml | 29 +- .../mapper/ErpMaterialReturnsInfoMapper.xml | 40 +- .../src/api/business/materialPickingInfo.js | 9 + .../src/api/business/materialPutawayInfo.js | 9 + .../src/api/business/materialReturnsInfo.js | 9 + .../src/views/business/material/index.vue | 2 +- .../views/business/materialPutaway/index.vue | 6 +- .../views/business/materialStock/index.vue | 347 ++++++++++++++++++ .../src/views/business/repairForm/index.vue | 14 +- 28 files changed, 617 insertions(+), 104 deletions(-) create mode 100644 maintain-ui/src/views/business/materialStock/index.vue diff --git a/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialPickingInfoController.java b/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialPickingInfoController.java index 5d11236..472396f 100644 --- a/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialPickingInfoController.java +++ b/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialPickingInfoController.java @@ -3,6 +3,9 @@ package com.maintain.business.controller; import java.util.List; import java.util.Arrays; +import com.maintain.business.domain.ErpMaterialPickingInfo; +import com.maintain.business.domain.bo.ErpMaterialReturnsInfoBo; +import com.maintain.business.domain.vo.ErpMaterialReturnsInfoVo; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -43,7 +46,16 @@ public class ErpMaterialPickingInfoController extends BaseController { @SaCheckPermission("business:materialPickingInfo:list") @GetMapping("/list") public TableDataInfo list(ErpMaterialPickingInfoBo bo, PageQuery pageQuery) { - return iErpMaterialPickingInfoService.queryPageList(bo, pageQuery); + return iErpMaterialPickingInfoService.customQueryPageList(bo, pageQuery); + } + + + /** + * 查询物料退货明细列表 + */ + @GetMapping("/listAll") + public R> listAll(ErpMaterialPickingInfoBo bo) { + return R.ok(iErpMaterialPickingInfoService.customQueryList(bo)); } /** @@ -53,7 +65,7 @@ public class ErpMaterialPickingInfoController extends BaseController { @Log(title = "物料出库明细", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ErpMaterialPickingInfoBo bo, HttpServletResponse response) { - List list = iErpMaterialPickingInfoService.queryList(bo); + List list = iErpMaterialPickingInfoService.customQueryList(bo); ExcelUtil.exportExcel(list, "物料出库明细", ErpMaterialPickingInfoVo.class, response); } diff --git a/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialPutawayInfoController.java b/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialPutawayInfoController.java index 1334550..5d833c9 100644 --- a/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialPutawayInfoController.java +++ b/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialPutawayInfoController.java @@ -46,6 +46,14 @@ public class ErpMaterialPutawayInfoController extends BaseController { return iErpMaterialPutawayInfoService.customQueryPageList(bo, pageQuery); } + /** + * 查询物料入库明细列表 + */ + @GetMapping("/listAll") + public R> list(ErpMaterialPutawayInfoBo bo) { + return R.ok(iErpMaterialPutawayInfoService.customQueryList(bo)); + } + /** * 导出物料入库明细列表 */ @@ -53,7 +61,7 @@ public class ErpMaterialPutawayInfoController extends BaseController { @Log(title = "物料入库明细", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ErpMaterialPutawayInfoBo bo, HttpServletResponse response) { - List list = iErpMaterialPutawayInfoService.queryList(bo); + List list = iErpMaterialPutawayInfoService.customQueryList(bo); ExcelUtil.exportExcel(list, "物料入库明细", ErpMaterialPutawayInfoVo.class, response); } diff --git a/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialReturnsInfoController.java b/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialReturnsInfoController.java index acb0c27..600d90d 100644 --- a/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialReturnsInfoController.java +++ b/maintain-business/src/main/java/com/maintain/business/controller/ErpMaterialReturnsInfoController.java @@ -43,7 +43,15 @@ public class ErpMaterialReturnsInfoController extends BaseController { @SaCheckPermission("business:materialReturnsInfo:list") @GetMapping("/list") public TableDataInfo list(ErpMaterialReturnsInfoBo bo, PageQuery pageQuery) { - return iErpMaterialReturnsInfoService.queryPageList(bo, pageQuery); + return iErpMaterialReturnsInfoService.customQueryPageList(bo, pageQuery); + } + + /** + * 查询物料退货明细列表 + */ + @GetMapping("/listAll") + public R> listAll(ErpMaterialReturnsInfoBo bo) { + return R.ok(iErpMaterialReturnsInfoService.customQueryList(bo)); } /** @@ -53,7 +61,7 @@ public class ErpMaterialReturnsInfoController extends BaseController { @Log(title = "物料退货明细", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ErpMaterialReturnsInfoBo bo, HttpServletResponse response) { - List list = iErpMaterialReturnsInfoService.queryList(bo); + List list = iErpMaterialReturnsInfoService.customQueryList(bo); ExcelUtil.exportExcel(list, "物料退货明细", ErpMaterialReturnsInfoVo.class, response); } diff --git a/maintain-business/src/main/java/com/maintain/business/domain/ErpMaterialReturns.java b/maintain-business/src/main/java/com/maintain/business/domain/ErpMaterialReturns.java index 688a317..dba2f64 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/ErpMaterialReturns.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/ErpMaterialReturns.java @@ -33,7 +33,7 @@ public class ErpMaterialReturns extends BaseEntity { /** * 退货单号 */ - private String returnsNumber; + private String returnsCode; /** * 退货金额 */ @@ -49,7 +49,7 @@ public class ErpMaterialReturns extends BaseEntity { /** * 入库单号 */ - private String putawayNumber; + private String putawayCode; /** * 订单单号 */ diff --git a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialPickingInfoBo.java b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialPickingInfoBo.java index b1c2d6c..c28fb97 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialPickingInfoBo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialPickingInfoBo.java @@ -9,6 +9,8 @@ import javax.validation.constraints.*; import java.util.Date; import java.math.BigDecimal; +import java.util.List; + import com.maintain.common.core.domain.BaseEntity; /** @@ -133,9 +135,14 @@ public class ErpMaterialPickingInfoBo extends BaseEntity { private BigDecimal money; /** - * 状态（1已领料 2已退料） + * 状态（1登记中 2已完成 3已退料） */ private Integer state; + /** + * 状态（1登记中 2已完成 3已退料） + */ + private List stateList; + } diff --git a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialReturnsBo.java b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialReturnsBo.java index 24d08d6..66c5443 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialReturnsBo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialReturnsBo.java @@ -34,7 +34,7 @@ public class ErpMaterialReturnsBo extends BaseEntity { /** * 退货单号 */ - private String returnsNumber; + private String returnsCode; /** * 退货金额 @@ -57,7 +57,7 @@ public class ErpMaterialReturnsBo extends BaseEntity { /** * 入库单号 */ - private String putawayNumber; + private String putawayCode; /** * 订单单号 diff --git a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialPickingInfoVo.java b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialPickingInfoVo.java index 8f327cb..ba54908 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialPickingInfoVo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialPickingInfoVo.java @@ -26,44 +26,32 @@ public class ErpMaterialPickingInfoVo implements Serializable { /** * 主键 */ - @ExcelProperty(value = "主键") private Long id; /** * 报修单ID */ - @ExcelProperty(value = "报修单ID") private Long repairFormId; /** - * 出库单ID + * 报修单号 */ - @ExcelProperty(value = "出库单ID") - private Long pickingId; + private String repairNumber; /** - * 物资分类ID + * 退料单号 */ - @ExcelProperty(value = "物资分类ID") - private Long materialTypeId; + private String returnNumber; /** - * 物资分类名称 + * 出库单号 */ - @ExcelProperty(value = "物资分类名称") - private String materialTypeName; + private String outNumber; /** - * 仓库货位类型 - */ - @ExcelProperty(value = "仓库货位类型") - private String warehouseLocationType; - - /** - * 仓库货位ID + * 出库单ID */ - @ExcelProperty(value = "仓库货位ID") - private Long warehouseLocationId; + private Long pickingId; /** * 供应商ID @@ -80,7 +68,6 @@ public class ErpMaterialPickingInfoVo implements Serializable { /** * 物料ID */ - @ExcelProperty(value = "物料ID") private Long materialId; /** @@ -110,8 +97,7 @@ public class ErpMaterialPickingInfoVo implements Serializable { /** * 质保期（月） */ - @ExcelProperty(value = "质保期", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "月=") + @ExcelProperty(value = "质保期(月)") private Integer materialWarrantyPeriod; /** @@ -151,6 +137,18 @@ public class ErpMaterialPickingInfoVo implements Serializable { @ExcelDictFormat(readConverterExp = "1=已领料,2=已退料") private Integer state; + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private String createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + /** * 可选价格列表 */ diff --git a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialPutawayInfoVo.java b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialPutawayInfoVo.java index 2e9aecd..651ed67 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialPutawayInfoVo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialPutawayInfoVo.java @@ -123,6 +123,7 @@ public class ErpMaterialPutawayInfoVo implements Serializable { * 质保期（月） */ @ExcelProperty(value = "质保期(月)") + @ColumnWidth(14) private Integer materialWarrantyPeriod; /** diff --git a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialReturnsInfoVo.java b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialReturnsInfoVo.java index 001e2b1..5423199 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialReturnsInfoVo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialReturnsInfoVo.java @@ -33,31 +33,21 @@ public class ErpMaterialReturnsInfoVo implements Serializable { private Long returnsId; /** - * 入库表明细ID - */ - private Long putawayInfoId; - - /** - * 物资分类ID - */ - private Long materialTypeId; - - /** - * 物资分类名称 + * 退货单号 */ - @ExcelProperty(value = "物资分类名称") - private String materialTypeName; + @ExcelProperty(value = "退货单号") + private String returnsCode; /** - * 仓库货位ID + * 入库单号 */ - private Long warehouseLocationId; + @ExcelProperty(value = "入库单号") + private String putawayCode; /** - * 仓库货位类型 + * 入库表明细ID */ - @ExcelProperty(value = "仓库货位类型") - private String warehouseLocationType; + private Long putawayInfoId; /** * 供应商ID @@ -102,7 +92,7 @@ public class ErpMaterialReturnsInfoVo implements Serializable { /** * 质保期（月） */ - @ExcelProperty(value = "质保期", converter = ExcelDictConvert.class) + @ExcelProperty(value = "质保期（月）") private Integer materialWarrantyPeriod; /** @@ -135,5 +125,16 @@ public class ErpMaterialReturnsInfoVo implements Serializable { @ExcelProperty(value = "退货金额") private BigDecimal returnsMoney; + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private String createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; } diff --git a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialReturnsVo.java b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialReturnsVo.java index 6ec0fb4..f4d8ac0 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialReturnsVo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialReturnsVo.java @@ -43,13 +43,13 @@ public class ErpMaterialReturnsVo implements Serializable { * 退货单号 */ @ExcelProperty(value = "退货单号") - private String returnsNumber; + private String returnsCode; /** * 入库单号 */ @ExcelProperty(value = "入库单号") - private String putawayNumber; + private String putawayCode; /** * 到货单号 diff --git a/maintain-business/src/main/java/com/maintain/business/mapper/ErpMaterialPickingInfoMapper.java b/maintain-business/src/main/java/com/maintain/business/mapper/ErpMaterialPickingInfoMapper.java index b1cc0fd..8679c12 100644 --- a/maintain-business/src/main/java/com/maintain/business/mapper/ErpMaterialPickingInfoMapper.java +++ b/maintain-business/src/main/java/com/maintain/business/mapper/ErpMaterialPickingInfoMapper.java @@ -1,8 +1,16 @@ package com.maintain.business.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.maintain.business.domain.ErpMaterialPickingInfo; +import com.maintain.business.domain.ErpMaterialReturnsInfo; import com.maintain.business.domain.vo.ErpMaterialPickingInfoVo; +import com.maintain.business.domain.vo.ErpMaterialReturnsInfoVo; import com.maintain.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 物料出库明细Mapper接口 @@ -12,4 +20,19 @@ import com.maintain.common.core.mapper.BaseMapperPlus; */ public interface ErpMaterialPickingInfoMapper extends BaseMapperPlus { + + /** + * 自定义分页查询 + * @param page + * @param queryWrapper + * @return + */ + Page customQueryPageList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 自定义查询 + * @param queryWrapper + */ + List customQueryList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + } diff --git a/maintain-business/src/main/java/com/maintain/business/mapper/ErpMaterialReturnsInfoMapper.java b/maintain-business/src/main/java/com/maintain/business/mapper/ErpMaterialReturnsInfoMapper.java index 1cb760a..3b4aa1c 100644 --- a/maintain-business/src/main/java/com/maintain/business/mapper/ErpMaterialReturnsInfoMapper.java +++ b/maintain-business/src/main/java/com/maintain/business/mapper/ErpMaterialReturnsInfoMapper.java @@ -1,8 +1,16 @@ package com.maintain.business.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.maintain.business.domain.ErpMaterialPutawayInfo; import com.maintain.business.domain.ErpMaterialReturnsInfo; +import com.maintain.business.domain.vo.ErpMaterialPutawayInfoVo; import com.maintain.business.domain.vo.ErpMaterialReturnsInfoVo; import com.maintain.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 物料退货明细Mapper接口 @@ -12,4 +20,19 @@ import com.maintain.common.core.mapper.BaseMapperPlus; */ public interface ErpMaterialReturnsInfoMapper extends BaseMapperPlus { + /** + * 自定义分页查询 + * @param page + * @param queryWrapper + * @return + */ + Page customQueryPageList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 自定义查询 + * @param queryWrapper + */ + List customQueryList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + + } diff --git a/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialPickingInfoService.java b/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialPickingInfoService.java index 6cd173b..09b04b7 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialPickingInfoService.java +++ b/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialPickingInfoService.java @@ -25,12 +25,12 @@ public interface IErpMaterialPickingInfoService { /** * 查询物料出库明细列表 */ - TableDataInfo queryPageList(ErpMaterialPickingInfoBo bo, PageQuery pageQuery); + TableDataInfo customQueryPageList(ErpMaterialPickingInfoBo bo, PageQuery pageQuery); /** * 查询物料出库明细列表 */ - List queryList(ErpMaterialPickingInfoBo bo); + List customQueryList(ErpMaterialPickingInfoBo bo); /** * 新增物料出库明细 diff --git a/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialPutawayInfoService.java b/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialPutawayInfoService.java index ffa4464..14b9c12 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialPutawayInfoService.java +++ b/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialPutawayInfoService.java @@ -35,7 +35,7 @@ public interface IErpMaterialPutawayInfoService { /** * 查询物料入库明细列表 */ - List queryList(ErpMaterialPutawayInfoBo bo); + List customQueryList(ErpMaterialPutawayInfoBo bo); /** * 新增物料入库明细 diff --git a/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialReturnsInfoService.java b/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialReturnsInfoService.java index a0865d6..a1ba05f 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialReturnsInfoService.java +++ b/maintain-business/src/main/java/com/maintain/business/service/IErpMaterialReturnsInfoService.java @@ -25,12 +25,12 @@ public interface IErpMaterialReturnsInfoService { /** * 查询物料退货明细列表 */ - TableDataInfo queryPageList(ErpMaterialReturnsInfoBo bo, PageQuery pageQuery); + TableDataInfo customQueryPageList(ErpMaterialReturnsInfoBo bo, PageQuery pageQuery); /** * 查询物料退货明细列表 */ - List queryList(ErpMaterialReturnsInfoBo bo); + List customQueryList(ErpMaterialReturnsInfoBo bo); /** * 新增物料退货明细 diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingInfoServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingInfoServiceImpl.java index 01c824a..dd27e91 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingInfoServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingInfoServiceImpl.java @@ -1,6 +1,10 @@ package com.maintain.business.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.maintain.business.domain.ErpMaterialReturnsInfo; +import com.maintain.business.domain.bo.ErpMaterialReturnsInfoBo; +import com.maintain.business.domain.vo.ErpMaterialReturnsInfoVo; import com.maintain.common.core.page.TableDataInfo; import com.maintain.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -42,19 +46,25 @@ public class ErpMaterialPickingInfoServiceImpl implements IErpMaterialPickingInf * 查询报修单-出库单明细列表 */ @Override - public TableDataInfo queryPageList(ErpMaterialPickingInfoBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo customQueryPageList(ErpMaterialPickingInfoBo bo, PageQuery pageQuery) { + Page result = baseMapper.customQueryPageList(pageQuery.build(), this.buildCustomQueryWrapper(bo)); return TableDataInfo.build(result); } /** - * 查询报修单-出库单明细列表 + * 查询物料退货明细列表 */ @Override - public List queryList(ErpMaterialPickingInfoBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + public List customQueryList(ErpMaterialPickingInfoBo bo) { + return baseMapper.customQueryList(this.buildCustomQueryWrapper(bo)); + } + + private QueryWrapper buildCustomQueryWrapper(ErpMaterialPickingInfoBo bo) { + QueryWrapper query = Wrappers.query(); + query.eq(null != bo.getMaterialId(),"empi.material_id", bo.getMaterialId()) + .in(!bo.getStateList().isEmpty(),"empi.state", bo.getStateList()); + query.orderByDesc("empi.create_time"); + return query; } private LambdaQueryWrapper buildQueryWrapper(ErpMaterialPickingInfoBo bo) { diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayInfoServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayInfoServiceImpl.java index 2187fce..239a037 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayInfoServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayInfoServiceImpl.java @@ -72,14 +72,15 @@ public class ErpMaterialPutawayInfoServiceImpl implements IErpMaterialPutawayInf * 查询物料入库明细列表 */ @Override - public List queryList(ErpMaterialPutawayInfoBo bo) { + public List customQueryList(ErpMaterialPutawayInfoBo bo) { return baseMapper.customQueryList(this.buildCustomQueryWrapper(bo)); } private QueryWrapper buildCustomQueryWrapper(ErpMaterialPutawayInfoBo bo) { QueryWrapper query = Wrappers.query(); - query.like(null != bo.getPutawayCode(),"emp.putaway_number", bo.getPutawayCode()) + query.like(null != bo.getPutawayCode(),"emp.putaway_code", bo.getPutawayCode()) .like(null != bo.getVendorName(),"empi.vendor_name", bo.getVendorName()) + .eq(null != bo.getMaterialId(),"empi.material_id", bo.getMaterialId()) .like(null != bo.getMaterialCode(),"empi.material_code", bo.getMaterialCode()) .like(null != bo.getMaterialName(),"empi.material_name", bo.getMaterialName()); query.orderByDesc("empi.create_time"); diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsInfoServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsInfoServiceImpl.java index 28b72f1..4d26305 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsInfoServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsInfoServiceImpl.java @@ -1,6 +1,9 @@ package com.maintain.business.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.maintain.business.domain.ErpMaterialPutawayInfo; +import com.maintain.business.domain.bo.ErpMaterialPutawayInfoBo; import com.maintain.common.utils.StringUtils; import com.maintain.common.core.page.TableDataInfo; import com.maintain.common.core.domain.PageQuery; @@ -43,19 +46,24 @@ public class ErpMaterialReturnsInfoServiceImpl implements IErpMaterialReturnsInf * 查询物料退货明细列表 */ @Override - public TableDataInfo queryPageList(ErpMaterialReturnsInfoBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); + public TableDataInfo customQueryPageList(ErpMaterialReturnsInfoBo bo, PageQuery pageQuery) { + Page returnsInfoVoPage = baseMapper.customQueryPageList(pageQuery.build(), this.buildCustomQueryWrapper(bo)); + return TableDataInfo.build(returnsInfoVoPage); } /** * 查询物料退货明细列表 */ @Override - public List queryList(ErpMaterialReturnsInfoBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + public List customQueryList(ErpMaterialReturnsInfoBo bo) { + return baseMapper.customQueryList(this.buildCustomQueryWrapper(bo)); + } + + private QueryWrapper buildCustomQueryWrapper(ErpMaterialReturnsInfoBo bo) { + QueryWrapper query = Wrappers.query(); + query.eq(null != bo.getMaterialId(),"emri.material_id", bo.getMaterialId()); + query.orderByDesc("emri.create_time"); + return query; } private LambdaQueryWrapper buildQueryWrapper(ErpMaterialReturnsInfoBo bo) { diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsServiceImpl.java index 112a436..7d335b5 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsServiceImpl.java @@ -90,8 +90,8 @@ public class ErpMaterialReturnsServiceImpl implements IErpMaterialReturnsService lqw.eq(bo.getReturnsMoney() != null, ErpMaterialReturns::getReturnsMoney, bo.getReturnsMoney()); lqw.eq(bo.getReturnsTime() != null, ErpMaterialReturns::getReturnsTime, bo.getReturnsTime()); lqw.eq(bo.getPutawayId() != null, ErpMaterialReturns::getPutawayId, bo.getPutawayId()); - lqw.like(StringUtils.isNotBlank(bo.getReturnsNumber()), ErpMaterialReturns::getReturnsNumber, bo.getReturnsNumber()); - lqw.like(StringUtils.isNotBlank(bo.getPutawayNumber()), ErpMaterialReturns::getPutawayNumber, bo.getPutawayNumber()); + lqw.like(StringUtils.isNotBlank(bo.getReturnsCode()), ErpMaterialReturns::getReturnsCode, bo.getReturnsCode()); + lqw.like(StringUtils.isNotBlank(bo.getReturnsCode()), ErpMaterialReturns::getReturnsCode, bo.getReturnsCode()); lqw.like(StringUtils.isNotBlank(bo.getOrderNumber()), ErpMaterialReturns::getOrderNumber, bo.getOrderNumber()); lqw.like(StringUtils.isNotBlank(bo.getArrivalNumber()), ErpMaterialReturns::getArrivalNumber, bo.getArrivalNumber()); lqw.eq(StringUtils.isNotBlank(bo.getPutawayType()), ErpMaterialReturns::getPutawayType, bo.getPutawayType()); @@ -116,7 +116,7 @@ public class ErpMaterialReturnsServiceImpl implements IErpMaterialReturnsService ErpMaterialReturns materialReturns = BeanUtil.toBean(materialPutawayVo, ErpMaterialReturns.class); materialReturns.setId(null); materialReturns.setPutawayId(bo.getPutawayId()); - materialReturns.setReturnsNumber(RedisUtils.generateNextNumber("TH")); + materialReturns.setReturnsCode(RedisUtils.generateNextNumber("TH")); materialReturns.setReturnsMoney(bo.getReturnsMoney()); materialReturns.setReturnsTime(bo.getReturnsTime()); materialReturns.setCreateDeptId(LoginHelper.getDeptId()); diff --git a/maintain-business/src/main/resources/mapper/ErpMaterialPickingInfoMapper.xml b/maintain-business/src/main/resources/mapper/ErpMaterialPickingInfoMapper.xml index 27549ed..d6c2891 100644 --- a/maintain-business/src/main/resources/mapper/ErpMaterialPickingInfoMapper.xml +++ b/maintain-business/src/main/resources/mapper/ErpMaterialPickingInfoMapper.xml @@ -4,14 +4,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - @@ -28,9 +24,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + + + + SELECT + empi.id, empi.repair_form_id, empi.picking_id, empi.vendor_id, empi.vendor_name, empi.material_id, empi.material_code, + empi.material_name,empi.material_specifications, empi.material_unit, empi.material_warranty_period, empi.reference_price, empi.selling_price, empi.collect_number, + empi.price, empi.money, empi.state, empi.create_by, empi.create_time, emp.return_number, emp.repair_number, emp.out_number + FROM erp_material_picking_info empi + LEFT JOIN erp_material_picking emp ON empi.picking_id = emp.id + + + + + diff --git a/maintain-business/src/main/resources/mapper/ErpMaterialReturnsInfoMapper.xml b/maintain-business/src/main/resources/mapper/ErpMaterialReturnsInfoMapper.xml index 7bdb6b2..2897367 100644 --- a/maintain-business/src/main/resources/mapper/ErpMaterialReturnsInfoMapper.xml +++ b/maintain-business/src/main/resources/mapper/ErpMaterialReturnsInfoMapper.xml @@ -3,14 +3,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + - - - - + + @@ -26,9 +23,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + SELECT + emri.id, + emri.returns_id, + emri.putaway_info_id, + emri.vendor_id, + emri.vendor_name, + emri.material_id, + emri.material_code, + emri.material_name, + emri.material_specifications, + emri.material_unit, + emri.material_warranty_period, + emri.reference_price, + emri.selling_price, + emri.returns_number, + emri.returns_price, emri.returns_money, emri.create_by, emri.create_time,emr.returns_code,emr.putaway_id,emr.putaway_code + FROM erp_material_returns_info emri + LEFT JOIN erp_material_returns emr ON emri.returns_id = emr.id + + + + diff --git a/maintain-ui/src/api/business/materialPickingInfo.js b/maintain-ui/src/api/business/materialPickingInfo.js index 05a1d91..7f653a4 100644 --- a/maintain-ui/src/api/business/materialPickingInfo.js +++ b/maintain-ui/src/api/business/materialPickingInfo.js @@ -9,6 +9,15 @@ export function listMaterialPickingInfo(query) { }) } +// 查询物料出库明细列表 +export function listMaterialPickingInfoAll(query) { + return request({ + url: '/business/materialPickingInfo/listAll', + method: 'get', + params: query + }) +} + // 查询物料出库明细详细 export function getMaterialPickingInfo(id) { return request({ diff --git a/maintain-ui/src/api/business/materialPutawayInfo.js b/maintain-ui/src/api/business/materialPutawayInfo.js index 1f5526c..7f62688 100644 --- a/maintain-ui/src/api/business/materialPutawayInfo.js +++ b/maintain-ui/src/api/business/materialPutawayInfo.js @@ -9,6 +9,15 @@ export function listMaterialPutawayInfo(query) { }) } +// 查询物料入库明细列表 +export function listMaterialPutawayInfoAll(query) { + return request({ + url: '/business/materialPutawayInfo/listAll', + method: 'get', + params: query + }) +} + // 查询物料入库明细详细 export function getMaterialPutawayInfo(id) { return request({ diff --git a/maintain-ui/src/api/business/materialReturnsInfo.js b/maintain-ui/src/api/business/materialReturnsInfo.js index 1ec5de6..2c9e816 100644 --- a/maintain-ui/src/api/business/materialReturnsInfo.js +++ b/maintain-ui/src/api/business/materialReturnsInfo.js @@ -9,6 +9,15 @@ export function listMaterialReturnsInfo(query) { }) } +// 查询物料退货明细列表 +export function listMaterialReturnsInfoAll(query) { + return request({ + url: '/business/materialReturnsInfo/listAll', + method: 'get', + params: query + }) +} + // 查询物料退货明细详细 export function getMaterialReturnsInfo(id) { return request({ diff --git a/maintain-ui/src/views/business/material/index.vue b/maintain-ui/src/views/business/material/index.vue index fb317fa..1774df4 100644 --- a/maintain-ui/src/views/business/material/index.vue +++ b/maintain-ui/src/views/business/material/index.vue @@ -153,7 +153,7 @@ - +