zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入库部分和接口

Browse Source
This commit is contained in:
张怡蓉
2026-01-05 16:09:50 +08:00
parent f5f4d1007a
commit 9ffd5c01a3
25 changed files with 504 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
ruoyi-ui/src/views/in/job/index.vue
View File

@@ -2,7 +2,7 @@
<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="status">
<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"
@@ -12,7 +12,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
<el-form-item label="作业类型" prop="inOrOut">
<el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
<el-option
v-for="dict in dict.type.in_job_type"
@@ -30,34 +30,34 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="巷道" prop="roadwayId">
<el-input
v-model="queryParams.roadwayId"
placeholder="请输入巷道"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="序列号" prop="trayCode"> <!-- 托盘条码 -->
<!-- <el-form-item label="巷道" prop="roadwayId">-->
<!-- <el-input-->
<!-- v-model="queryParams.roadwayId"-->
<!-- placeholder="请输入巷道"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="托盘条码" prop="trayCode"> <!-- 托盘条码 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入序列号"
placeholder="请输入托盘条码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="品号" prop="productId">
<el-form-item label="存货编码" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入品号"
placeholder="请输入存货编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单号" prop="lineId">
<el-form-item label="项目号" prop="lineId">
<el-input
v-model="queryParams.lineId"
placeholder="请输入订单号"
placeholder="请输入项目号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -135,8 +135,8 @@
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
max-height="400">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务ID" align="left" prop="jobId" fixed width="140" />
<el-table-column label="任务状态" align="left" prop="status">
<el-table-column label="作业编码" align="left" prop="jobId" fixed width="140" />
<el-table-column label="状态" align="left" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
@@ -146,21 +146,22 @@
<!-- <dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="任务类型" align="left" prop="inOrOut">
<el-table-column label="作业类型" align="left" prop="inOrOut">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column label="任务号" align="left" prop="taskNo" />
<el-table-column label="巷道" align="left" prop="roadwayId" sortable/>
<!-- <el-table-column label="巷道" align="left" prop="roadwayId" sortable/>-->
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" sortable/>
<el-table-column label="托盘条码" align="left" prop="trayCode" width="140" />
<!-- <el-table-column label="优先级" align="left" prop="priority" />-->
<!-- <el-table-column label="执行阶段" align="left" 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="left" prop="lineId" />
<el-table-column label="项目号" align="left" prop="lineId" />
<el-table-column label="入口" align="left" prop="entranceId" sortable/>
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />-->
<el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/>
@@ -180,25 +181,22 @@
max-height="300"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子任务ID" align="left" prop="jobDetailId" width="150" />
<el-table-column label="任务ID" align="left" prop="jobId" width="140" />
<el-table-column label="单据ID" align="left" prop="inOrOutId" width="150" />
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
<el-table-column label="品号" align="left" prop="productId" width="140" />
<el-table-column label="品名" align="left" prop="productName" />
<el-table-column label="子作业编码" align="left" prop="jobDetailId" width="150" />
<el-table-column label="作业编码" align="left" prop="jobId" width="140" />
<el-table-column label="单据编码" align="left" prop="inOrOutId" width="150" />
<el-table-column label="子单据编码" align="left" prop="inOrOutDId" width="160" />
<el-table-column label="存货编码" align="left" prop="productId" width="140" />
<el-table-column label="存货名称" align="left" prop="productName" />
<el-table-column label="批号" align="left" prop="lotNo" />
<el-table-column label="入库数量" align="right" prop="inQuantity" />
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
<el-table-column label="规格" align="left" prop="spec"/><!--规格-->
<el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
<el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
<el-table-column label="序列号" align="left" prop="spare4" width="130"/><!--序列号-->
<el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
<el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
<el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
<el-table-column label="计量单位" align="left" prop="unit"/><!--机型-->
<el-table-column label="规格型号" align="left" prop="spec"/><!--机型-->
<el-table-column label="层级关系" align="left" prop="spare1"/><!--型号-->
<el-table-column label="上层物料" align="left" prop="spare2"/><!--净重-->
<el-table-column label="顶层物料" align="left" prop="spare3"/><!--颜色-->
<el-table-column label="合同号" align="left" prop="spare5"/><!--电压-->
<el-table-column label="销售订单号" align="left" prop="spare6"/><!--功率-->
</el-table>
<pagination