From 84fe2c1723ebe9fe83f3dc6bddc40ce3792f1e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=ABUmbrella?= <2539020564@qq.com> Date: Wed, 11 Mar 2026 14:51:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/logistics/pojo/entity/Task.java | 18 ++++++++++++++++++ .../desk/logistics/pojo/vo/TaskVO.java | 1 + .../service/impl/LocationServiceImpl.java | 9 ++++----- .../service/impl/OrderBindServiceImpl.java | 5 ++--- .../service/impl/StationServiceImpl.java | 7 +++---- .../impl/TaskExecuteRecordServiceImpl.java | 9 ++++----- .../service/impl/TaskServiceImpl.java | 19 +++++++++++++------ .../impl/VirtualShelvesServiceImpl.java | 5 ++--- .../service/impl/WeighDataServiceImpl.java | 5 ++--- 9 files changed, 49 insertions(+), 29 deletions(-) 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 203f6214..e27becfb 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 @@ -105,4 +105,22 @@ public class Task extends BaseEntity { @Schema(description = "备注") private String remark; + public static String getStatusName(Integer taskStatus) { + String name=""; + if (taskStatus== STATUS_START) { + name="任务开始"; + }else if (taskStatus == STATUS_RETURNED){ + name="箱体超重"; + }else if (taskStatus == STATUS_CONVEYOR_END){ + name="任务配送中"; + }else if (taskStatus == STATUS_FINISHED){ + name="任务结束"; + }else if (taskStatus == STATUS_FAILING){ + name="任务失败"; + }else if (taskStatus == STATUS_TEMPORARY_STORAGE){ + name="库位暂存"; + } + + return name; + } } 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 b593b8da..bcbd1a35 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,6 +18,7 @@ public class TaskVO extends Task { */ @JsonSerialize(using = ToStringSerializer.class) private Long id; + private String statusDesc; /** * 作业中心名字 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/LocationServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/LocationServiceImpl.java index 8d828287..3fe24e0f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/LocationServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/LocationServiceImpl.java @@ -48,21 +48,20 @@ import java.util.List; public class LocationServiceImpl extends BaseServiceImpl implements ILocationService { - @Autowired - LocationMapper locationMapper; + @Override public List selectByLocationStatus(Integer statusFree) { - return locationMapper.selectByLocationStatus(statusFree); + return baseMapper.selectByLocationStatus(statusFree); } @Override public List selectByStatus(Integer status) { - return locationMapper.selectByStatus(status); + return baseMapper.selectByStatus(status); } @Override public Location selectByLocationCode(String locationCode, int status) { - return locationMapper.selectByLocationCode(locationCode,status); + return baseMapper.selectByLocationCode(locationCode,status); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/OrderBindServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/OrderBindServiceImpl.java index f3dd2fcb..6c7edc69 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/OrderBindServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/OrderBindServiceImpl.java @@ -57,12 +57,11 @@ import static org.springblade.desk.logistics.pojo.entity.OrderBind.STATUS_UNBIND @Service @Slf4j public class OrderBindServiceImpl extends BaseServiceImpl implements IOrderBindService { - @Autowired - private OrderBindMapper orderBindMapper; + @Override public IPage selectPage(IPage page, OrderBindDto orderBindDto) { - List orderBindVOList = orderBindMapper.selectPage(page, orderBindDto); + List orderBindVOList = baseMapper.selectPage(page, orderBindDto); return page.setRecords(orderBindVOList); } /** 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 7255c314..c2519841 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 @@ -45,16 +45,15 @@ import java.util.List; @Slf4j public class StationServiceImpl extends BaseServiceImpl implements IStationService { - @Autowired - StationMapper stationMapper; + @Override public List selectByWcId(Long wcId) { - return stationMapper.selectByWcId(wcId); + return baseMapper.selectByWcId(wcId); } @Override public Station getByStationCode(String stationCode) { - return stationMapper.selectByStationCode(stationCode); + return baseMapper.selectByStationCode(stationCode); } } 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 672c9d3b..094cc961 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 @@ -45,8 +45,7 @@ import static org.springblade.desk.logistics.pojo.entity.Station.DROPOFF_CONVEYO @Slf4j public class TaskExecuteRecordServiceImpl extends BaseServiceImpl implements ITaskExecuteRecordService { - @Autowired - TaskExecuteRecordMapper taskExecuteRecordMapper; + @Autowired ITaskService taskService; @@ -292,7 +291,7 @@ public class TaskExecuteRecordServiceImpl extends BaseServiceImpl 0; } @@ -303,7 +302,7 @@ public class TaskExecuteRecordServiceImpl extends BaseServiceImpl implements ITaskService { - @Autowired - TaskMapper taskMapper; + @Override public void savePipelineWeigh(String boxBarcode, BigDecimal actualWeight, Integer statusStart) { // 1.查询物料箱 筛选状态 - Task task = taskMapper.selectByBoxBarcode(boxBarcode); + Task task = baseMapper.selectByBoxBarcode(boxBarcode); // 2.更新重量以及任务状态 task.setMachineWeight(actualWeight); task.setTaskStatus(statusStart); - taskMapper.updateById(task); + baseMapper.updateById(task); } @Override public Task getBoxBarcode(String boxBarcode) { - return taskMapper.selectByBoxBarcode(boxBarcode); + return baseMapper.selectByBoxBarcode(boxBarcode); } @Override public IPage selectPage(IPage page, TaskDto taskDto) { - List taskVOList = taskMapper.selectPage(page, taskDto); + List taskVOList = baseMapper.selectPage(page, taskDto); + for (TaskVO taskVO : taskVOList) { + taskVO.setStatusDesc(Task.getStatusName(taskVO.getTaskStatus())); + if (taskVO.getWcId()!=null&&taskVO.getWcId()==0) { + taskVO.setWcName(DROPOFF_CONVEYOR_LINE_NAME); + } + } return page.setRecords(taskVOList); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/VirtualShelvesServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/VirtualShelvesServiceImpl.java index 03fce68c..1ce473b5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/VirtualShelvesServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/VirtualShelvesServiceImpl.java @@ -46,12 +46,11 @@ import java.util.List; @Slf4j public class VirtualShelvesServiceImpl extends BaseServiceImpl implements IVirtualShelvesService { - @Autowired - VirtualShelvesMapper virtualShelvesMapper; + @Override public VirtualShelves getVirtualShelvesCode() { - List virtualShelvesList = virtualShelvesMapper.getVirtualShelvesCode(); + List virtualShelvesList = baseMapper.getVirtualShelvesCode(); if(CollectionUtils.isEmpty(virtualShelvesList)){ log.error("暂无虚拟货架表"); return null; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/WeighDataServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/WeighDataServiceImpl.java index b2b12da8..e078a751 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/WeighDataServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/WeighDataServiceImpl.java @@ -46,8 +46,7 @@ import java.math.BigDecimal; @Slf4j public class WeighDataServiceImpl extends BaseServiceImpl implements IWeighDataService { - @Autowired - WeighDataMapper weighDataMapper; + @Override public void saveWeighingData(String boxBarcode, BigDecimal actualWeight, BigDecimal ratedWeight, Integer returnStatus) { @@ -59,7 +58,7 @@ public class WeighDataServiceImpl extends BaseServiceImpl