diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/TaskExecuteRecord.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/TaskExecuteRecord.java index 29375d04..82a66cfa 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/TaskExecuteRecord.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/TaskExecuteRecord.java @@ -112,4 +112,10 @@ public class TaskExecuteRecord extends BaseEntity { @Schema(description = "备注") private String remark; + /** + * 虚拟货架号 + */ + @Schema(description = "虚拟货架号") + private String virtualShelvesCode; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/VirtualShelvesMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/VirtualShelvesMapper.java index 56678ccc..13ed4d01 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/VirtualShelvesMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/VirtualShelvesMapper.java @@ -1,6 +1,7 @@ package org.springblade.desk.logistics.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.springblade.desk.logistics.pojo.entity.VirtualShelves; import java.util.List; @@ -8,4 +9,6 @@ import java.util.List; public interface VirtualShelvesMapper extends BaseMapper { List getVirtualShelvesCode(); + + VirtualShelves selectByVirtualShelvesCode(@Param("virtualShelvesCode") String virtualShelvesCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/VirtualShelvesMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/VirtualShelvesMapper.xml index ef4de61c..8d7644e6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/VirtualShelvesMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/VirtualShelvesMapper.xml @@ -9,4 +9,9 @@ select id, virtual_shelves_code, is_bound, status, create_user, create_time, create_dept, update_user, update_time, is_deleted, remark from LM_VIRTUAL_SHELVES where IS_DELETED = 0 and IS_BOUND = 0 + 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 91d2d513..96fdc94b 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 @@ -68,7 +68,7 @@ public interface ITaskExecuteRecordService extends BaseService { * @return */ VirtualShelves getVirtualShelvesCode(); + + /** + * 根据虚拟侯家号查询 + * @param virtualShelvesCode + * @return + */ + VirtualShelves selectByVirtualShelvesCode(String virtualShelvesCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java index b093cc5a..a63b5f51 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java @@ -190,7 +190,7 @@ public class StorageMonitoringServiceImpl implements IStorageMonitoringService { //调用成功 添加任务 if(null != ctuSchedulingTask){ // 添加任务 - boolean record = taskExecuteRecordService.inboundRecord(ctuSchedulingTask, firstTask); + boolean record = taskExecuteRecordService.inboundRecord(ctuSchedulingTask, firstTask,null); } processedCount++; // 成功处理计数+1 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 c7df7b20..862c729c 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 @@ -108,13 +108,11 @@ public class TaskExecuteRecordServiceImpl extends BaseServiceImpl 0; } @@ -370,7 +383,7 @@ public class TaskExecuteRecordServiceImpl extends BaseServiceImpl