From c2d2407262c9cc89ccfe4ce955a967a21a42d787 Mon Sep 17 00:00:00 2001 From: liuyuxin Date: Wed, 4 Feb 2026 16:02:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E9=A1=B5=E9=9D=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=86=85=E5=AE=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../delivery/project/document/domain/vo/DeliveryBillVO.java | 4 +++- .../document/service/impl/DeliveryOrderServiceImpl.java | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/delivery/project/document/domain/vo/DeliveryBillVO.java b/src/main/java/com/delivery/project/document/domain/vo/DeliveryBillVO.java index 173a8ac..69787d7 100644 --- a/src/main/java/com/delivery/project/document/domain/vo/DeliveryBillVO.java +++ b/src/main/java/com/delivery/project/document/domain/vo/DeliveryBillVO.java @@ -33,7 +33,9 @@ public class DeliveryBillVO implements Serializable { /** 是否需要配送(0否,1是,2配送中,3配送完成) */ private String isDelivery; - + /** 出入库类型名称（联表） */ + private String operationTypeName; /** 该单据下的货物明细 */ private List recordList; + } diff --git a/src/main/java/com/delivery/project/document/service/impl/DeliveryOrderServiceImpl.java b/src/main/java/com/delivery/project/document/service/impl/DeliveryOrderServiceImpl.java index 8ca3ad1..e11d6fa 100644 --- a/src/main/java/com/delivery/project/document/service/impl/DeliveryOrderServiceImpl.java +++ b/src/main/java/com/delivery/project/document/service/impl/DeliveryOrderServiceImpl.java @@ -3,6 +3,7 @@ package com.delivery.project.document.service.impl; import java.util.*; import java.util.stream.Collectors; +import com.alibaba.druid.support.logging.Log; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; @@ -432,10 +433,10 @@ public class DeliveryOrderServiceImpl implements IDeliveryOrderService if (data == null || data.isEmpty()) { return new ArrayList<>(); } - + System.out.println("反序列化前的list=="+data); // ====================== 4. 反序列化为新结构 ====================== List list = data.toJavaList(DeliveryBillVO.class); - + System.out.println("反序列化后的list=="+list); // ====================== 5. 收集所有物料号 ====================== Set wlNoSet = list.stream() .filter(bill -> bill.getRecordList() != null && !bill.getRecordList().isEmpty())