From 1bff0c805ec40f4c7807a77bd1626d6b379df9d9 Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Wed, 5 Feb 2025 16:48:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=AE=A2=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E7=9A=84=E9=94=80=E5=94=AE=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java | 2 +-
 .../mes/wm/service/impl/WmProductSalseServiceImpl.java   | 2 +-
 .../main/resources/mapper/wm/WmProductSalseMapper.xml    | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java
index 9c9f851..f24db74 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductSalseMapper.java
@@ -89,5 +89,5 @@ public interface WmProductSalseMapper
      * @param clientId
      * @return
      */
-    List<SaleRecordVO> getSaleRecord(@Param("clientId") Long clientId);
+    List<WmProductSalse> getSaleRecord(@Param("clientId") Long clientId);
 }
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductSalseServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductSalseServiceImpl.java
index 9c6f6a0..0efce70 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductSalseServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductSalseServiceImpl.java
@@ -143,7 +143,7 @@ public class WmProductSalseServiceImpl implements IWmProductSalseService
      */
     @Override
     public AjaxResult getSaleRecord(Long clientId) {
-        List<SaleRecordVO> saleRecordVOS = wmProductSalseMapper.getSaleRecord(clientId);
+        List<WmProductSalse> saleRecordVOS = wmProductSalseMapper.getSaleRecord(clientId);
         return AjaxResult.success(saleRecordVOS);
     }
 }
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml
index bc69275..893fe93 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml
@@ -193,11 +193,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from wm_product_salse_line
         where salse_id in ( select salse_id from wm_product_salse where client_id = #{clientId} )
     </select>
-    <select id="getSaleRecord" resultType="com.ktg.mes.wm.domain.vo.SaleRecordVO" resultMap="SaleRecordVOResult">
-        SELECT * FROM wm_product_salse_line wl
-        LEFT JOIN (select * from wm_product_salse) ws ON ws.salse_id = wl.salse_id
-        WHERE
-            ws.client_id = #{clientId}
+    <select id="getSaleRecord" resultType="com.ktg.mes.wm.domain.vo.SaleRecordVO" resultMap="WmProductSalseResult">
+        <include refid="selectWmProductSalseVo"/>
+        where
+            client_id = #{clientId}
     </select>
 
     <insert id="insertWmProductSalse" parameterType="WmProductSalse" useGeneratedKeys="true" keyProperty="salseId">