Merge remote-tracking branch 'origin/main'

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<RkRecord> recordList;
+
 }

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;
@@ -420,10 +421,10 @@ public class DeliveryOrderServiceImpl implements IDeliveryOrderService
         if (data == null || data.isEmpty()) {
             return new ArrayList<>();
         }
-
+        System.out.println("反序列化前的list=="+data);
         // ====================== 4. 反序列化为新结构 ======================
         List<DeliveryBillVO> list = data.toJavaList(DeliveryBillVO.class);
-
+        System.out.println("反序列化后的list=="+list);
         // ====================== 5. 收集所有物料号 ======================
         Set<String> wlNoSet = list.stream()
                 .filter(bill -> bill.getRecordList() != null && !bill.getRecordList().isEmpty())