Merge remote-tracking branch 'origin/test' into test

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,"当前数据的状态不推送");
 		}

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<WarehouseEntity> {
+public interface IWarehouseService {
 	/**
 	 * 自定义分页
 	 *
@@ -38,6 +37,8 @@ public interface IWarehouseService extends BaseService<WarehouseEntity> {
 	IPage<WarehouseVO> selectWarehousePage(IPage<WarehouseVO> page, WarehouseVO warehouse);
 
 	Integer selectIdByName(String siteName);
+
+	WarehouseEntity getById(Integer id);
 }
 
 

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<WarehouseMapper, WarehouseEntity> implements IWarehouseService {
+@AllArgsConstructor
+public class WarehouseServiceImpl implements IWarehouseService {
+
+	private WarehouseMapper warehouseMapper;
 
 	@Override
 	public IPage<WarehouseVO> selectWarehousePage(IPage<WarehouseVO> 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);
 	}