From b3af1f1f525ee6bd85f3a7721ba0b85c4ef1a3e7 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:07 +0800
Subject: [PATCH] 出现空指针异常

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f0a2001..daac737 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
@@ -24,9 +25,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -886,6 +885,11 @@
         }
         Date now = new Date();
         Order order = orderMapping(param, now, pakin, docName);
+        Set<String> set = new HashSet<>();
+        for (OrderSyncParam.OrderDetl child : param.getChildren()) {
+            set.add(child.getCDefine22());
+        }
+        order.setTel(JSON.toJSONString(set));
         orderService.insert(order);
         param.getChildren().forEach(od -> {
             OrderDetl orderDetl = orderDetlMapping(order, od, now);
@@ -984,7 +988,9 @@
 
         order.setDefNumber(param.get鎿嶄綔绯荤粺鍙�());
 
+        order.setCreateBy(9999L);
         order.setCreateTime(now);
+        order.setUpdateBy(9999L);
         order.setUpdateTime(now);
         order.setUpstreamcode(param.getUpstreamcode());
         //璁㈠崟鐘舵��
@@ -1021,7 +1027,11 @@
         //閿�鍞鍗曞彿
         od.setThreeCode(odParam.getCDefine22());
         //鑷敱椤�
-        od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
+        if (!Cools.isEmpty(odParam.getBatch()) || !Cools.isEmpty(odParam.getBFree1())) {
+            od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
+        }
+        od.setWeight(odParam.getINum());
+        od.setVolume(odParam.getIinvexchrate());
         //IDs
         od.setSku(odParam.getId());
 
@@ -1030,6 +1040,7 @@
         od.setSource(order.getDocType().intValue());
         od.setStatus(1);
         od.setQty(0.0D);
+        od.setReportQty(0.0D);
         od.setCreateBy(9999L);
         od.setCreateTime(now);
         od.setUpdateBy(9999L);

--
Gitblit v1.9.1