提交wcs任务监控

dev_wms_client/src/api/wcsTask.js

@@ -0,0 +1,9 @@
+import request from "@/http/request";
+
+export const queryWcsTaskInfoByPage = (params) => {
+    return request({
+        url: '/wcsTask/queryWcsTasksByPage',
+        method: 'post',
+        data: params
+    })
+}

dev_wms_client/src/layout/wcsTask.vue

@@ -0,0 +1,276 @@
+<template>
+  <el-config-provider :locale="zhCn">
+    <el-container class="content">
+      <div class="work-area">
+        <fieldset class="search-area">
+          <el-form ref="searchQueryFormRef" :model="searchQueryFormEntity" :label-position="labelPosition"
+                   label-width="158px" style="max-width: 100%" status-icon>
+            <div style="display: flex;justify-content: space-between;">
+              <el-row>
+                <el-form-item label="任务状态">
+                  <el-select v-model="searchQueryFormEntity.wcsTaskStatus" placeholder="请选择任务状态" clearable>
+                    <el-option v-for="item in taskStatusOptions" :key="item.value" :label="item.label"
+                             :value="item.value" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="箱号">
+                  <el-input v-model="searchQueryFormEntity.vehicleId" @keyup.enter="search()" clearable />
+                </el-form-item>
+                <el-form-item label="起点">
+                  <el-input v-model="searchQueryFormEntity.origin" @keyup.enter="search()" clearable />
+                </el-form-item>
+                <el-form-item label="终点">
+                  <el-input v-model="searchQueryFormEntity.destination" @keyup.enter="search()" clearable />
+                </el-form-item>
+              </el-row>
+              <div style="align-content: center;">
+                <el-row>
+                  <el-button type="primary" class="btn-search" @click="search()">查询</el-button>
+                  <el-button type="warning" class="btn-search" @click="clearQuery()">清除输入</el-button>
+                </el-row>
+              </div>
+            </div>
+          </el-form>
+        </fieldset>
+        <div class="table-area">
+          <el-table :data="tableData" stripe border v-loading="tableLoading" class="table-class"
+                    :max-height="maxHeight" highlight-current-row
+                    :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }"
+                    @sort-change="handleSortChange">
+            <el-table-column prop="wcsTaskId" label="任务号" fixed="left" min-width="180px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="vehicleId" label="箱号" fixed="left" min-width="120px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="wcsTaskStatus" label="任务状态" min-width="100px" sortable="custom"
+                             show-overflow-tooltip>
+              <template #default="scope">
+                {{ getTaskStatusLabel(scope.row.wcsTaskStatus) }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="wcsTaskType" label="任务类型" min-width="100px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="taskPriority" label="优先级" min-width="80px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="origin" label="起点" min-width="120px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="destination" label="终点" min-width="120px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="createTime" label="创建时间" min-width="160px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="sendTime" label="下发时间" min-width="160px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="finishTime" label="完成时间" min-width="160px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="remark" label="备注" min-width="120px" sortable="custom"
+                             show-overflow-tooltip />
+          </el-table>
+          <br />
+          <el-pagination v-model:current-page="baseTableQuery.pageNo"
+                         v-model:page-size="baseTableQuery.pageSize" :page-sizes="[10, 25, 50]" :small="false"
+                         :disabled="false" :background="false" :default-page-size="10" @size-change="search"
+                         @current-change="search" layout="total, sizes, prev, pager, next, jumper"
+                         :total="baseTableQuery.total" />
+        </div>
+      </div>
+    </el-container>
+  </el-config-provider>
+</template>
+
+<script setup>
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+import { queryWcsTaskInfoByPage } from '@/api/wcsTask.js'
+import { ref, reactive, onMounted, nextTick, onBeforeUnmount } from 'vue'
+import { ElMessage } from 'element-plus'
+import { labelPosition } from '@/constant/form.js'
+
+/**
+ * 常量定义
+ */
+const taskStatusOptions = [
+  { value: 0, label: '任务初始化' },
+  { value: 1, label: '任务排队中' },
+  { value: 2, label: '任务开始执行' },
+  { value: 3, label: '任务已经离开初始位置' },
+  { value: 4, label: '任务到达中间点' },
+  { value: 5, label: '任务到达目的地' },
+  { value: 100, label: '任务完成' },
+  { value: 998, label: '任务取消' },
+  { value: 999, label: '任务异常' }
+]
+
+/**
+ * 变量定义
+ */
+let maxHeight = ref(window.innerHeight * 0.55)
+let tableLoading = ref(false)
+let tableData = ref([])
+let baseTableQuery = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  total: 0,
+  sortBy: [{
+    column: 'wcs_task_id',
+    asc: true
+  }]
+})
+let searchQueryFormEntity = reactive({
+  wcsTaskStatus: '',
+  vehicleId: '',
+  origin: '',
+  destination: ''
+})
+let searchQueryFormRef = ref()
+
+/**
+ * 系统方法
+ */
+onMounted(() => {
+  nextTick(() => {
+    window.addEventListener('resize', resizeHeight)
+    search()
+  })
+})
+
+onBeforeUnmount(() => {
+  nextTick(() => {
+    window.removeEventListener('resize', resizeHeight)
+  })
+})
+
+const resizeHeight = () => {
+  maxHeight.value = window.innerHeight * 0.55
+}
+
+/**
+ * 自定义方法
+ */
+// 查询
+const search = () => {
+  tableLoading.value = true
+  let request = {
+    ...baseTableQuery,
+    wcsTaskStatus: searchQueryFormEntity.wcsTaskStatus,
+    vehicleId: searchQueryFormEntity.vehicleId.trim(),
+    origin: searchQueryFormEntity.origin.trim(),
+    destination: searchQueryFormEntity.destination.trim()
+  }
+
+  queryWcsTaskInfoByPage(request).then((res) => {
+    const response = res.data
+    if (response.code === 0) {
+      const data = response.data
+      if (data != null) {
+        tableData.value = data.lists
+        baseTableQuery.total = data.total
+      } else {
+        tableData.value = []
+        baseTableQuery.total = 0
+      }
+    } else {
+      ElMessage.error(response.message)
+    }
+  }).catch(err => {
+    console.log(err)
+    ElMessage.error('查询数据异常。')
+  }).finally(() => {
+    tableLoading.value = false
+  })
+}
+
+const clearQuery = () => {
+  searchQueryFormEntity.wcsTaskStatus = ''
+  searchQueryFormEntity.vehicleId = ''
+  searchQueryFormEntity.origin = ''
+  searchQueryFormEntity.destination = ''
+}
+
+const handleSortChange = (data) => {
+  // 将驼峰命名转换为下划线命名
+  const columnMap = {
+    'wcsTaskId': 'wcs_task_id',
+    'wcsTaskStatus': 'wcs_task_status',
+    'wcsTaskType': 'wcs_task_type',
+    'taskPriority': 'task_priority',
+    'vehicleId': 'vehicle_id',
+    'createTime': 'create_time',
+    'sendTime': 'send_time',
+    'finishTime': 'finish_time'
+  }
+
+  baseTableQuery.sortBy = [{
+    column: columnMap[data.prop] || data.prop,
+    asc: data.order.toLowerCase() === 'ascending'
+  }]
+  search()
+}
+
+const getTaskStatusLabel = (status) => {
+  const option = taskStatusOptions.find(opt => opt.value === status)
+  return option ? option.label : '未知'
+}
+</script>
+
+<style scoped>
+.content {
+  display: flex;
+  width: 100%;
+}
+
+.work-area {
+  width: 100%;
+}
+
+.search-area {
+  margin: auto;
+  min-height: fit-content;
+  max-height: 40%;
+  margin-bottom: 10px;
+  min-width: inherit;
+  border: solid 1px;
+  border-radius: 10px;
+  box-shadow: 0px 15px 10px -15px #000;
+  overflow: auto;
+  padding: 10px;
+}
+
+.table-area {
+  margin: auto;
+  min-height: fit-content;
+  max-height: 60%;
+  margin-bottom: 10px;
+  min-width: inherit;
+  border: solid 1px;
+  border-radius: 10px;
+  box-shadow: 0px 15px 10px -15px #000;
+  overflow: auto;
+  padding: 10px;
+}
+
+.el-form-item {
+  margin: 5px 5px 5px 5px;
+}
+
+.el-form-item .el-input {
+  width: 196px;
+}
+
+.el-form-item .el-select {
+  width: 196px;
+}
+
+.table-class {
+  margin: 5px 5px 5px 5px;
+  width: inherit;
+}
+
+.el-pagination {
+  padding-left: 5px;
+}
+
+.btn-search {
+  height: 30px;
+  width: 80px;
+  margin: auto 5px 5px auto;
+  color: black;
+}
+</style>

dev_wms_client/src/router/index.js

@@ -41,6 +41,7 @@ const routes = [
             {path: '/job', component: () => import('@/layout/job.vue')},
             {path: '/pickPlan', component: () => import('@/layout/pickPlan.vue')},
             {path: '/pickTaskBak', component: () => import('@/layout/pickTaskBak.vue')},
+            {path: '/wcsTask', component: () => import('@/layout/wcsTask.vue')},
         ]
     },
     {

dev_wms_serve/src/main/java/com/wms_main/controller/wms/WcsTaskController.java

@@ -0,0 +1,28 @@
+package com.wms_main.controller.wms;
+
+import com.wms_main.model.dto.query.WcsTaskQuery;
+import com.wms_main.model.dto.response.wms.WmsApiResponse;
+import com.wms_main.model.vo.wms.PageVo;
+import com.wms_main.model.vo.wms.WcsTaskVo;
+import com.wms_main.service.controller.IWcsTaskControllerService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@ResponseBody
+@CrossOrigin
+@RequiredArgsConstructor
+@RequestMapping("/wms/wcsTask")
+public class WcsTaskController {
+    private final IWcsTaskControllerService wcsTaskControllerService;
+
+    /**
+     * 分页查询拣选计划
+     * @param wcsTaskQuery 查询参数
+     * @return 查询结果
+     */
+    @PostMapping("/queryWcsTasksByPage")
+    public WmsApiResponse<PageVo<WcsTaskVo>> queryWcsTasksByPage(@RequestBody WcsTaskQuery wcsTaskQuery) {
+        return wcsTaskControllerService.queryWcsTaskInfoByPage(wcsTaskQuery);
+    }
+}

dev_wms_serve/src/main/java/com/wms_main/model/dto/query/WcsTaskQuery.java

@@ -0,0 +1,71 @@
+package com.wms_main.model.dto.query;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WcsTaskQuery extends PageQuery {
+    /**
+     * wcs任务id
+     */
+    @JsonProperty(value = "wcsTaskId")
+    private String wcsTaskId;
+    /**
+     * wcs任务状态
+     */
+    @JsonProperty(value = "wcsTaskStatus")
+    private Integer wcsTaskStatus;
+    /**
+     * wcs任务类型
+     */
+    @JsonProperty(value = "wcsTaskType")
+    private Integer wcsTaskType;
+    /**
+     * wcs任务优先级
+     */
+    @JsonProperty(value = "taskPriority")
+    private Integer taskPriority;
+    /**
+     * 载具号
+     */
+    @JsonProperty(value = "vehicleId")
+    private String vehicleId;
+    /**
+     * 起点
+     */
+    @JsonProperty(value = "origin")
+    private String origin;
+    /**
+     * 终点
+     */
+    @JsonProperty(value = "destination")
+    private String destination;
+    /**
+     * 创建时间
+     */
+    @JsonProperty(value = "createTime")
+    private LocalDateTime createTime;
+    /**
+     * 发送时间
+     */
+    @JsonProperty(value = "sendTime")
+    private LocalDateTime sendTime;
+    /**
+     * 完成时间
+     */
+    @JsonProperty(value = "finishTime")
+    private LocalDateTime finishTime;
+    /**
+     * 备注
+     */
+    @JsonProperty(value = "remark")
+    private String remark;
+}

dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/WcsTaskVo.java

@@ -2,6 +2,7 @@ package com.wms_main.model.vo.wms;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wms_main.model.po.TAppWcsTask;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -79,4 +80,30 @@ public class WcsTaskVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String remark;
+
+    /**
+     * 将TAppWcsTask转换为WcsTaskVo
+     *
+     * @param wcsTask wcs任务实体
+     * @return wcs任务视图对象
+     */
+    public static WcsTaskVo of(TAppWcsTask wcsTask) {
+        if (wcsTask == null) {
+            return null;
+        }
+
+        WcsTaskVo wcsTaskVo = new WcsTaskVo();
+        wcsTaskVo.setWcsTaskId(wcsTask.getWcsTaskId());
+        wcsTaskVo.setWcsTaskStatus(wcsTask.getWcsTaskStatus());
+        wcsTaskVo.setWcsTaskType(wcsTask.getWcsTaskType());
+        wcsTaskVo.setTaskPriority(wcsTask.getTaskPriority());
+        wcsTaskVo.setVehicleId(wcsTask.getVehicleId());
+        wcsTaskVo.setOrigin(wcsTask.getOrigin());
+        wcsTaskVo.setDestination(wcsTask.getDestination());
+        wcsTaskVo.setCreateTime(wcsTask.getCreateTime());
+        wcsTaskVo.setSendTime(wcsTask.getSendTime());
+        wcsTaskVo.setFinishTime(wcsTask.getFinishTime());
+        wcsTaskVo.setRemark(wcsTask.getRemark());
+        return wcsTaskVo;
+    }
 }

dev_wms_serve/src/main/java/com/wms_main/service/controller/IWcsTaskControllerService.java

@@ -0,0 +1,10 @@
+package com.wms_main.service.controller;
+
+import com.wms_main.model.dto.query.WcsTaskQuery;
+import com.wms_main.model.dto.response.wms.WmsApiResponse;
+import com.wms_main.model.vo.wms.PageVo;
+import com.wms_main.model.vo.wms.WcsTaskVo;
+
+public interface IWcsTaskControllerService {
+    WmsApiResponse<PageVo<WcsTaskVo>> queryWcsTaskInfoByPage(WcsTaskQuery wcsTaskQuery);
+}

dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/WcsTaskControllerServiceImpl.java

@@ -0,0 +1,39 @@
+package com.wms_main.service.controller.serviceImpl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wms_main.dao.ITAppWcsTaskService;
+import com.wms_main.model.dto.query.WcsTaskQuery;
+import com.wms_main.model.dto.response.wms.WmsApiResponse;
+import com.wms_main.model.po.TAppWcsTask;
+import com.wms_main.model.vo.wms.PageVo;
+import com.wms_main.model.vo.wms.WcsTaskVo;
+import com.wms_main.repository.utils.StringUtils;
+import com.wms_main.service.controller.IWcsTaskControllerService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class WcsTaskControllerServiceImpl implements IWcsTaskControllerService {
+    private final ITAppWcsTaskService appWcsTaskService;
+
+    @Override
+    public WmsApiResponse<PageVo<WcsTaskVo>> queryWcsTaskInfoByPage(WcsTaskQuery wcsTaskQuery) {
+        if (wcsTaskQuery == null) {
+            return WmsApiResponse.error("查询参数不能为NULL", null);
+        }
+        Page<TAppWcsTask> page = wcsTaskQuery.toMpPage();
+        LambdaQueryWrapper<TAppWcsTask> lambdaQueryWrapper = new LambdaQueryWrapper<TAppWcsTask>()
+                .eq(StringUtils.isNotEmpty(wcsTaskQuery.getVehicleId()), TAppWcsTask::getVehicleId, wcsTaskQuery.getVehicleId())
+                .eq(wcsTaskQuery.getWcsTaskStatus() != null, TAppWcsTask::getWcsTaskStatus, wcsTaskQuery.getWcsTaskStatus())
+                .like(StringUtils.isNotEmpty(wcsTaskQuery.getOrigin()), TAppWcsTask::getOrigin, wcsTaskQuery.getOrigin())
+                .like(StringUtils.isNotEmpty(wcsTaskQuery.getDestination()), TAppWcsTask::getDestination, wcsTaskQuery.getDestination());
+        Page<TAppWcsTask> poPage = appWcsTaskService.page(page, lambdaQueryWrapper);
+
+        PageVo<WcsTaskVo> pageVo = PageVo.of(poPage, WcsTaskVo::of);
+        return WmsApiResponse.success("查询wcs任务成功", pageVo);
+    }
+}