lsy/FT577-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

现场调试更改

Browse Source
This commit is contained in:
lsymicc
2026-09-08 22:20:47 +08:00
parent 5353351520
commit 7c3ee78d41
140 changed files with 4488 additions and 4311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/api/in/stockin.js
View File

@@ -55,7 +55,7 @@ export function delStockin(stockinId) {
// 查询入库单据子信息列表
export function listStockinDetail(query) {
return request({
url: '/in/sotckindetail/list',
url: '/in/stockindetail/list',
method: 'get',
params: query
})
@@ -64,7 +64,7 @@ export function listStockinDetail(query) {
// 新增入库单据子信息
export function addStockinDetail(data) {
return request({
url: '/in/sotckindetail',
url: '/in/stockindetail',
method: 'post',
data: data
})

26
ruoyi-ui/src/views/bas/cargospace/index.vue
View File

@@ -114,6 +114,16 @@
</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="['bas:cargospace:add']"
>指定货位出库</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
@@ -135,7 +145,7 @@
v-hasPermi="['bas:cargospace:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
@@ -145,7 +155,7 @@
@click="handleDelete"
v-hasPermi="['bas:cargospace:remove']"
>删除</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
@@ -174,7 +184,11 @@
<dict-tag :options="dict.type.bas_cargo_space_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="是否锁定" align="center" prop="locked" />
<el-table-column label="是否锁定" align="center" prop="locked">
<template slot-scope="scope">
<dict-tag :options="dict.type.bas_stock_stock_status" :value="scope.row.locked"/>
</template>
</el-table-column>
<el-table-column label="托盘条码" align="center" prop="trayCode" />
<el-table-column label="部门名称" align="center" prop="deptName" />
<el-table-column label="重量" align="center" prop="theWeight" />
@@ -188,13 +202,13 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['bas:cargospace:edit']"
>修改</el-button>
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['bas:cargospace:remove']"
>删除</el-button>
>删除</el-button> -->
</template>
</el-table-column>
</el-table>
@@ -333,7 +347,7 @@ import { listCargospace, getCargospace, delCargospace, addCargospace, updateCarg
export default {
name: "Cargospace",
dicts: ['bas_cargo_space_status'],
dicts: ['bas_cargo_space_status', 'bas_stock_stock_status'],
data() {
return {
// 遮罩层

133
ruoyi-ui/src/views/bas/stock/index.vue
View File

@@ -165,7 +165,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-col :span="1.5">
<el-button
type="primary"
plain
@@ -174,7 +174,7 @@
@click="handleAdd"
v-hasPermi="['bas:stock:add']"
>新增</el-button>
</el-col>-->
</el-col>
<el-col :span="1.5">
<el-button
type="success"
@@ -197,16 +197,16 @@
v-hasPermi="['bas:stock: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="['bas:stock:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['bas:stock:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -285,11 +285,11 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<!-- <el-col :span="24">
<el-col :span="24">
<el-form-item label="货位id" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位id" />
<el-input v-model="form.cargoSpaceId" require placeholder="请输入货位id" />
</el-form-item>
</el-col>-->
</el-col>
<el-col :span="24">
<el-form-item label="物料编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编码" readonly/>
@@ -300,6 +300,11 @@
<el-input v-model="form.productName" placeholder="请输入物料名称" readonly/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="版辊编号" prop="rollerNumber">
<el-input v-model="form.rollerNumber" placeholder="请输入版辊编号" readonly/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="form.stockStatus" placeholder="请选择库存状态">
@@ -335,109 +340,11 @@
<el-input v-model="form.quantity" placeholder="请输入库存数量" />
</el-form-item>
</el-col>
<!-- <el-col :span="24">
<el-form-item label="入库时间" prop="inDate">
<el-date-picker clearable
v-model="form.inDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="回流时间" prop="backDate">
<el-date-picker clearable
v-model="form.backDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择回流时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="作业ID" prop="jobId">
<el-input v-model="form.jobId" placeholder="请输入作业ID" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="子作业id" prop="jobDetailId">
<el-input v-model="form.jobDetailId" placeholder="请输入子作业id" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="托盘条码" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘条码" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="出库数量" prop="outQuantity">
<el-input v-model="form.outQuantity" placeholder="请输入出库数量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="入库子单id" prop="stockinDetailId">
<el-input v-model="form.stockinDetailId" placeholder="请输入入库子单id" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="入库主单" prop="stockinId">
<el-input v-model="form.stockinId" placeholder="请输入入库主单" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="入库类型" prop="inType">
<el-select v-model="form.inType" placeholder="请选择入库类型">
<el-option
v-for="dict in dict.type.in_stockin_in_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="仓库id" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库id" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="仓库名称" prop="warehouseName">
<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="用户id" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户id" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="用户名称" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名称" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="部门id" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门id" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="部门名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入部门名称" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="供应商id" prop="supplierId">
<el-input v-model="form.supplierId" placeholder="请输入供应商id" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="供应商名称" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
</el-form-item>
</el-col>-->
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">

10
ruoyi-ui/src/views/in/stockin/index.vue
View File

@@ -225,9 +225,15 @@
<el-table-column label="批次" align="center" prop="lotNo" width="150"/>
<el-table-column label="物料编码" align="center" prop="productId" width="150"/>
<el-table-column label="物料名称" align="center" prop="productName" min-width="150" show-overflow-tooltip/>
<el-table-column label="版辊编号" align="center" prop="rollerNumber"/>
<el-table-column label="计划数量" align="center" prop="quantity" width="100"/>
<el-table-column label="扫码数量" align="center" prop="scanNum" width="100"/>
<el-table-column label="实际数量" align="center" prop="assignNum" width="100"/>
<el-table-column label="状态" align="center" prop="status" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" min-width="120" show-overflow-tooltip/>
<template slot="empty">
<div style="padding: 30px 0; color: #909399; font-size: 13px;">
@@ -386,7 +392,7 @@ import {
export default {
name: "Stockin",
dicts: ['in_stockin_in_type', 'in_stockin_status', 'in_stockin_stock_source'],
dicts: ['in_stockin_in_type', 'in_stockin_status', 'in_stockin_stock_source', 'stock_status'],
data() {
return {
// 遮罩层
@@ -445,7 +451,7 @@ export default {
{required: true, message: "创建时间不能为空", trigger: "blur"}
],
warehouseId: [
{required: true, message: "仓库ID562不能为空", trigger: "blur"}
{required: true, message: "仓库不能为空", trigger: "blur"}
],
warehouseName: [
{required: true, message: "仓库名称不能为空", trigger: "blur"}

26
ruoyi-ui/src/views/out/stockout/index.vue
View File

@@ -248,10 +248,11 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="子单ID" align="center" prop="stockoutDetailId" width="180"/>
<el-table-column label="批次" align="center" prop="lotNo" width="150"/>
<el-table-column label="辊号" align="center" prop="rollerNumber" width="150"/>
<el-table-column label="物料编码" align="center" prop="productId" width="150"/>
<el-table-column label="物料名称" align="center" prop="productName" min-width="150" show-overflow-tooltip/>
<el-table-column label="计划数量" align="center" prop="quantity" width="100"/>
<el-table-column label="扫码数量" align="center" prop="allotNum" width="100"/>
<el-table-column label="分配数量" align="center" prop="allotNum" width="100"/>
<el-table-column label="实际数量" align="center" prop="assignNum" width="100"/>
<el-table-column label="备注" align="center" prop="remark" min-width="120" show-overflow-tooltip/>
<template slot="empty">
@@ -288,10 +289,11 @@
>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="库存ID" prop="stockId" align="center"/>
<el-table-column label="辊号" prop="rollerNumber" align="center"/>
<el-table-column label="物料编码" prop="productId" align="center"/>
<el-table-column label="物料名称" prop="productName" align="center"/>
<el-table-column label="批次" prop="lotNo" align="center"/>
<el-table-column label="货位" prop="cargoSpaceName" align="center"/>
<el-table-column label="货位" prop="cargoSpaceId" align="center"/>
<el-table-column label="托盘号" prop="trayCode" align="center"/>
<el-table-column label="可用数量" prop="quantity" align="center"/>
</el-table>
@@ -442,14 +444,20 @@ export default {
this.$modal.msgWarning("请选择子单")
return
}
const detail = this.detailList.find(item => item.stockoutDetailId === this.detailIds[0])
this.assignDialogVisible = true
this.stockLoading = true
// 根据物料编码查询可用库存
listStock({ productId: detail.productId }).then(res => {
this.stockList = res.rows
this.stockLoading = false
})
this.assignDialogVisible = true
this.stockLoading = true
// 根据物料编码查询可用库存 @@@FT577
// listStock({ productId: detail.productId }).then(res => {
// this.stockList = res.rows
// this.stockLoading = false
// })
listStock({ rollerNumber: detail.rollerNumber }).then(res => {
this.stockList = res.rows
this.stockLoading = false
})
},
// 库存选中事件

2
ruoyi-ui/vue.config.js
View File

@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || 'WMS仓储管理系统' // 网页标题
const baseUrl = 'http://localhost:8080' // 后端接口
const baseUrl = 'http://localhost:8084' // 后端接口
const port = process.env.port || process.env.npm_config_port || 80 // 端口