From 03861d0c1c7e13285397a8362b3abee2f1475a39 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Wed, 24 Apr 2024 16:48:42 +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

---
 .../nl/wms/board/service/dao/mapper/BoardMapper.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 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 76b710c..f3e5075 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
@@ -86,8 +86,8 @@
             (
                 SELECT
                     COUNT(*) AS pointNumber,
-                    SUM( CASE WHEN vehicle_code2 = '' OR vehicle_code2 IS NULL THEN 1 ELSE 0 END ) AS pointUsed,
-                    SUM( CASE WHEN vehicle_code2 != '' AND vehicle_code2 IS NOT NULL THEN 1 ELSE 0 END ) AS pointRemain
+                    SUM( CASE WHEN vehicle_code2 = '' OR vehicle_code2 IS NULL THEN 1 ELSE 0 END ) AS pointRemain,
+                    SUM( CASE WHEN vehicle_code2 != '' AND vehicle_code2 IS NOT NULL THEN 1 ELSE 0 END ) AS pointUsed
                 FROM
                     sch_base_point
                 WHERE
@@ -110,20 +110,21 @@
             a.*,
             c.*
         FROM
-                ( SELECT count(*) AS sum, FORMAT( sum( qty )/ 1000, 2 ) AS weight FROM sch_base_material ) a,
+                ( SELECT count(*) AS sum, FORMAT( sum( incomingWeight )/ 1000, 2 ) AS weight FROM sch_base_material ) a,
                 (
                     SELECT
                         count(*) AS pendSum,
-                        FORMAT( sum( qty )/ 1000, 2 ) AS pendWeight
+                        FORMAT( sum( incomingWeight )/ 1000, 2 ) AS pendWeight
                     FROM
                         ( SELECT m.* FROM sch_base_material m WHERE group_bind_material_status = 2 and m.PalletSN NOT IN ( SELECT vehicle_code2 FROM sch_base_point WHERE vehicle_code2 IS NOT NULL and vehicle_code2!='' ) )b ) c
     </select>
 
 
     <select id="wuliao" resultType="org.nl.wms.board.service.dao.dto.WuliaoDto">
-        select productName as name,count(*) as number
+        select productDescription as name,count(*) as number
         from sch_base_material
-        GROUP BY productName
+        GROUP BY productDescription
+        limit 5
     </select>
 
     <select id="cz" resultType="org.nl.wms.board.service.dao.dto.CzDto">