From 1090c7dde40def137d7f65a2dee9ef467725db22 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Wed, 8 May 2024 11:22:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BFfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../board/service/dao/mapper/BoardMapper.xml  | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml
index 1bc854e..b90880f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml
@@ -4,34 +4,38 @@
 
     <select id="sc" resultType="org.nl.wms.board.service.dao.dto.ScDto">
         SELECT
-            *,
+            b.batch,b.standing_time,b.usedTime,b.productName,b.supplierName,b.productDescription,
             CASE
                 WHEN b.standing_time > b.usedTime THEN
                     '回温中' ELSE '回温完成'
                 END AS state
+                ,count(*) as number
         FROM
             (
                 SELECT
-                    productName,
-                    supplierName,
-                    productDescription,
-                    pcsn AS batch,
-                    standing_time,
-                    TIMESTAMPDIFF(
-                        HOUR,
-                            instorage_time,
-                            curtime()) AS usedTime
+                    DISTINCT point_code,
+                             productName,
+                             supplierName,
+                             productDescription,
+                             pcsn AS batch,
+                             standing_time,
+                             TIMESTAMPDIFF(
+                                 HOUR,
+                                     instorage_time,
+                                     curtime()) AS usedTime
                 FROM
                     (
                         SELECT
-                            *
+                            DISTINCT point_code,vehicle_code,pcsn,standing_time,instorage_time
                         FROM
                             sch_base_vehiclematerialgroup
                         WHERE
-                                vehicle_code IN ( SELECT vehicle_code2 FROM sch_base_point WHERE region_code = #{region_code} AND vehicle_code!='' AND vehicle_code IS NOT NULL )) a
-                        LEFT JOIN sch_base_material m ON a.vehicle_code = m.PalletSN
-                        AND m.group_bind_material_status = 2
+                                vehicle_code IN ( SELECT vehicle_code2 FROM sch_base_point WHERE region_code = #{region_code}  AND vehicle_code!='' AND vehicle_code IS NOT NULL )) a
+                LEFT JOIN sch_base_material m ON a.vehicle_code = m.PalletSN
+                AND m.group_bind_material_status = 2
             ) b
+        GROUP BY batch,standing_time,usedTime,productName,supplierName,productDescription
+
     </select>
 
     <select id="kn" resultType="org.nl.wms.board.service.dao.dto.WlDto">