From 58742e78ab159d9f902f595fc7f948e44f38a948 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Thu, 18 Apr 2024 17:41:59 +0800
Subject: [PATCH] fix

---
 .../org/nl/wms/board/service/dao/dto/CzDto.java  | 10 +++++-----
 .../wms/board/service/dao/mapper/BoardMapper.xml | 16 ++++------------
 .../wms/board/service/impl/BoardServiceImpl.java | 10 +++++-----
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/CzDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/CzDto.java
index e417ff8..e031845 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/CzDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/CzDto.java
@@ -14,10 +14,10 @@ public class CzDto {
     private String locationCode;
     private String supplierName;
     private String point_qty;
-    private Integer device_type;
-    private Integer frame_type;
-    private Integer mother_type;
-    private Integer sub_type;
-    private Integer error;
+    private String device_type;
+    private String frame_type;
+    private String mother_type;
+    private String sub_type;
+    private String error;
 
 }
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 005d846..76b710c 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
@@ -116,22 +116,14 @@
                         count(*) AS pendSum,
                         FORMAT( sum( qty )/ 1000, 2 ) AS pendWeight
                     FROM
-                        ( SELECT m.* FROM sch_base_material m WHERE m.PalletSN NOT IN ( SELECT vehicle_code2 FROM sch_base_point WHERE vehicle_code2 IS NOT NULL and vehicle_code2!='' ) )b ) c
+                        ( 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
-            a.*,
-            c.*
-        FROM
-                ( SELECT count(*) AS sum, FORMAT( sum( qty )/ 1000, 2 ) AS weight FROM sch_base_material where group_bind_material_status = 2 ) a,
-                (
-                    SELECT
-                        count(*) AS pendSum,
-                        FORMAT( sum( qty )/ 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 productName as name,count(*) as number
+        from sch_base_material
+        GROUP BY productName
     </select>
 
     <select id="cz" resultType="org.nl.wms.board.service.dao.dto.CzDto">
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java
index 6c76c41..0f8f0b0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java
@@ -29,11 +29,11 @@ public class BoardServiceImpl implements BoardService {
         }
         czDto.setMother_tray(String.valueOf(redisUtils.get("mother_tray")));
         czDto.setPoint_qty(String.valueOf(redisUtils.get("point_qty")));
-        czDto.setDevice_type((Integer) redisUtils.get("device_type"));
-        czDto.setFrame_type((Integer) redisUtils.get("frame_type"));
-        czDto.setMother_type((Integer) redisUtils.get("mother_type"));
-        czDto.setSub_type((Integer) redisUtils.get("sub_type"));
-        czDto.setError((Integer) redisUtils.get("error"));
+        czDto.setDevice_type(String.valueOf(redisUtils.get("device_type")));
+        czDto.setFrame_type(String.valueOf(redisUtils.get("frame_type")));
+        czDto.setMother_type(String.valueOf(redisUtils.get("mother_type")));
+        czDto.setSub_type(String.valueOf(redisUtils.get("sub_type")));
+        czDto.setError(String.valueOf(redisUtils.get("error")));
         return JSONObject.parseObject(JSON.toJSONString(czDto, SerializerFeature.WriteNullStringAsEmpty));
     }