From 3882cae28bb7b463320243aaa5a8c21935396f0e Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Tue, 12 Aug 2025 15:19:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsOrder 模型中添加 customerId 字段 - 更新 WmsOrderBo 和 WmsOrderVo 以包含 customerId - 修改订单查询相关方法，支持按客户 ID 查询 -优化订单列表展示，使用 images 字段替代 ossIds --- klp-ui/src/views/wms/rxgood/detail.vue | 4 +- .../main/java/com/klp/domain/WmsOrder.java | 4 ++ .../java/com/klp/domain/bo/WmsOrderBo.java | 5 +++ .../java/com/klp/domain/vo/WmsOrderVo.java | 6 +++ .../java/com/klp/mapper/WmsOrderMapper.java | 5 +++ .../klp/service/impl/WmsOrderServiceImpl.java | 37 ++++++++++++------- .../resources/mapper/klp/WmsOrderMapper.xml | 18 +++++++++ 7 files changed, 64 insertions(+), 15 deletions(-) diff --git a/klp-ui/src/views/wms/rxgood/detail.vue b/klp-ui/src/views/wms/rxgood/detail.vue index 042b0f94..5e0f9bb8 100644 --- a/klp-ui/src/views/wms/rxgood/detail.vue +++ b/klp-ui/src/views/wms/rxgood/detail.vue @@ -101,7 +101,7 @@ @@ -578,7 +578,7 @@ export default { }, /** 查看图片详情 */ handleImageDetail(row) { - this.imageList = row.ossIds; + this.imageList = row.images; this.imageDrawer = true; this.getImageList() }, diff --git a/klp-wms/src/main/java/com/klp/domain/WmsOrder.java b/klp-wms/src/main/java/com/klp/domain/WmsOrder.java index 731dd1b3..c21ab55b 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsOrder.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsOrder.java @@ -28,6 +28,10 @@ public class WmsOrder extends BaseEntity { * 订单编号 */ private String orderCode; + /** + * 客户ID + */ + private Long customerId; /** * 客户名称 */ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderBo.java index 4105be3d..b7aa4126 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderBo.java @@ -27,6 +27,11 @@ public class WmsOrderBo extends BaseEntity { */ private String orderCode; + /** + * 客户ID + */ + private Long customerId; + /** * 客户名称 */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderVo.java index e0765370..07a84304 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderVo.java @@ -31,6 +31,12 @@ public class WmsOrderVo { @ExcelProperty(value = "订单编号") private String orderCode; + /** + * 客户ID + */ + @ExcelProperty(value = "客户ID") + private Long customerId; + /** * 客户名称 */ diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsOrderMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsOrderMapper.java index faaf1a5b..af621c13 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsOrderMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsOrderMapper.java @@ -1,8 +1,12 @@ package com.klp.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.domain.WmsOrder; import com.klp.domain.vo.WmsOrderVo; import com.klp.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; /** * 订单主Mapper接口 @@ -12,4 +16,5 @@ import com.klp.common.core.mapper.BaseMapperPlus; */ public interface WmsOrderMapper extends BaseMapperPlus { + Page selectVoPlusPage(Page page, @Param("ew") Wrapper wrapper); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java index 5bbe5438..911b181d 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.klp.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -44,8 +45,8 @@ public class WmsOrderServiceImpl implements IWmsOrderService { */ @Override public TableDataInfo queryPageList(WmsOrderBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + QueryWrapper lqw = buildQueryWrapperPlus(bo); + Page result = baseMapper.selectVoPlusPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } /** @@ -53,30 +54,40 @@ public class WmsOrderServiceImpl implements IWmsOrderService { */ @Override public TableDataInfo queryPageListByStatus(WmsOrderBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapperByStatus(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + QueryWrapper lqw = buildQueryWrapperByStatus(bo); + Page result = baseMapper.selectVoPlusPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } - private LambdaQueryWrapper buildQueryWrapperByStatus(WmsOrderBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getOrderCode()), WmsOrder::getOrderCode, bo.getOrderCode()); - lqw.like(StringUtils.isNotBlank(bo.getCustomerName()), WmsOrder::getCustomerName, bo.getCustomerName()); - lqw.eq(StringUtils.isNotBlank(bo.getSalesManager()), WmsOrder::getSalesManager, bo.getSalesManager()); + private QueryWrapper buildQueryWrapperByStatus(WmsOrderBo bo) { + QueryWrapper lqw = Wrappers.query(); // 修改为order_status不是零就查出来 if (bo.getOrderStatus() != null) { if (bo.getOrderStatus() == -1) { // 当orderStatus为-1时，查询所有非0状态的记录 - lqw.ne(WmsOrder::getOrderStatus, 0); + lqw.ne("o.order_status", 0); } else { // 当orderStatus为其他值时（包括0），按指定状态查询 - lqw.eq(WmsOrder::getOrderStatus, bo.getOrderStatus()); + lqw.eq("o.order_status", bo.getOrderStatus()); } } + lqw.eq("o.del_flag", 0); + lqw.eq(StringUtils.isNotBlank(bo.getOrderCode()), "o.order_code", bo.getOrderCode()); + lqw.eq(bo.getCustomerId() != null, "o.customer_id", bo.getCustomerId()); + lqw.eq(StringUtils.isNotBlank(bo.getSalesManager()), "o.sales_manager", bo.getSalesManager()); // 当orderStatus为null时不添加任何条件，查询所有记录 return lqw; } + private QueryWrapper buildQueryWrapperPlus(WmsOrderBo bo) { + QueryWrapper lqw = Wrappers.query(); + lqw.eq("o.del_flag", 0); + lqw.eq(StringUtils.isNotBlank(bo.getOrderCode()), "o.order_code", bo.getOrderCode()); + lqw.eq(bo.getCustomerId() != null, "o.customer_id", bo.getCustomerId()); + lqw.eq(StringUtils.isNotBlank(bo.getSalesManager()), "o.sales_manager", bo.getSalesManager()); + lqw.eq(bo.getOrderStatus() != null, "o.order_status", bo.getOrderStatus()); + return lqw; + } + /** * 查询订单主列表 */ @@ -90,7 +101,7 @@ public class WmsOrderServiceImpl implements IWmsOrderService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(StringUtils.isNotBlank(bo.getOrderCode()), WmsOrder::getOrderCode, bo.getOrderCode()); - lqw.like(StringUtils.isNotBlank(bo.getCustomerName()), WmsOrder::getCustomerName, bo.getCustomerName()); + lqw.eq(bo.getCustomerId() != null, WmsOrder::getCustomerId, bo.getCustomerId()); lqw.eq(StringUtils.isNotBlank(bo.getSalesManager()), WmsOrder::getSalesManager, bo.getSalesManager()); lqw.eq(bo.getOrderStatus() != null, WmsOrder::getOrderStatus, bo.getOrderStatus()); return lqw; diff --git a/klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml index ca63c3ce..1d3b00a0 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsOrderMapper.xml @@ -18,5 +18,23 @@ + +