From 7d86bc5116023875bd602795ab93922277bf2849 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Wed, 28 May 2025 15:16:09 +0800
Subject: [PATCH] =?UTF-8?q?opt=EF=BC=9A=E7=A7=B0=E9=87=8D=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/board/service/dao/dto/CzDto.java  | 16 ++++++++++++++++
 .../wms/board/service/dao/mapper/BoardMapper.xml |  9 +++++----
 .../wms/board/service/impl/BoardServiceImpl.java |  6 ++++++
 3 files changed, 27 insertions(+), 4 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 701d18a..02a064c 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
@@ -4,21 +4,37 @@ import lombok.Data;
 
 @Data
 public class CzDto {
+    //子托盘
     private String sub_tray;
+    //母托盘
     private String mother_tray;
+    //物料编码
     private String material_code;
+    //物料名称
     private String material_name;
+    //总数量
     private Integer number;
+    //总重量kg
     private Float qty;
+    //入库类型
     private String simtType;
+    //场地
     private String locationCode;
+    //供应商
     private String supplierName;
+    //点位状态
     private String point_qty;
+    //称重设备
     private String device_type;
+    //检测框架
     private String frame_type;
+    //母托扫码
     private String mother_type;
+    //子托扫码
     private String sub_type;
+    //异常码
     private String error;
+    //废包材
     private String fbc;
 
 }
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 078fe6f..e2e5a6f 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
@@ -151,12 +151,13 @@
 
     <select id="cz" resultType="org.nl.wms.board.service.dao.dto.CzDto">
         SELECT
-            a.palletSN,
-            any_value ( a.productName ) as productName,
-            any_value ( a.productDescription ) as productDescription,
+            a.palletSN as sub_tray,
+            any_value ( a.productName ) as material_code,
+            any_value ( a.productDescription ) as material_name,
             sum( a.qty ) as qty,
             sum( a.incomingWeight ) as incomingWeight,
-            any_value ( a.supplierName ) as supplierName
+            any_value ( a.supplierName ) as supplierName,
+            count(*) as number
         FROM
             (
                 SELECT
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 372b628..b4a3f86 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
@@ -31,6 +31,12 @@ public class BoardServiceImpl implements BoardService {
         CzDto czDto = boardMapper.cz(String.valueOf(redisUtils.get("sub_tray")));
         if (czDto == null) {
             czDto = new CzDto();
+            czDto.setSub_tray(String.valueOf(redisUtils.get("sub_tray")));
+            czDto.setNumber(0);
+            czDto.setQty((float) 0);
+            czDto.setMaterial_code("空");
+            czDto.setMaterial_name("空");
+            czDto.setSupplierName("空");
         }
         czDto.setMother_tray(String.valueOf(redisUtils.get("mother_tray")));
         czDto.setPoint_qty(String.valueOf(redisUtils.get("point_qty")));