From dbed0df5e8f7b8fbea91f1abe30d1a057a19fa7d Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sat, 17 Jun 2023 15:29:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=8E=A8=E9=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AEbug=202023-06-17=2015:28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PanFactoryDataServiceImpl.java | 2 +- .../oldproject/service/IWarehouseService.java | 5 +++-- .../service/impl/WarehouseServiceImpl.java | 16 ++++++++++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java index c7afdf565..89cb77391 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java @@ -174,7 +174,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { panOrderStatusLogService.save(panOrderStatusLog); String status = orderStatusDTO.getStatus(); - if("2".equals(status)||"4".equals(status)||"5".equals(status)||"8".equals(status)||"9".equals(status)){ + if("2".equals(status)||"5".equals(status)||"8".equals(status)||"9".equals(status)){ logger.info("#############handleStatusData: 当前数据的状态不推送 status={}",status); return Resp.fail(400,"当前数据的状态不推送"); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWarehouseService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWarehouseService.java index 16a3ccb4c..46043eccd 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWarehouseService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWarehouseService.java @@ -19,7 +19,6 @@ package com.logpm.oldproject.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.oldproject.entity.WarehouseEntity; import com.logpm.oldproject.vo.WarehouseVO; -import org.springblade.core.mp.base.BaseService; /** * 仓库 服务类 @@ -27,7 +26,7 @@ import org.springblade.core.mp.base.BaseService; * @author BladeX * @since 2023-05-24 */ -public interface IWarehouseService extends BaseService { +public interface IWarehouseService { /** * 自定义分页 * @@ -38,6 +37,8 @@ public interface IWarehouseService extends BaseService { IPage selectWarehousePage(IPage page, WarehouseVO warehouse); Integer selectIdByName(String siteName); + + WarehouseEntity getById(Integer id); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WarehouseServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WarehouseServiceImpl.java index 2a6fcf808..a9db03908 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WarehouseServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WarehouseServiceImpl.java @@ -21,8 +21,8 @@ import com.logpm.oldproject.entity.WarehouseEntity; import com.logpm.oldproject.mapper.WarehouseMapper; import com.logpm.oldproject.service.IWarehouseService; import com.logpm.oldproject.vo.WarehouseVO; +import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; /** @@ -33,17 +33,25 @@ import org.springframework.stereotype.Service; */ @Log4j2 @Service -public class WarehouseServiceImpl extends BaseServiceImpl implements IWarehouseService { +@AllArgsConstructor +public class WarehouseServiceImpl implements IWarehouseService { + + private WarehouseMapper warehouseMapper; @Override public IPage selectWarehousePage(IPage page, WarehouseVO warehouse) { - return page.setRecords(baseMapper.selectWarehousePage(page, warehouse)); + return page.setRecords(warehouseMapper.selectWarehousePage(page, warehouse)); } @Override public Integer selectIdByName(String siteName) { log.info("##########selectIdByName: siteName="+siteName); - return baseMapper.selectIdByName(siteName); + return warehouseMapper.selectIdByName(siteName); + } + + @Override + public WarehouseEntity getById(Integer id) { + return warehouseMapper.selectById(id); }