diff --git a/ruoyi-ui/src/views/check/difference/index.vue b/ruoyi-ui/src/views/check/difference/index.vue
index 133d082..b169cec 100644
--- a/ruoyi-ui/src/views/check/difference/index.vue
+++ b/ruoyi-ui/src/views/check/difference/index.vue
@@ -95,51 +95,51 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['check:difference:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['check:difference:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['check:difference:remove']"
-        >删除</el-button>
-      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['check:difference:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--&lt;!&ndash;      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['check:difference:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['check:difference:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['check:difference:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>&ndash;&gt;-->
+<!--&lt;!&ndash;      <el-col :span="1.5">&ndash;&gt;-->
+<!--&lt;!&ndash;        <el-button&ndash;&gt;-->
+<!--&lt;!&ndash;          type="warning"&ndash;&gt;-->
+<!--&lt;!&ndash;          plain&ndash;&gt;-->
+<!--&lt;!&ndash;          icon="el-icon-download"&ndash;&gt;-->
+<!--&lt;!&ndash;          size="mini"&ndash;&gt;-->
+<!--&lt;!&ndash;          @click="handleExport"&ndash;&gt;-->
+<!--&lt;!&ndash;          v-hasPermi="['check:difference:export']"&ndash;&gt;-->
+<!--&lt;!&ndash;        >导出</el-button>&ndash;&gt;-->
+<!--&lt;!&ndash;      </el-col>&ndash;&gt;-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
 
     <el-table v-loading="loading" :data="differenceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
diff --git a/ruoyi-ui/src/views/check/job/in/index.vue b/ruoyi-ui/src/views/check/job/in/index.vue
new file mode 100644
index 0000000..4b77e22
--- /dev/null
+++ b/ruoyi-ui/src/views/check/job/in/index.vue
@@ -0,0 +1,574 @@
+<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="任务ID" prop="jobId">
+        <el-input
+          v-model="queryParams.jobId"
+          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.mydo_job_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="上线类型" prop="onLineType">
+        <el-select v-model="queryParams.onLineType" placeholder="请选择上线类型" clearable>
+          <el-option
+            v-for="dict in dict.type.on_line_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>-->
+      <el-form-item label="任务号" prop="taskNo">
+        <el-input
+          v-model="queryParams.taskNo"
+          placeholder="请输入任务号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="供应商ID" prop="supplierId">
+        <el-input
+          v-model="queryParams.supplierId"
+          placeholder="请输入供应商ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户ID" prop="customerId">
+        <el-input
+          v-model="queryParams.customerId"
+          placeholder="请输入客户ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门ID" prop="departmentId">
+        <el-input
+          v-model="queryParams.departmentId"
+          placeholder="请输入部门ID"
+          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="roadwayId">
+        <el-input
+          v-model="queryParams.roadwayId"
+          placeholder="请输入巷道ID"
+          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="目标巷道ID" prop="targetRoadwayId">
+        <el-input
+          v-model="queryParams.targetRoadwayId"
+          placeholder="请输入目标巷道ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="目标货位" prop="targetCargoSpaceId">
+        <el-input
+          v-model="queryParams.targetCargoSpaceId"
+          placeholder="请输入目标货位ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="产线ID" prop="lineId">
+        <el-input
+          v-model="queryParams.lineId"
+          placeholder="请输入产线ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车间ID" prop="workshopId">
+        <el-input
+          v-model="queryParams.workshopId"
+          placeholder="请输入车间ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input
+          v-model="queryParams.priority"
+          placeholder="请输入优先级"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="执行阶段" prop="executionPhase">
+        <el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>
+          <el-option
+            v-for="dict in dict.type.execution_phase_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任务类型" prop="inOrOut">
+        <el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
+          <el-option
+            v-for="dict in dict.type.check_in_job_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime">
+        <el-date-picker clearable
+          v-model="queryParams.startTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="finishTime">
+        <el-date-picker clearable
+          v-model="queryParams.finishTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="入口" prop="entranceId">
+        <el-input
+          v-model="queryParams.entranceId"
+          placeholder="请输入入口ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出口" prop="exitId">
+        <el-input
+          v-model="queryParams.exitId"
+          placeholder="请输入出口ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="班组ID" prop="classId">
+        <el-input
+          v-model="queryParams.classId"
+          placeholder="请输入班组ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="仓库" prop="warehouseId">
+        <el-input
+          v-model="queryParams.warehouseId"
+          placeholder="请输入仓库ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="重分标记" prop="faultFlag">
+        <el-input
+          v-model="queryParams.faultFlag"
+          placeholder="请输入重分标记"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          @click="handleCompletedManually({type: 'invalid'})"
+          v-hasPermi="['job:mydoJob:CompletedManually']"
+        >手动作废</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          @click="handleCompletedManually({type: 'completed'})"
+          v-hasPermi="['job:mydoJob:CompletedManually']"
+        >手动完成</el-button>
+      </el-col>
+<!--      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['job:mydoJob:export']"
+        >导出</el-button>
+      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
+      max-height="300">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="任务ID" align="center" prop="jobId" fixed />
+      <el-table-column label="任务状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="上线类型" align="center" prop="onLineType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务类型" align="center" prop="inOrOut">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.check_in_job_type" :value="scope.row.inOrOut"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务号" align="center" prop="taskNo" />
+      <el-table-column label="供应商" align="center" prop="supplierName" key="supplierId" value="supplierName" />
+<!--      <el-table-column label="客户ID" align="center" prop="customerId" />-->
+      <el-table-column label="部门" align="center" prop="departmentName" />
+      <el-table-column label="托盘码" align="center" prop="trayCode" />
+      <el-table-column label="巷道ID" align="center" prop="roadwayId" />
+      <el-table-column label="货位" align="center" prop="cargoSpaceName" />
+      <el-table-column label="目标巷道" align="center" prop="targetRoadwayId" />
+      <el-table-column label="目标货位" align="center" prop="targetCargoSpaceName" />
+      <el-table-column label="产线ID" align="center" prop="lineId" />
+      <el-table-column label="车间ID" align="center" prop="workshopId" />
+      <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.execution_phase_type" :value="scope.row.executionPhase"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="finishTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="入口ID" align="center" prop="entranceId" />
+<!--      <el-table-column label="出口ID" align="center" prop="exitId" />-->
+      <el-table-column label="班组ID" align="center" prop="classId" />
+      <el-table-column label="仓库ID" align="center" prop="warehouseId" />
+      <el-table-column label="重分标记" align="center" prop="faultFlag" />
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange"
+              max-height="300"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="子任务ID" align="center" prop="jobDetailId" />
+      <el-table-column label="任务ID" align="center" prop="jobId" />
+      <el-table-column label="库存ID" align="center" prop="stockId" />
+      <el-table-column label="批次号" align="center" prop="lotNo" />
+      <el-table-column label="入库时间" align="center" prop="inDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="单据ID" align="center" prop="inOrOutId" />
+      <el-table-column label="子单据ID" align="center" prop="inOrOutDId" />
+      <el-table-column label="物料GUID" align="center" prop="productGuid" />
+      <el-table-column label="物料编码" align="center" prop="productId" />
+      <el-table-column label="库存状态" align="center" prop="stockStatus" />
+      <el-table-column label="入库数量" align="center" prop="inQuantity" />
+<!--      <el-table-column label="库存数量" align="center" prop="stockQuantity" />-->
+<!--      <el-table-column label="出库数量" align="center" prop="outQuantity" />-->
+<!--      <el-table-column label="整层数量" align="center" prop="layerQuantity" />-->
+<!--      <el-table-column label="出库层数量" align="center" prop="outLayerQuantity" />-->
+<!--      <el-table-column label="回流数量" align="center" prop="giveNum" />-->
+<!--      <el-table-column label="追溯入库单ID" align="center" prop="stockinId" />-->
+<!--      <el-table-column label="垛型ID" align="center" prop="stackingId" />-->
+<!--      <el-table-column label="出库口ID" align="center" prop="exitId" />-->
+      <el-table-column label="生产日期" align="center" prop="printDate" />
+<!--      <el-table-column label="客户ID" align="center" prop="customerId" />-->
+      <el-table-column label="供应商ID" align="center" prop="supplierId" />
+<!--      <el-table-column label="备用字段1" align="center" prop="spare1" />
+      <el-table-column label="备用字段2" align="center" prop="spare2" />
+      <el-table-column label="备用字段3" align="center" prop="spare3" />
+      <el-table-column label="备用字段4" align="center" prop="spare4" />-->
+    </el-table>
+
+    <pagination
+      v-show="detailTotal>0"
+      :total="detailTotal"
+      :page.sync="queryDetailParams.pageNum"
+      :limit.sync="queryDetailParams.pageSize"
+      @pagination="getDetailList"
+    />
+
+
+  </div>
+</template>
+
+<script>
+import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob } from "@/api/job/inmydoJob"
+import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
+
+export default {
+  name: "MydoJob",
+  dicts: ['execution_phase_type', 'check_in_job_type', 'on_line_type', 'mydo_job_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      detailLoading:false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      detailTotal: 0,
+      // 任务表表格数据
+      mydoJobList: [],
+      // 子任务表表格数据
+      mydoJobDetailList:[],
+      // 当前选中行
+      currentRow:null,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        jobId: null,
+        status: '1',
+        onLineType: null,
+        taskNo: null,
+        supplierId: null,
+        customerId: null,
+        departmentId: null,
+        trayCode: null,
+        roadwayId: null,
+        cargoSpaceId: null,
+        targetRoadwayId: null,
+        targetCargoSpaceId: null,
+        lineId: null,
+        workshopId: null,
+        priority: null,
+        executionPhase: null,
+        inOrOut: '2',
+        createTime: null,
+        startTime: null,
+        finishTime: null,
+        entranceId: null,
+        exitId: null,
+        classId: null,
+        warehouseId: null,
+        faultFlag: null
+      },
+      queryDetailParams:{
+        pageNum: 1,
+        pageSize: 10,
+        jobId: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        jobId: [
+          { required: true, message: "任务ID不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "任务状态不能为空", trigger: "change" }
+        ],
+        taskNo: [
+          { required: true, message: "任务号不能为空", trigger: "blur" }
+        ],
+      }
+    }
+  },
+  created() {
+    // 获取字典数据后，设置默认值
+    this.getList()
+  },
+  methods: {
+    /** 查询任务表列表 */
+    getList() {
+      this.loading = true
+      listMydoJob(this.queryParams).then(response => {
+        this.mydoJobList = response.rows
+        this.total = response.total
+        this.loading = false
+        // 如果有数据，自动选中第一行
+        if (this.mydoJobList.length > 0) {
+          this.handleRowClick(this.mydoJobList[0]);
+        }
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        jobId: null,
+        status: null,
+        onLineType: null,
+        taskNo: null,
+        supplierId: null,
+        customerId: null,
+        departmentId: null,
+        trayCode: null,
+        roadwayId: null,
+        cargoSpaceId: null,
+        targetRoadwayId: null,
+        targetCargoSpaceId: null,
+        lineId: null,
+        workshopId: null,
+        priority: null,
+        executionPhase: null,
+        inOrOut: null,
+        createTime: null,
+        startTime: null,
+        finishTime: null,
+        entranceId: null,
+        exitId: null,
+        classId: null,
+        warehouseId: null,
+        faultFlag: null
+      }
+      this.resetForm("form")
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      // 清空子表数据
+      this.mydoJobDetailList = [];
+      this.detailTotal = 0;
+      this.currentRow = null;
+      this.queryDetailParams.jobId = null;
+      // 重新查询主表数据
+      this.handleQuery();
+    },
+
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      // 只处理主表的多选
+      if (selection.length > 0 && selection[0].hasOwnProperty('jobDetailId')) {
+        return;
+      }
+      this.ids = selection.map(item => item.jobId);
+      this.single = selection.length!==1;
+      this.multiple = !selection.length;
+    },
+
+    // 手动完成/作废
+    handleCompletedManually(row) {
+      const jobIds = this.ids;
+      if (jobIds.length === 0) {
+        this.$modal.msgError("请选择要操作的数据");
+        return;
+      }
+      if (row.type === 'invalid'){
+        //手动作废
+      }else if (row.type === 'completed'){
+        //手动完成
+      }
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('job/mydoJob/export', {
+        ...this.queryParams
+      }, `mydoJob_${new Date().getTime()}.xlsx`)
+    },
+    /** 行点击事件处理 */
+    handleRowClick(row) {
+      // 设置当前选中行
+      this.currentRow = row;
+      // 更新子表格查询参数
+      this.queryDetailParams.jobId = row.jobId;
+      this.queryDetailParams.status = row.status;
+      // 查询子表格数据
+      this.getDetailList();
+    },
+    /** 查询子任务表列表 */
+    getDetailList() {
+      // 如果没有选中的主任务，不加载子任务
+      if (!this.queryDetailParams.jobId) {
+        this.mydoJobDetailList = [];
+        this.detailTotal = 0;
+        this.detailLoading = false;
+        return;
+      }
+      this.detailLoading = true;
+      listMydoJobDetail(this.queryDetailParams).then(response => {
+        this.mydoJobDetailList = response.rows;
+        this.detailTotal = response.total;
+        this.detailLoading = false;
+      });
+    },
+  }
+}
+</script>
+
+<style scoped>
+.el-table >>> .current-row {
+  background-color: #f0f9eb;
+}
+</style>
diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue
new file mode 100644
index 0000000..a8e0cce
--- /dev/null
+++ b/ruoyi-ui/src/views/check/job/out/index.vue
@@ -0,0 +1,574 @@
+<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="任务ID" prop="jobId">
+        <el-input
+          v-model="queryParams.jobId"
+          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.mydo_job_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="上线类型" prop="onLineType">
+        <el-select v-model="queryParams.onLineType" placeholder="请选择上线类型" clearable>
+          <el-option
+            v-for="dict in dict.type.on_line_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>-->
+      <el-form-item label="任务号" prop="taskNo">
+        <el-input
+          v-model="queryParams.taskNo"
+          placeholder="请输入任务号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="供应商ID" prop="supplierId">
+        <el-input
+          v-model="queryParams.supplierId"
+          placeholder="请输入供应商ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户ID" prop="customerId">
+        <el-input
+          v-model="queryParams.customerId"
+          placeholder="请输入客户ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门ID" prop="departmentId">
+        <el-input
+          v-model="queryParams.departmentId"
+          placeholder="请输入部门ID"
+          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="roadwayId">
+        <el-input
+          v-model="queryParams.roadwayId"
+          placeholder="请输入巷道ID"
+          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="目标巷道ID" prop="targetRoadwayId">
+        <el-input
+          v-model="queryParams.targetRoadwayId"
+          placeholder="请输入目标巷道ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="目标货位" prop="targetCargoSpaceId">
+        <el-input
+          v-model="queryParams.targetCargoSpaceId"
+          placeholder="请输入目标货位ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="产线ID" prop="lineId">
+        <el-input
+          v-model="queryParams.lineId"
+          placeholder="请输入产线ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车间ID" prop="workshopId">
+        <el-input
+          v-model="queryParams.workshopId"
+          placeholder="请输入车间ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="优先级" prop="priority">
+        <el-input
+          v-model="queryParams.priority"
+          placeholder="请输入优先级"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="执行阶段" prop="executionPhase">
+        <el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>
+          <el-option
+            v-for="dict in dict.type.execution_phase_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任务类型" prop="inOrOut">
+        <el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
+          <el-option
+            v-for="dict in dict.type.check_out_job_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime">
+        <el-date-picker clearable
+          v-model="queryParams.startTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="finishTime">
+        <el-date-picker clearable
+          v-model="queryParams.finishTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="入口" prop="entranceId">
+        <el-input
+          v-model="queryParams.entranceId"
+          placeholder="请输入入口ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出口" prop="exitId">
+        <el-input
+          v-model="queryParams.exitId"
+          placeholder="请输入出口ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="班组ID" prop="classId">
+        <el-input
+          v-model="queryParams.classId"
+          placeholder="请输入班组ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="仓库" prop="warehouseId">
+        <el-input
+          v-model="queryParams.warehouseId"
+          placeholder="请输入仓库ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="重分标记" prop="faultFlag">
+        <el-input
+          v-model="queryParams.faultFlag"
+          placeholder="请输入重分标记"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          @click="handleCompletedManually({type: 'invalid'})"
+          v-hasPermi="['job:mydoJob:CompletedManually']"
+        >手动作废</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          @click="handleCompletedManually({type: 'completed'})"
+          v-hasPermi="['job:mydoJob:CompletedManually']"
+        >手动完成</el-button>
+      </el-col>
+<!--      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['job:mydoJob:export']"
+        >导出</el-button>
+      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
+      max-height="300">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="任务ID" align="center" prop="jobId" fixed />
+      <el-table-column label="任务状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="上线类型" align="center" prop="onLineType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务类型" align="center" prop="inOrOut">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.check_out_job_type" :value="scope.row.inOrOut"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务号" align="center" prop="taskNo" />
+      <el-table-column label="供应商" align="center" prop="supplierName" key="supplierId" value="supplierName" />
+<!--      <el-table-column label="客户ID" align="center" prop="customerId" />-->
+      <el-table-column label="部门" align="center" prop="departmentName" />
+      <el-table-column label="托盘码" align="center" prop="trayCode" />
+      <el-table-column label="巷道ID" align="center" prop="roadwayId" />
+      <el-table-column label="货位" align="center" prop="cargoSpaceName" />
+      <el-table-column label="目标巷道" align="center" prop="targetRoadwayId" />
+      <el-table-column label="目标货位" align="center" prop="targetCargoSpaceName" />
+      <el-table-column label="产线ID" align="center" prop="lineId" />
+      <el-table-column label="车间ID" align="center" prop="workshopId" />
+      <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.execution_phase_type" :value="scope.row.executionPhase"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="finishTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="入口ID" align="center" prop="entranceId" />
+<!--      <el-table-column label="出口ID" align="center" prop="exitId" />-->
+      <el-table-column label="班组ID" align="center" prop="classId" />
+      <el-table-column label="仓库ID" align="center" prop="warehouseId" />
+      <el-table-column label="重分标记" align="center" prop="faultFlag" />
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange"
+              max-height="300"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="子任务ID" align="center" prop="jobDetailId" />
+      <el-table-column label="任务ID" align="center" prop="jobId" />
+      <el-table-column label="库存ID" align="center" prop="stockId" />
+      <el-table-column label="批次号" align="center" prop="lotNo" />
+      <el-table-column label="入库时间" align="center" prop="inDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="单据ID" align="center" prop="inOrOutId" />
+      <el-table-column label="子单据ID" align="center" prop="inOrOutDId" />
+      <el-table-column label="物料GUID" align="center" prop="productGuid" />
+      <el-table-column label="物料编码" align="center" prop="productId" />
+      <el-table-column label="库存状态" align="center" prop="stockStatus" />
+      <el-table-column label="入库数量" align="center" prop="inQuantity" />
+<!--      <el-table-column label="库存数量" align="center" prop="stockQuantity" />-->
+<!--      <el-table-column label="出库数量" align="center" prop="outQuantity" />-->
+<!--      <el-table-column label="整层数量" align="center" prop="layerQuantity" />-->
+<!--      <el-table-column label="出库层数量" align="center" prop="outLayerQuantity" />-->
+<!--      <el-table-column label="回流数量" align="center" prop="giveNum" />-->
+<!--      <el-table-column label="追溯入库单ID" align="center" prop="stockinId" />-->
+<!--      <el-table-column label="垛型ID" align="center" prop="stackingId" />-->
+<!--      <el-table-column label="出库口ID" align="center" prop="exitId" />-->
+      <el-table-column label="生产日期" align="center" prop="printDate" />
+<!--      <el-table-column label="客户ID" align="center" prop="customerId" />-->
+      <el-table-column label="供应商ID" align="center" prop="supplierId" />
+<!--      <el-table-column label="备用字段1" align="center" prop="spare1" />
+      <el-table-column label="备用字段2" align="center" prop="spare2" />
+      <el-table-column label="备用字段3" align="center" prop="spare3" />
+      <el-table-column label="备用字段4" align="center" prop="spare4" />-->
+    </el-table>
+
+    <pagination
+      v-show="detailTotal>0"
+      :total="detailTotal"
+      :page.sync="queryDetailParams.pageNum"
+      :limit.sync="queryDetailParams.pageSize"
+      @pagination="getDetailList"
+    />
+
+
+  </div>
+</template>
+
+<script>
+import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob } from "@/api/job/inmydoJob"
+import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
+
+export default {
+  name: "MydoJob",
+  dicts: ['execution_phase_type', 'check_out_job_type', 'on_line_type', 'mydo_job_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      detailLoading:false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      detailTotal: 0,
+      // 任务表表格数据
+      mydoJobList: [],
+      // 子任务表表格数据
+      mydoJobDetailList:[],
+      // 当前选中行
+      currentRow:null,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        jobId: null,
+        status: '1',
+        onLineType: null,
+        taskNo: null,
+        supplierId: null,
+        customerId: null,
+        departmentId: null,
+        trayCode: null,
+        roadwayId: null,
+        cargoSpaceId: null,
+        targetRoadwayId: null,
+        targetCargoSpaceId: null,
+        lineId: null,
+        workshopId: null,
+        priority: null,
+        executionPhase: null,
+        inOrOut: '23',
+        createTime: null,
+        startTime: null,
+        finishTime: null,
+        entranceId: null,
+        exitId: null,
+        classId: null,
+        warehouseId: null,
+        faultFlag: null
+      },
+      queryDetailParams:{
+        pageNum: 1,
+        pageSize: 10,
+        jobId: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        jobId: [
+          { required: true, message: "任务ID不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "任务状态不能为空", trigger: "change" }
+        ],
+        taskNo: [
+          { required: true, message: "任务号不能为空", trigger: "blur" }
+        ],
+      }
+    }
+  },
+  created() {
+    // 获取字典数据后，设置默认值
+    this.getList()
+  },
+  methods: {
+    /** 查询任务表列表 */
+    getList() {
+      this.loading = true
+      listMydoJob(this.queryParams).then(response => {
+        this.mydoJobList = response.rows
+        this.total = response.total
+        this.loading = false
+        // 如果有数据，自动选中第一行
+        if (this.mydoJobList.length > 0) {
+          this.handleRowClick(this.mydoJobList[0]);
+        }
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        jobId: null,
+        status: null,
+        onLineType: null,
+        taskNo: null,
+        supplierId: null,
+        customerId: null,
+        departmentId: null,
+        trayCode: null,
+        roadwayId: null,
+        cargoSpaceId: null,
+        targetRoadwayId: null,
+        targetCargoSpaceId: null,
+        lineId: null,
+        workshopId: null,
+        priority: null,
+        executionPhase: null,
+        inOrOut: null,
+        createTime: null,
+        startTime: null,
+        finishTime: null,
+        entranceId: null,
+        exitId: null,
+        classId: null,
+        warehouseId: null,
+        faultFlag: null
+      }
+      this.resetForm("form")
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      // 清空子表数据
+      this.mydoJobDetailList = [];
+      this.detailTotal = 0;
+      this.currentRow = null;
+      this.queryDetailParams.jobId = null;
+      // 重新查询主表数据
+      this.handleQuery();
+    },
+
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      // 只处理主表的多选
+      if (selection.length > 0 && selection[0].hasOwnProperty('jobDetailId')) {
+        return;
+      }
+      this.ids = selection.map(item => item.jobId);
+      this.single = selection.length!==1;
+      this.multiple = !selection.length;
+    },
+
+    // 手动完成/作废
+    handleCompletedManually(row) {
+      const jobIds = this.ids;
+      if (jobIds.length === 0) {
+        this.$modal.msgError("请选择要操作的数据");
+        return;
+      }
+      if (row.type === 'invalid'){
+        //手动作废
+      }else if (row.type === 'completed'){
+        //手动完成
+      }
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('job/mydoJob/export', {
+        ...this.queryParams
+      }, `mydoJob_${new Date().getTime()}.xlsx`)
+    },
+    /** 行点击事件处理 */
+    handleRowClick(row) {
+      // 设置当前选中行
+      this.currentRow = row;
+      // 更新子表格查询参数
+      this.queryDetailParams.jobId = row.jobId;
+      this.queryDetailParams.status = row.status;
+      // 查询子表格数据
+      this.getDetailList();
+    },
+    /** 查询子任务表列表 */
+    getDetailList() {
+      // 如果没有选中的主任务，不加载子任务
+      if (!this.queryDetailParams.jobId) {
+        this.mydoJobDetailList = [];
+        this.detailTotal = 0;
+        this.detailLoading = false;
+        return;
+      }
+      this.detailLoading = true;
+      listMydoJobDetail(this.queryDetailParams).then(response => {
+        this.mydoJobDetailList = response.rows;
+        this.detailTotal = response.total;
+        this.detailLoading = false;
+      });
+    },
+  }
+}
+</script>
+
+<style scoped>
+.el-table >>> .current-row {
+  background-color: #f0f9eb;
+}
+</style>
diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue
index d03ca34..c085b2c 100644
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -251,39 +251,13 @@
       </el-table-column>
       <el-table-column label="仓库" align="center" prop="warehouseName"/>
       <el-table-column label="完成日期" align="center" prop="finishDate"/>
-<!--      <el-table-column label="erp单号" align="center" prop="erpBill"/>-->
       <el-table-column label="单据来源" align="center" prop="stockSource">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
         </template>
       </el-table-column>
       <el-table-column label="部门" align="center" prop="departmentName"/>
-      <!--      <el-table-column label="客户编码" align="center" prop="customerNo" />-->
-<!--      <el-table-column label="班组编码" align="center" prop="classNo"/>-->
       <el-table-column label="供应商" align="center" prop="supplierName"/>
-      <!--      <el-table-column label="备用字段1" align="center" prop="spare1" />
-            <el-table-column label="备用字段2" align="center" prop="spare2" />
-            <el-table-column label="备用字段4" align="center" prop="spare4" />
-            <el-table-column label="备用字段3" align="center" prop="spare3" />
-            <el-table-column label="备用字段5" align="center" prop="spare5" />-->
-      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['in:stockIn:edit']"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['in:stockIn:remove']"
-                >删除</el-button>
-              </template>
-            </el-table-column>-->
     </el-table>
 
     <pagination
@@ -297,10 +271,8 @@
     <el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="子单ID" align="center" prop="stockinDetailId"/>
-      <!--      <el-table-column label="主单GUID" align="center" prop="stockinGuid" />-->
       <el-table-column label="主单ID" align="center" prop="stockinId"/>
       <el-table-column label="批次号" align="center" prop="lotNo"/>
-<!--      <el-table-column label="物料ID" align="center" prop="productGuid"/>-->
       <el-table-column label="物料编码" align="center" prop="productId"/>
       <el-table-column label="物料描述" align="center" prop="extraField.materialDesc"/>
       <el-table-column label="英文描述" align="center" prop="extraField.englishDesc"/>
@@ -309,30 +281,6 @@
       <el-table-column label="计划数量" align="center" prop="quantity"/>
       <el-table-column label="扫码数量" align="center" prop="scanNum"/>
       <el-table-column label="实际数量" align="center" prop="assignNum"/>
-      <!--      <el-table-column label="备用字段1" align="center" prop="spare1" />
-            <el-table-column label="备用字段2" align="center" prop="spare2" />
-            <el-table-column label="备用字段3" align="center" prop="spare3" />
-            <el-table-column label="备用字段4" align="center" prop="spare4" />
-            <el-table-column label="备用字段5" align="center" prop="spare5" />
-            <el-table-column label="备用字段6" align="center" prop="spare6" />-->
-      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['in:stockInDetail:edit']"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['in:stockInDetail:remove']"
-                >删除</el-button>
-              </template>
-            </el-table-column>-->
     </el-table>
     <pagination
       v-show="detailTotal>0"