diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Task.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Task.java index 08978103..d5fb3ca9 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Task.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Task.java @@ -151,6 +151,14 @@ public class Task extends BaseEntity { return "回库"; } else if (STATUS_FINISHED.equals(status)) { return "结束"; + }else if (STATUS_START.equals(status)) { + return "起点位置"; + }else if (STATUS_CONVEYOR_START.equals(status)) { + return "输送线起点"; + }else if (STATUS_CONVEYOR_END.equals(status)) { + return "输送线末尾"; + }else if (STATUS_STATION_RECEIVE.equals(status)) { + return "站点接收"; } else { return "未知状态"; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/vo/TaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/vo/TaskVO.java index f808ee7f..b593b8da 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/vo/TaskVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/vo/TaskVO.java @@ -18,8 +18,9 @@ public class TaskVO extends Task { */ @JsonSerialize(using = ToStringSerializer.class) private Long id; + /** - * 状态名称 + * 作业中心名字 */ -// String statusName; + private String wcName; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.java index 3fab30f4..f4732e06 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.java @@ -22,5 +22,5 @@ public interface TaskMapper extends BaseMapper { * @param taskDto 查询参数 * @return List */ - List selectEquipmentPage(IPage page, TaskDto taskDto); + List selectPage(IPage page, TaskDto taskDto); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.xml index 12e3e6a9..514d22fb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.xml @@ -13,32 +13,30 @@ AND TASK_STATUS NOT IN (2, 9); - + SELECT l.*, + b.WC_NAME AS wcName FROM LM_TASK l - WHERE IS_DELETED = 0 - + left join BS_WORK_CENTER b + on l.WC_ID = b.ID + WHERE l.IS_DELETED = 0 + AND l.BOX_BARCODE LIKE CONCAT('%', #{taskDto.boxBarcode}, '%') - AND l.WC_ID = #{taskDto.wcId} - AND l.STATION_ID = #{taskDto.stationId} - AND l.TASK_STATUS = #{taskDto.taskStatus} - - + AND l.CREATE_TIME >= #{taskDto.startTime} - - + AND l.CREATE_TIME <= #{taskDto.endTime} ORDER BY l.CREATE_TIME DESC diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java index cea929da..f6b71116 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java @@ -410,6 +410,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { List stationList = iStationService.list(new LambdaQueryWrapper().eq(Station::getStationStatus, STATUS_FREE)); ArrayList bsWorkCenterVOList = new ArrayList<>(); BsWorkCenterVO bsWorkCenterVO = new BsWorkCenterVO(); + bsWorkCenterVO.setId(0l); bsWorkCenterVO.setWcName(DROPOFF_CONVEYOR_LINE_NAME); bsWorkCenterVOList.add(bsWorkCenterVO); if (!stationList.isEmpty()) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskServiceImpl.java index 4b470cd4..50441085 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskServiceImpl.java @@ -40,6 +40,8 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.List; +import static org.springblade.desk.logistics.pojo.entity.Task.getStatusDesc; + /** * 物流任务 服务类 * @@ -70,7 +72,7 @@ public class TaskServiceImpl extends BaseServiceImpl implement @Override public IPage selectPage(IPage page, TaskDto taskDto) { - List taskVOList = taskMapper.selectEquipmentPage(page, taskDto); + List taskVOList = taskMapper.selectPage(page, taskDto); return page.setRecords(taskVOList); } }