From 23c86cff25618a20e14b96640a8604651e3f8775 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 7 Aug 2024 15:56:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/trunkline/controller/IncomingController.java     | 3 ++-
 .../trunkline/service/impl/TrunklineCarsLoadServiceImpl.java   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java
index 29cf7c22e..15d81bcc1 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java
@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.exception.CustomerException;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
@@ -89,7 +90,7 @@ public class IncomingController {
 				log.warn(method+"处理订单数据为空");
 				return R.fail(405,"处理订单数据为空");
 			}
-
+			inComingDTO.setNickName(AuthUtil.getNickName());
 
 			return inComingService.incomingBatchOrder(inComingDTO,null);
 		}catch (CustomerException e){
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 880c40ae5..d6832380a 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -2852,6 +2852,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			carsLoadScanEntity.setLoadingAbnormal(isAbnormal);
 			carsLoadScanEntity.setUnloadAbnormal(0);
 			carsLoadScanEntity.setUnloadCheck(0);
+			carsLoadScanEntity.setUnloadNum(0);
 			carsLoadScanEntity.setType(2);
 			carsLoadScanEntity.setIsData(isData);
 			carsLoadScanEntity.setTrayId(trayId);