From 5bbd9223fb400cd5bd3fe7fc3f6fa4eef14c46a4 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 29 Apr 2024 14:14:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=94=AE=E5=90=8E-bug=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E6=B1=82=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-service/logpm-aftersales/pom.xml               | 12 ++++++++++++
 .../aftersales/jobhandler/AftersalesXxlJob.java      |  7 ++-----
 .../impl/AftersalesAbnormalRecordServiceImpl.java    |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-aftersales/pom.xml b/blade-service/logpm-aftersales/pom.xml
index a88f2dabe..e07240650 100644
--- a/blade-service/logpm-aftersales/pom.xml
+++ b/blade-service/logpm-aftersales/pom.xml
@@ -90,6 +90,18 @@
             <version>3.2.0.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-warehouse-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-warehouse-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/jobhandler/AftersalesXxlJob.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/jobhandler/AftersalesXxlJob.java
index cfd311e7e..e30c44e74 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/jobhandler/AftersalesXxlJob.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/jobhandler/AftersalesXxlJob.java
@@ -1,6 +1,5 @@
 package com.logpm.aftersales.jobhandler;
 
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.logpm.aftersales.dto.AftersalesPersonResponsibleDTO;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
@@ -18,8 +17,6 @@ import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springblade.core.secure.BladeUser;
@@ -114,8 +111,8 @@ public class AftersalesXxlJob {
 			bladeUser.setDeptId(aftersalesAbnormalRecordEntity.getCreateDept() + "");
 
 			BasicdataWarehouseEntity basicdataWarehouseEntity = new BasicdataWarehouseEntity();
-			basicdataWarehouseEntity.setId(aftersalesAbnormalRecordEntity.getUpWarehouseId());
-			basicdataWarehouseEntity.setName(aftersalesAbnormalRecordEntity.getUpWarehouseName());
+			basicdataWarehouseEntity.setId(aftersalesAbnormalRecordEntity.getWarehouseId());
+			basicdataWarehouseEntity.setName(aftersalesAbnormalRecordEntity.getWarehouseName());
 
 			BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(basicdataWarehouseEntity.getId());
 			if (ObjectUtil.isNotEmpty(warehouseEntity)) {
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
index 31fb17dc3..72626db3f 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
@@ -47,7 +47,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 				return R.fail(405,"异常已完结");
 			}
 			String abnormalType = abnormalRecordEntity.getAbnormalType();
-			String upWarehouseName = abnormalRecordEntity.getUpWarehouseName();
+			String upWarehouseName = abnormalRecordEntity.getWarehouseName();
 			if("1".equals(abnormalType)){
 				Integer dealType = abnormalRecordDTO.getDealType();
 				Long carsLoadScanId = abnormalRecordEntity.getAssociationId();