代码提交

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 "未知状态";
         }

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

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.java

@@ -22,5 +22,5 @@ public interface TaskMapper  extends BaseMapper<Task> {
      * @param taskDto 查询参数
      * @return List<EquipmentVO>
      */
-    List<TaskVO> selectEquipmentPage(IPage page, TaskDto taskDto);
+    List<TaskVO> selectPage(IPage page, TaskDto taskDto);
 }

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>
 
-    <select id="selectEquipmentPage" resultType="org.springblade.desk.logistics.pojo.vo.TaskVO">
-        SELECT *
+    <select id="selectPage" resultType="org.springblade.desk.logistics.pojo.vo.TaskVO">
+        SELECT l.*,
+        b.WC_NAME AS wcName
         FROM LM_TASK l
-        WHERE IS_DELETED = 0
-        <!-- 修复原代码拼写错误：boxBarcodede → boxBarcode -->
+        left join BS_WORK_CENTER b
+        on l.WC_ID = b.ID
+        WHERE l.IS_DELETED = 0  <!-- 关键修复：添加 l. 表别名 -->
+        <!-- 以下筛选条件保持不变 -->
         <if test="taskDto.boxBarcode != null and taskDto.boxBarcode != ''">
             AND l.BOX_BARCODE LIKE CONCAT('%', #{taskDto.boxBarcode}, '%')
         </if>
-        <!--  wcId 判断 -->
         <if test="taskDto.wcId != null and taskDto.wcId != ''">
             AND l.WC_ID = #{taskDto.wcId}
         </if>
-        <!-- 站点 判断 -->
         <if test="taskDto.stationId != null and taskDto.stationId != ''">
             AND l.STATION_ID = #{taskDto.stationId}
         </if>
-        <!-- 状态判断 -->
         <if test="taskDto.taskStatus != null and taskDto.taskStatus != ''">
             AND l.TASK_STATUS = #{taskDto.taskStatus}
         </if>
-        <!-- 新增：开始时间判断（CREATE_TIME >= 开始时间） -->
-        <if test="taskDto.startTime != null">
+        <if test="taskDto.startTime != null and taskDto.startTime != ''">
             AND l.CREATE_TIME &gt;= #{taskDto.startTime}
         </if>
-        <!-- 新增：结束时间判断（CREATE_TIME <= 结束时间） -->
-        <if test="taskDto.endTime != null">
+        <if test="taskDto.endTime != null and taskDto.endTime != ''">
             AND l.CREATE_TIME &lt;= #{taskDto.endTime}
         </if>
         ORDER BY l.CREATE_TIME DESC

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<Station> stationList = iStationService.list(new LambdaQueryWrapper<Station>().eq(Station::getStationStatus, STATUS_FREE));
         ArrayList<BsWorkCenterVO> bsWorkCenterVOList = new ArrayList<>();
         BsWorkCenterVO bsWorkCenterVO = new BsWorkCenterVO();
+        bsWorkCenterVO.setId(0l);
         bsWorkCenterVO.setWcName(DROPOFF_CONVEYOR_LINE_NAME);
         bsWorkCenterVOList.add(bsWorkCenterVO);
         if (!stationList.isEmpty()) {

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<TaskMapper, Task> implement
 
     @Override
     public IPage<TaskVO> selectPage(IPage<TaskVO> page, TaskDto taskDto) {
-        List<TaskVO> taskVOList = taskMapper.selectEquipmentPage(page, taskDto);
+        List<TaskVO> taskVOList = taskMapper.selectPage(page, taskDto);
         return page.setRecords(taskVOList);
     }
 }