From de69397da6e261cd809d05104c1df002edd0b3e6 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 16 Dec 2025 14:13:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E6=AD=A3=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E6=95=B0=E6=8D=AE=E6=8F=92=E5=85=A5=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsDeliveryPlanMapper.xml 中增加 action_status = 2 的过滤条件 - 修正 WmsMaterialCoilServiceImpl.java 中 dataType 的设置逻辑， 当传入值为 10 时保留原值，否则默认设为 1 --- .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 6 +++++- .../src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index b57c7ec2..7205ac1f 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -745,7 +745,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // 3. 插入钢卷数据 WmsMaterialCoil add = BeanUtil.toBean(bo, WmsMaterialCoil.class); - add.setDataType(1); // 新增的钢卷默认为当前数据 + if(bo.getDataType() == 10){ + add.setDataType(10); + }else { + add.setDataType(1); // 新增的钢卷默认为当前数据 + } validEntityBeforeSave(add); int rows = baseMapper.insert(add); if (rows <= 0) { diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml index 2d485c78..7e8bfeb6 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml @@ -153,6 +153,7 @@ LEFT JOIN wms_material_coil mc ON mc.coil_id = wcpa.coil_id AND mc.del_flag = 0 WHERE wcpa.del_flag = 0 AND wcpa.action_type = 401 + AND wcpa.action_status = 2 AND wcpa.create_time >= #{startTime} @@ -185,6 +186,7 @@ LEFT JOIN wms_material_coil mc ON mc.coil_id = wcpa.coil_id AND mc.del_flag = 0 WHERE wcpa.del_flag = 0 AND wcpa.action_type = 401 + AND wcpa.action_status = 2 AND wcpa.create_time >= #{startTime} From 770f78b1df68a0d95f35bcfdc02640b0de04ae20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Tue, 16 Dec 2025 14:13:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E6=AD=A3=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E6=8A=A5=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E6=96=87=E6=9C=AC=E5=8F=8A=E6=8C=89=E9=92=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将发货报表相关文本修正为收货报表 - 在收货详情页添加删除按钮和加载状态 - 为签收、拒签和删除操作添加加载状态防止重复提交 --- klp-ui/src/views/wms/receive/detail/index.vue | 14 +++++++++++--- klp-ui/src/views/wms/receive/report/index.vue | 6 +++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/klp-ui/src/views/wms/receive/detail/index.vue b/klp-ui/src/views/wms/receive/detail/index.vue index 53c7f374..1f55d886 100644 --- a/klp-ui/src/views/wms/receive/detail/index.vue +++ b/klp-ui/src/views/wms/receive/detail/index.vue @@ -86,9 +86,11 @@ @@ -269,12 +271,15 @@ export default { cancelButtonText: "取消", type: "warning" }).then(() => { + this.buttonLoading = true; updatePendingAction({ ...row, actionStatus: 3, // 3表示拒签 }).then(response => { this.$modal.msgSuccess("拒签成功"); this.getList(); + }).finally(() => { + this.buttonLoading = false; }); }); }, @@ -340,9 +345,12 @@ export default { cancelButtonText: "取消", type: "warning" }).then(() => { + this.buttonLoading = true; delPendingAction(row.actionId).then(response => { this.$modal.msgSuccess("删除成功"); this.getList(); + }).finally(() => { + this.buttonLoading = false; }); }); }, diff --git a/klp-ui/src/views/wms/receive/report/index.vue b/klp-ui/src/views/wms/receive/report/index.vue index 1d99796f..9e570574 100644 --- a/klp-ui/src/views/wms/receive/report/index.vue +++ b/klp-ui/src/views/wms/receive/report/index.vue @@ -20,7 +20,7 @@ @@ -39,7 +39,7 @@ @@ -158,7 +158,7 @@ export default { this.summary = res.data?.summary || null this.details = res.data?.details || [] } catch (error) { - console.error('获取发货报表失败:', error) + console.error('获取收货报表失败:', error) this.$message.error('获取数据失败') this.summary = null this.details = [] From 6243c3d99454efbc4045cab4863851b9efc5ae0a Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 16 Dec 2025 16:38:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(crm):=20=E4=BF=AE=E6=94=B9=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 - 添加CrmOrderMapper接口方法selectVoPagePlus - 实现对应的XML查询语句，支持联表查询客户名称 - 在CrmOrderServiceImpl中实现新的分页查询逻辑 - 引入QueryWrapper构建动态查询条件 - 增加客户名称字段到CrmOrderVo视图对象 - 优化查询性能，支持复杂条件筛选和排序 --- .../com/klp/crm/domain/vo/CrmOrderVo.java | 2 ++ .../com/klp/crm/mapper/CrmOrderMapper.java | 4 +++ .../crm/service/impl/CrmOrderServiceImpl.java | 26 +++++++++++++++++-- .../main/resources/mapper/CrmOrderMapper.xml | 25 ++++++++++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java index 12a5ecb3..d549fa91 100644 --- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java +++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java @@ -107,5 +107,7 @@ public class CrmOrderVo { @ExcelProperty(value = "备注") private String remark; + //联查客户名称 + private String customerName; } diff --git a/klp-crm/src/main/java/com/klp/crm/mapper/CrmOrderMapper.java b/klp-crm/src/main/java/com/klp/crm/mapper/CrmOrderMapper.java index 4287ac88..e6a60d44 100644 --- a/klp-crm/src/main/java/com/klp/crm/mapper/CrmOrderMapper.java +++ b/klp-crm/src/main/java/com/klp/crm/mapper/CrmOrderMapper.java @@ -1,8 +1,11 @@ package com.klp.crm.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.crm.domain.CrmOrder; import com.klp.crm.domain.vo.CrmOrderVo; import com.klp.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; /** * 正式订单主Mapper接口 @@ -12,4 +15,5 @@ import com.klp.common.core.mapper.BaseMapperPlus; */ public interface CrmOrderMapper extends BaseMapperPlus { + Page selectVoPagePlus(Page build,@Param("ew") QueryWrapper lqw); } diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java index ae39a9b4..4964b61e 100644 --- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java +++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.klp.crm.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,11 +45,32 @@ public class CrmOrderServiceImpl implements ICrmOrderService { */ @Override public TableDataInfo queryPageList(CrmOrderBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + QueryWrapper lqw = buildQueryWrapperPlus(bo); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); return TableDataInfo.build(result); } + private QueryWrapper buildQueryWrapperPlus(CrmOrderBo bo) { + Map params = bo.getParams(); + QueryWrapper qw = Wrappers.query(); + qw.eq(StringUtils.isNotBlank(bo.getOrderCode()), "co.order_code", bo.getOrderCode()); + qw.eq(bo.getOrderType() != null, "co.order_type", bo.getOrderType()); + qw.eq(StringUtils.isNotBlank(bo.getCustomerId()), "co.customer_id", bo.getCustomerId()); + qw.eq(bo.getOrderAmount() != null, "co.order_amount", bo.getOrderAmount()); + qw.eq(StringUtils.isNotBlank(bo.getSalesman()), "co.salesman", bo.getSalesman()); + qw.eq(bo.getDeliveryDate() != null, "co.delivery_date", bo.getDeliveryDate()); + qw.eq(bo.getPreOrderStatus() != null, "co.pre_order_status", bo.getPreOrderStatus()); + qw.eq(StringUtils.isNotBlank(bo.getAuditUser()), "co.audit_user", bo.getAuditUser()); + qw.eq(bo.getAuditTime() != null, "co.audit_time", bo.getAuditTime()); + qw.eq(bo.getOrderStatus() != null, "co.order_status", bo.getOrderStatus()); + qw.eq(bo.getFinanceStatus() != null, "co.finance_status", bo.getFinanceStatus()); + qw.eq(bo.getUnpaidAmount() != null, "co.unpaid_amount", bo.getUnpaidAmount()); + //逻辑删除 + qw.eq("co.del_flag", 0); + qw.orderByDesc("co.create_time"); + return qw; + } + /** * 查询正式订单主列表 */ diff --git a/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml b/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml index bf196548..3e170d52 100644 --- a/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml +++ b/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml @@ -25,6 +25,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +