From ef4694de2953ccaac0299c221707f4ccf2e9051c Mon Sep 17 00:00:00 2001
From: lsymicc <e003914@163.com>
Date: Fri, 22 May 2026 09:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=95=8C=E9=9D=A2=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduleTask/ssj/PortConvThread.java      |  3 -
 ruoyi-ui/src/views/job/mydoJob/index.vue      | 55 +++++++++++++------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
index fef198a..d6e5e81 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
@@ -192,9 +192,6 @@ public class PortConvThread implements Runnable {
         paramMap.put("altimetry", height);//高度
         paramMap.put("adverseCauses", errorMessage);
 
-//        if (inSsjDevice.getException() > 0){
-//            log.warn("【入库异常】{}",errorMessage);
-//        }
 
         //-----------------警告校验:条码已有库存-----------------
         BasCargoSpace cargoSpace = new BasCargoSpace();
diff --git a/ruoyi-ui/src/views/job/mydoJob/index.vue b/ruoyi-ui/src/views/job/mydoJob/index.vue
index 9a7d935..552bd66 100644
--- a/ruoyi-ui/src/views/job/mydoJob/index.vue
+++ b/ruoyi-ui/src/views/job/mydoJob/index.vue
@@ -1,25 +1,37 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="任务号" prop="taskNo">
-        <el-input v-model="queryParams.taskNo" placeholder="请输入任务号" clearable @keyup.enter.native="handleQuery" />
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form-item label="wcs任务号" prop="taskNo">
+        <el-input v-model="queryParams.taskNo" placeholder="请输入wcs任务号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+
+      <el-form-item label="wms任务号" prop="wmsTaskNo">
+        <el-input v-model="queryParams.wmsTaskNo" placeholder="请输入wms任务号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="托盘条码" prop="trayCode">
+        <el-input v-model="queryParams.trayCode" placeholder="请输入条码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="货位ID" prop="cargoSpaceId">
+             <el-input v-model="queryParams.cargoSpaceId" placeholder="请输入货位ID" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+
       <el-form-item label="任务状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
           <el-option v-for="dict in dict.type.job_status" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="巷道ID" prop="roadwayId">
-        <el-input v-model="queryParams.roadwayId" placeholder="请输入巷道ID" clearable @keyup.enter.native="handleQuery" />
+
+      <el-form-item label="任务类型" prop="inOrOut">
+        <el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
+          <el-option v-for="dict in dict.type.job_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
       </el-form-item>
-      <!--      <el-form-item label="货位ID" prop="cargoSpaceId">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.cargoSpaceId"-->
-      <!--          placeholder="请输入货位ID"-->
-      <!--          clearable-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
+
+      <!-- <el-form-item label="巷道ID" prop="roadwayId">
+        <el-input v-model="queryParams.roadwayId" placeholder="请输入巷道ID" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
       <!--      <el-form-item label="去向" prop="targetRoadwayId">-->
       <!--        <el-input-->
       <!--          v-model="queryParams.targetRoadwayId"-->
@@ -141,17 +153,22 @@
           <dict-tag :options="dict.type.job_status" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="任务号" align="center" prop="taskNo" />
+      <el-table-column label="wcs任务号" align="center" prop="taskNo" />
+      <el-table-column label="wms任务号" align="center" prop="wmsTaskNo" />
       <el-table-column label="巷道ID" align="center" prop="roadwayId" />
       <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />
-      <el-table-column label="序列号" align="center" prop="trayCode" />
-      <el-table-column label="优先级" align="center" prop="priority" />
+      <el-table-column label="托盘条码" align="center" prop="trayCode" />
+      <!-- <el-table-column label="优先级" align="center" prop="priority" /> -->
       <el-table-column label="执行阶段" align="center" prop="executionPhase">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.job_ep" :value="scope.row.executionPhase" />
         </template>
       </el-table-column>
-      <!--      <el-table-column label="任务类型" align="center" prop="inOrOut" />-->
+      <el-table-column label="任务类型" align="center" prop="inOrOut">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.job_type" :value="scope.row.inOrOut" />
+        </template>
+      </el-table-column>
       <el-table-column label="开始时间" align="center" prop="startTime" />
       <el-table-column label="结束时间" align="center" prop="finishTime" />
       <el-table-column label="入口ID" align="center" prop="entranceId" />
@@ -204,7 +221,7 @@ import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob, listMyd
 
 export default {
   name: "MydoJob",
-  dicts: ['job_status', 'job_ep'],
+  dicts: ['job_status','job_type', 'job_ep'],
   data() {
     return {
       // 遮罩层
@@ -231,6 +248,7 @@ export default {
         pageSize: 10,
         status: null,
         taskNo: null,
+        wmsTaskNo: null, //@@@ FT568 入库请求wms返回的任务号
         roadwayId: null,
         cargoSpaceId: null,
         targetRoadwayId: null,
@@ -292,6 +310,7 @@ export default {
         jobId: null,
         status: null,
         taskNo: null,
+        wmsTaskNo: null, //@@@ FT568 入库请求wms返回的任务号
         roadwayId: null,
         cargoSpaceId: null,
         targetRoadwayId: null,