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 @@ 3.2.0.RELEASE compile + + org.springblade + logpm-warehouse-api + 3.2.0.RELEASE + compile + + + org.springblade + logpm-warehouse-api + 3.2.0.RELEASE + compile + 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