diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationMapper.java index ccc15d1c..8f552ecf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationMapper.java @@ -10,4 +10,6 @@ import java.util.List; public interface StationMapper extends BaseMapper { List selectByWcId(@Param("wcId") Long wcId); + + Station selectByStationPosition(@Param("StationPosition") String freeStationCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationMapper.xml index c05a5cbf..7339a211 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationMapper.xml @@ -9,4 +9,9 @@ select id, station_name, station_code, station_status, status, create_user, create_time, create_dept, update_user, update_time, is_deleted, remark, station_position, wc_id from LM_STATION where IS_DELETED = 0 and WC_ID = #{wcId} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IStationService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IStationService.java index 64f39c9d..5a406418 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IStationService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IStationService.java @@ -45,4 +45,11 @@ public interface IStationService extends BaseService { * @return */ List selectByWcId(Long wcId); + + /** + * 根据站点编码 查询站点信息 + * @param freeStationCode + * @return + */ + Station getByStationPosition(String freeStationCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/ITaskExecuteRecordService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/ITaskExecuteRecordService.java index 7929ce28..98d0b585 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/ITaskExecuteRecordService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/ITaskExecuteRecordService.java @@ -57,9 +57,10 @@ public interface ITaskExecuteRecordService extends BaseService stationList = stationService.selectByWcId(wcId); if (CollectionUtils.isEmpty(stationList)) { return null; @@ -248,7 +255,7 @@ public class PipelineServiceImpl implements IPipelineService { return null; } - return freeStations.get(0).getStationCode(); + return freeStations.get(0); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java index fa8d942c..64b09a3e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java @@ -52,4 +52,9 @@ public class StationServiceImpl extends BaseServiceImpl public List selectByWcId(Long wcId) { return stationMapper.selectByWcId(wcId); } + + @Override + public Station getByStationPosition(String freeStationCode) { + return stationMapper.selectByStationPosition(freeStationCode); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java index 0c926e0e..4326f481 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java @@ -156,7 +156,7 @@ public class TaskExecuteRecordServiceImpl extends BaseServiceImpl> positionCodePath = new ArrayList<>();