Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

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;
+    }
 }

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;
 
     /**
      * 作业中心名字

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<LocationMapper, Location> implements ILocationService {
 
 
-    @Autowired
+
-    LocationMapper locationMapper;
 
     @Override
     public List<Location> selectByLocationStatus(Integer statusFree) {
-        return locationMapper.selectByLocationStatus(statusFree);
+        return baseMapper.selectByLocationStatus(statusFree);
     }
 
     @Override
     public List<Location> 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);
     }
 }

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<OrderBindMapper, OrderBind> implements IOrderBindService {
-    @Autowired
+
-    private  OrderBindMapper orderBindMapper;
 
     @Override
     public IPage<OrderBindVO> selectPage(IPage<OrderBindVO> page, OrderBindDto orderBindDto) {
-        List<OrderBindVO> orderBindVOList = orderBindMapper.selectPage(page, orderBindDto);
+        List<OrderBindVO> orderBindVOList = baseMapper.selectPage(page, orderBindDto);
         return page.setRecords(orderBindVOList);
     }
     /**

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<StationMapper, Station> implements IStationService {
 
-    @Autowired
+
-    StationMapper stationMapper;
 
     @Override
     public List<Station> 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);
     }
 }

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<TaskExecuteRecordMapper, TaskExecuteRecord> implements ITaskExecuteRecordService {
 
-    @Autowired
+
-    TaskExecuteRecordMapper taskExecuteRecordMapper;
 
     @Autowired
     ITaskService taskService;
@@ -291,7 +290,7 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
         taskExecuteRecord.setTaskCode(agvSchedulingTaskVO.getTaskCode());
         taskExecuteRecord.setStartPos(agvSchedulingTaskVO.getStartPos());
         taskExecuteRecord.setEndPos(agvSchedulingTaskVO.getEndPos());
-        int insert = taskExecuteRecordMapper.insert(taskExecuteRecord);
+        int insert = baseMapper.insert(taskExecuteRecord);
         return insert > 0;
     }
 
@@ -302,7 +301,7 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
 
         try {
             // 1. 查询任务执行记录
-            TaskExecuteRecord taskExecuteRecord = taskExecuteRecordMapper.selectByTaskCode(taskCode);
+            TaskExecuteRecord taskExecuteRecord = baseMapper.selectByTaskCode(taskCode);
             if(null == taskExecuteRecord){
                 log.error("未根据taskCode查询到有效数据，请求参数：{}", taskCode);
                 return false;
@@ -480,7 +479,7 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
         log.info("开始执行containerToAgv，taskCode：{}", taskCode);
 
         // 1. 查询任务执行记录
-        TaskExecuteRecord taskExecuteRecord = taskExecuteRecordMapper.selectByTaskCode(taskCode);
+        TaskExecuteRecord taskExecuteRecord = baseMapper.selectByTaskCode(taskCode);
         if (null == taskExecuteRecord) {
             log.error("未根据taskCode查询到有效数据，请求参数：{}", taskCode);
             return false;

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskServiceImpl.java

@@ -38,6 +38,8 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.List;
 
+import static org.springblade.desk.logistics.pojo.entity.Station.DROPOFF_CONVEYOR_LINE_NAME;
+
 
 /**
  * 物流任务 服务类
@@ -49,27 +51,32 @@ import java.util.List;
 @Slf4j
 public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> 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<TaskVO> selectPage(IPage<TaskVO> page, TaskDto taskDto) {
-        List<TaskVO> taskVOList = taskMapper.selectPage(page, taskDto);
+        List<TaskVO> 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);
     }
 }

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<VirtualShelvesMapper, VirtualShelves> implements IVirtualShelvesService {
 
-    @Autowired
+
-    VirtualShelvesMapper virtualShelvesMapper;
 
     @Override
     public VirtualShelves getVirtualShelvesCode() {
-        List<VirtualShelves> virtualShelvesList = virtualShelvesMapper.getVirtualShelvesCode();
+        List<VirtualShelves> virtualShelvesList = baseMapper.getVirtualShelvesCode();
         if(CollectionUtils.isEmpty(virtualShelvesList)){
             log.error("暂无虚拟货架表");
             return null;

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<WeighDataMapper, WeighData> 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<WeighDataMapper, Weigh
 
         try {
             // 执行插入
-            int result = weighDataMapper.insert(weighData);
+            int result = baseMapper.insert(weighData);
 
             if (result <= 0) {
                 throw new RuntimeException("保存称重数据失败");