1.售后-bug修复，需求增加

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>

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)) {

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();