From 6847c999951259513c4f10d882323587abcc4ef5 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 24 Jul 2025 17:30:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E6=9C=AF=E8=81=94=E6=9F=A5=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=8B=BF=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/klp/domain/vo/WmsProductSalesScriptVo.java     | 5 ++++-
 .../java/com/klp/mapper/WmsProductSalesScriptMapper.java    | 3 +++
 .../klp/service/impl/WmsProductSalesScriptServiceImpl.java  | 2 +-
 .../resources/mapper/klp/WmsProductSalesScriptMapper.xml    | 6 ++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductSalesScriptVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductSalesScriptVo.java
index d820902e..a796e3da 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductSalesScriptVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductSalesScriptVo.java
@@ -18,7 +18,10 @@ import lombok.Data;
 public class WmsProductSalesScriptVo {
 
     private static final long serialVersionUID = 1L;
-
+    /**
+     * 话术ID
+     */
+    private Long scriptId;
     /**
      * 关联产品ID
      */
diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsProductSalesScriptMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsProductSalesScriptMapper.java
index 4f3e7bd8..febe9a50 100644
--- a/klp-wms/src/main/java/com/klp/mapper/WmsProductSalesScriptMapper.java
+++ b/klp-wms/src/main/java/com/klp/mapper/WmsProductSalesScriptMapper.java
@@ -1,5 +1,7 @@
 package com.klp.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.klp.domain.WmsProductSalesScript;
 import com.klp.domain.vo.WmsProductSalesScriptVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
@@ -14,4 +16,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface WmsProductSalesScriptMapper extends BaseMapperPlus<WmsProductSalesScriptMapper, WmsProductSalesScript, WmsProductSalesScriptVo> {
 
+    Page<WmsProductSalesScriptVo> selectVoPagePlus(Page<Object> build,@Param("ew") LambdaQueryWrapper<WmsProductSalesScript> lqw);
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java
index bd26aec9..45595f48 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java
@@ -45,7 +45,7 @@ public class WmsProductSalesScriptServiceImpl implements IWmsProductSalesScriptS
     @Override
     public TableDataInfo<WmsProductSalesScriptVo> queryPageList(WmsProductSalesScriptBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<WmsProductSalesScript> lqw = buildQueryWrapper(bo);
-        Page<WmsProductSalesScriptVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<WmsProductSalesScriptVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProductSalesScriptMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProductSalesScriptMapper.xml
index a87bfa02..b053b014 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsProductSalesScriptMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsProductSalesScriptMapper.xml
@@ -18,6 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
     </resultMap>
+    <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsProductSalesScriptVo">
+        SELECT s.*, p.product_code, p.product_name
+        FROM wms_product_sales_script s
+        LEFT JOIN wms_product p ON s.product_id = p.product_id
+        ${ew.customSqlSegment}
+    </select>
 
 
 </mapper>