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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lsymicc
2025-06-09 17:39:24 +08:00
parent 77e927ae51 6e3e559ac0
commit be72a0ac13
14 changed files with 634 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ruoyi-ui/src/lang/en.js
View File

@@ -563,6 +563,7 @@ export default {
stockManagement: {
stockId: 'Stock ID',
cargoSpaceId: 'Cargo Space ID',
cargoSpaceName: 'Cargo Space Name',
stockStatus: 'Stock Status',
productStatus: 'Product Status',
lotNo: 'Lot No',
@@ -611,12 +612,23 @@ export default {
addSuccess: 'Added successfully',
editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted successfully',
confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?'
confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?',
productId:'物料编码',
materialDesc:'物料描述',
englishDesc:'英文描述',
netWeight:'净重',
length:'长',
width:'宽',
height:'高',
volume:'体积',
cargoSpaceStatus:'货位状态'
},
// *************库存操作记录***************
stockRecord: {
stockId: 'Stock ID',
cargoSpaceId: 'Cargo Space ID',
cargoSpaceName: '货位名称',
trayCode: 'Tray Code',
productId: 'Product ID',
productName: 'Product Name',
@@ -674,7 +686,8 @@ export default {
editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted successfully',
confirmDelete: 'Are you sure to delete the stock operation record with ID {whGuids}?',
fileName: 'record_{time}'
fileName: 'record_{time}',
createTime: '创建时间',
},
// **************库存冻结记录**************
stockFreeze: {
@@ -734,7 +747,8 @@ export default {
addSuccess: 'Added successfully',
editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted successfully',
deleteConfirm: 'Are you sure to delete the selected stock freeze records?'
deleteConfirm: 'Are you sure to delete the selected stock freeze records?',
createTime: '创建时间',
},
menu: {
//收货单据新增
@@ -782,7 +796,7 @@ export default {
LogManagement_OperationLog: 'OperationLog',
//登录日志
LogManagement_LoginLog: 'LoginLog',
//********************系统监控********************
SystemMonitor: 'SystemMonitor',
// 在线用户
@@ -1812,7 +1826,7 @@ export default {
//--------------当前页面交互框操作提示--------------
placeholderJobName: 'Enter JobName',
placeholderJobGroup: 'Select JobGroup',
//---------------二级窗口操作提示------------------
placeholderInvokeTarget: 'Enter InvokeTarget',
placeholderCronExpression: 'Enter CronExpression',

32
ruoyi-ui/src/lang/zh.js
View File

@@ -567,6 +567,7 @@ export default {
stockManagement: {
stockId: '库存id',
cargoSpaceId: '货位id',
cargoSpaceName: '货位名称',
stockStatus: '库存状态',
productStatus: '物料状态',
lotNo: '批次号',
@@ -577,11 +578,12 @@ export default {
jobId: '作业ID',
trayCode: '托盘条码',
outQuantity: '出库数量',
stockinDetailId: '入库子单id',
stockinDetailId: '入库子单',
stockinId: '入库主单',
inType: '入库类型',
inClassId: '入库班组ID',
warehouseId: '仓库',
warehouseName: 'WarehouseName',
stackingId: '垛型ID',
operation: '操作',
add: '新增',
@@ -604,7 +606,7 @@ export default {
inputJobId: '请输入作业ID',
inputTrayCode: '请输入托盘条码',
inputOutQuantity: '请输入出库数量',
inputStockinDetailId: '请输入入库子单id',
inputStockinDetailId: '请输入入库子单',
inputStockinId: '请输入入库主单',
inputInClassId: '请输入入库班组ID',
inputWarehouseId: '请输入仓库',
@@ -615,12 +617,25 @@ export default {
addSuccess: '新增成功',
editSuccess: '修改成功',
deleteSuccess: '删除成功',
confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？'
confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？',
materialDesc:'物料描述',
materialInDesc:'物料描述',
englishDesc:'英文描述',
netWeight:'净重',
length:'长',
width:'宽',
height:'高',
volume:'体积',
productId:'物料编码',
cargoSpaceStatus: '货位状态'
},
// *************库存操作记录***************
stockRecord: {
stockId: '库存编码',
cargoSpaceId: '货位编码',
cargoSpaceName: '货位名称',
trayCode: '托盘条码',
productId: '物品编码',
productName: '物品名称',
@@ -678,7 +693,8 @@ export default {
editSuccess: '修改成功',
deleteSuccess: '删除成功',
confirmDelete: '您确定要删除ID为' + '{whGuids}' + '的操作记录吗？',
fileName: '记录{time}'
fileName: '记录{time}',
createTime: '创建时间',
},
// **************库存冻结记录**************
stockFreeze: {
@@ -738,7 +754,11 @@ export default {
addSuccess: '新增成功',
editSuccess: '修改成功',
deleteSuccess: '删除成功',
deleteConfirm: '是否确认删除所选库存冻结记录？'
deleteConfirm: '是否确认删除所选库存冻结记录？',
createTime: '创建时间',
oldStatus: '原状态',
currStatus: '新状态',
cargoSpaceName: '货位名称',
},
menu: {
@@ -1773,7 +1793,7 @@ export default {
//--------------当前页面交互框操作提示--------------
placeholderJobName: '请输入任务名称',
placeholderJobGroup: '请选择任务组名',
//---------------二级窗口操作提示------------------
placeholderInvokeTarget: '请输入调用目标字符串',
placeholderCronExpression: '请输入Cron执行表达式',

182
ruoyi-ui/src/views/stock/freeze/index.vue
View File

@@ -1,14 +1,14 @@
<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="$t('stockFreeze.stockId')" prop="stockId"> <!-- 库存编码 -->
<el-input
v-model="queryParams.stockId"
:placeholder="$t('stockFreeze.inputStockId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item :label="$t('stockFreeze.stockId')" prop="stockId"> &lt;!&ndash; 库存编码 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.stockId"-->
<!-- :placeholder="$t('stockFreeze.inputStockId')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('stockFreeze.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位编码 -->
<el-input
v-model="queryParams.cargoSpaceId"
@@ -25,14 +25,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.productId')" prop="productId"> <!-- 物品编码 -->
<!-- <el-form-item :label="$t('stockFreeze.productId')" prop="productId"> &lt;!&ndash; 物品编码 &ndash;&gt;
<el-input
v-model="queryParams.productId"
:placeholder="$t('stockFreeze.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item :label="$t('stockFreeze.productName')" prop="productName"> <!-- 物品名称 -->
<el-input
v-model="queryParams.productName"
@@ -41,78 +41,80 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.printDate')" prop="printDate"> <!-- 生产日期 -->
<!-- <el-form-item :label="$t('stockFreeze.printDate')" prop="printDate"> &lt;!&ndash; 生产日期 &ndash;&gt;
<el-input
v-model="queryParams.printDate"
:placeholder="$t('stockFreeze.inputPrintDate')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
:placeholder="$t('stockFreeze.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.method')" prop="method"> <!-- 操作 -->
<el-input
v-model="queryParams.method"
:placeholder="$t('stockFreeze.inputMethod')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.lotNo')" prop="lotNo"> &lt;!&ndash; 批号 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.lotNo"-->
<!-- :placeholder="$t('stockFreeze.inputLotNo')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.method')" prop="method"> &lt;!&ndash; 操作 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.method"-->
<!-- :placeholder="$t('stockFreeze.inputMethod')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('stockFreeze.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input
v-model="queryParams.warehouseId"
:placeholder="$t('stockFreeze.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-select v-model="queryParams.warehouseId" :placeholder="$t('stockFreeze.warehouseId')">
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('stockFreeze.stockDetailId')" prop="stockDetailId"> <!-- 库存字表id -->
<el-input
v-model="queryParams.stockDetailId"
:placeholder="$t('stockFreeze.inputStockDetailId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.operatingTarget')" prop="operatingTarget"> <!-- 操作目标 -->
<el-input
v-model="queryParams.operatingTarget"
:placeholder="$t('stockFreeze.inputOperatingTarget')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.barCodeOldQuantity')" prop="barCodeOldQuantity"> <!-- 条码数量 -->
<el-input
v-model="queryParams.barCodeOldQuantity"
:placeholder="$t('stockFreeze.inputBarCodeOldQuantity')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.barCodeQuantity')" prop="barCodeQuantity"> <!-- 条码数量 -->
<el-input
v-model="queryParams.barCodeQuantity"
:placeholder="$t('stockFreeze.inputBarCodeQuantity')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.productGuid')" prop="productGuid"> <!-- 物料guid -->
<!-- <el-form-item :label="$t('stockFreeze.stockDetailId')" prop="stockDetailId"> &lt;!&ndash; 库存字表id &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.stockDetailId"-->
<!-- :placeholder="$t('stockFreeze.inputStockDetailId')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.operatingTarget')" prop="operatingTarget"> &lt;!&ndash; 操作目标 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.operatingTarget"-->
<!-- :placeholder="$t('stockFreeze.inputOperatingTarget')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.barCodeOldQuantity')" prop="barCodeOldQuantity"> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.barCodeOldQuantity"-->
<!-- :placeholder="$t('stockFreeze.inputBarCodeOldQuantity')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.barCodeQuantity')" prop="barCodeQuantity"> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.barCodeQuantity"-->
<!-- :placeholder="$t('stockFreeze.inputBarCodeQuantity')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.productGuid')" prop="productGuid"> &lt;!&ndash; 物料guid &ndash;&gt;
<el-input
v-model="queryParams.productGuid"
:placeholder="$t('stockFreeze.inputProductGuid')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('stockFreeze.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('stockFreeze.reset')}}</el-button> <!-- 重置 -->
@@ -167,20 +169,32 @@
<el-table v-loading="loading" :data="freezeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('stockFreeze.stockId')" align="center" prop="stockId" /> <!-- 库存编码 -->
<!-- <el-table-column :label="$t('stockFreeze.stockId')" align="center" prop="stockId" /> &lt;!&ndash; 库存编码 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockFreeze.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('stockFreeze.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockFreeze.productId')" align="center" prop="productId" /> <!-- 物品编码 -->
<el-table-column :label="$t('stockFreeze.productName')" align="center" prop="productName" /> <!-- 物品名称 -->
<el-table-column :label="$t('stockFreeze.printDate')" align="center" prop="printDate" /> <!-- 生产日期 -->
<el-table-column :label="$t('stockFreeze.lotNo')" align="center" prop="lotNo" /> <!-- 批号 -->
<!-- <el-table-column :label="$t('stockFreeze.productId')" align="center" prop="productId" /> &lt;!&ndash; 物品编码 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.productName')" align="center" prop="productName" /> &lt;!&ndash; 物品名称 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.printDate')" align="center" prop="printDate" /> &lt;!&ndash; 生产日期 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批号 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.oldStatus')" align="center" prop="oldStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.oldStatus"/>
</template>
</el-table-column><!-- 原库位状态 -->
<el-table-column :label="$t('stockFreeze.currStatus')" align="center" prop="currStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.currStatus"/>
</template>
</el-table-column><!-- 现库位状态 -->
<el-table-column :label="$t('stockFreeze.method')" align="center" prop="method" /> <!-- 操作 -->
<el-table-column :label="$t('stockFreeze.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('stockFreeze.stockDetailId')" align="center" prop="stockDetailId" /> <!-- 库存字表id -->
<el-table-column :label="$t('stockFreeze.operatingTarget')" align="center" prop="operatingTarget" /> <!-- 操作目标 -->
<el-table-column :label="$t('stockFreeze.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> <!-- 条码数量 -->
<el-table-column :label="$t('stockFreeze.barCodeQuantity')" align="center" prop="barCodeQuantity" /> <!-- 条码数量 -->
<el-table-column :label="$t('stockFreeze.productGuid')" align="center" prop="productGuid" /> <!-- 物料guid -->
<el-table-column :label="$t('stockFreeze.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockFreeze.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
<!-- <el-table-column :label="$t('stockFreeze.stockDetailId')" align="center" prop="stockDetailId" /> &lt;!&ndash; 库存字表id &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.operatingTarget')" align="center" prop="operatingTarget" /> &lt;!&ndash; 操作目标 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.barCodeQuantity')" align="center" prop="barCodeQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料guid &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
@@ -265,9 +279,11 @@
<script>
import { listFreeze, getFreeze, delFreeze, addFreeze, updateFreeze } from "@/api/stock/freeze"
import {listWarehouse} from "@/api/bas/warehouse"
export default {
name: "Freeze",
dicts:['cargo_space_status'],
data() {
return {
// 遮罩层
@@ -284,6 +300,7 @@ export default {
total: 0,
// 库存冻结记录表格数据
freezeList: [],
warehouseOptions:[],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -360,8 +377,15 @@ export default {
},
created() {
this.getList()
this.getWarehouseList();
},
methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
this.warehouseOptions = response.rows;
});
},
/** 查询库存冻结记录列表 */
getList() {
this.loading = true

208
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -93,6 +93,15 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockManagement.materialDesc')" prop="productName"><!-- 物料描述 -->
<el-input
v-model="queryParams.productName"
:placeholder="$t('stockManagement.materialDesc')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="出库数量" prop="outQuantity">
<el-input
v-model="queryParams.outQuantity"
@@ -126,21 +135,16 @@
/>
</el-form-item>-->
<el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"><!-- 仓库id -->
<el-input
v-model="queryParams.warehouseId"
:placeholder="$t('stockManagement.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockManagement.stackingId')" prop="stackingId"><!-- 垛型ID -->
<el-input
v-model="queryParams.stackingId"
:placeholder="$t('stockManagement.inputStackingId')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-select v-model="queryParams.warehouseId" :placeholder="$t('stockManagement.warehouseId')">
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="备用字段1" prop="spare1">
<el-input
v-model="queryParams.spare1"
@@ -196,7 +200,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
@@ -204,8 +208,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['stock:management:add']"
>{{$t('stockManagement.add')}} <!-- 新增 --></el-button>
</el-col>
>{{$t('stockManagement.add')}} &lt;!&ndash; 新增 &ndash;&gt;</el-button>
</el-col>-->
<el-col :span="1.5">
<el-button
type="success"
@@ -245,30 +249,43 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('stockManagement.stockId')" align="center" prop="stockId" /> <!-- 库存id -->
<el-table-column :label="$t('stockManagement.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.stockStatus')" align="center" prop="stockStatus"> <!-- 库存状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('stockManagement.cargoSpaceStatus')" align="center" prop="cargoSpaceStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
</template>
</el-table-column><!-- 货位状态 -->
<el-table-column :label="$t('stockManagement.productStatus')" align="center" prop="productStatus"> <!-- 物料状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('stockManagement.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('stockManagement.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<el-table-column :label="$t('stockManagement.backDate')" align="center" prop="backDate" /> <!-- 回流时间 -->
<el-table-column :label="$t('stockManagement.productGuid')" align="center" prop="productGuid" /> <!-- 物料GUID -->
<!-- <el-table-column :label="$t('stockManagement.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.productId')" align="center" prop="extraField.productId" /> <!-- 物料Id -->
<el-table-column :label="$t('stockManagement.materialDesc')" align="center" prop="extraField.materialDesc" /> <!-- 物料描述 -->
<el-table-column :label="$t('stockManagement.englishDesc')" align="center" prop="extraField.englishDesc" /> <!-- 物料英文描述 -->
<el-table-column :label="$t('stockManagement.netWeight')" align="center" prop="extraField.netWeight" /> <!-- 净重 -->
<el-table-column :label="$t('stockManagement.length')" align="center" prop="extraField.length" /> <!-- 长 -->
<el-table-column :label="$t('stockManagement.width')" align="center" prop="extraField.width" /> <!-- 宽 -->
<el-table-column :label="$t('stockManagement.height')" align="center" prop="extraField.height" /> <!-- 高 -->
<el-table-column :label="$t('stockManagement.volume')" align="center" prop="extraField.volume" /> <!-- 体积 -->
<el-table-column :label="$t('stockManagement.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('stockManagement.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('stockManagement.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockManagement.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 -->
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单id -->
<!-- <el-table-column :label="$t('stockManagement.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单id -->
<el-table-column :label="$t('stockManagement.inType')" align="center" prop="inType" /> <!-- 入库类型 -->
<el-table-column :label="$t('stockManagement.inClassId')" align="center" prop="inClassId" /> <!-- 入库班组ID -->
<el-table-column :label="$t('stockManagement.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('stockManagement.stackingId')" align="center" prop="stackingId" /> <!-- 垛型ID -->
<!-- <el-table-column :label="$t('stockManagement.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockManagement.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<!-- <el-table-column :label="$t('stockManagement.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
@@ -316,73 +333,83 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"> <!-- 物料状态 -->
<el-select v-model="form.productStatus" :placeholder="$t('stockManagement.selectProductStatus')">
<el-form-item :label="$t('stockManagement.cargoSpaceStatus')" prop="cargoSpaceStatus"> <!-- 货位状态 -->
<el-select v-model="form.cargoSpaceStatus" :placeholder="$t('stockManagement.cargoSpaceStatus')">
<el-option
v-for="dict in dict.type.product_status"
v-for="dict in dict.type.cargo_space_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('stockManagement.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input v-model="form.lotNo" :placeholder="$t('stockManagement.inputLotNo')" />
</el-form-item>
<el-form-item :label="$t('stockManagement.inDate')" prop="inDate"> <!-- 入库时间 -->
<el-input v-model="form.inDate" :placeholder="$t('stockManagement.inputInDate')" />
</el-form-item>
<el-form-item :label="$t('stockManagement.backDate')" prop="backDate"> <!-- 回流时间 -->
<el-input v-model="form.backDate" :placeholder="$t('stockManagement.inputBackDate')" />
</el-form-item>
<el-form-item :label="$t('stockManagement.productGuid')" prop="productGuid"> <!-- 物料GUID -->
<el-input v-model="form.productGuid" :placeholder="$t('stockManagement.inputProductGuid')" />
</el-form-item>
<!-- <el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"> &lt;!&ndash; 物料状态 &ndash;&gt;-->
<!-- <el-select v-model="form.productStatus" :placeholder="$t('stockManagement.selectProductStatus')">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.product_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.lotNo')" prop="lotNo"> &lt;!&ndash; 批次号 &ndash;&gt;-->
<!-- <el-input v-model="form.lotNo" :placeholder="$t('stockManagement.inputLotNo')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.inDate')" prop="inDate"> &lt;!&ndash; 入库时间 &ndash;&gt;-->
<!-- <el-input v-model="form.inDate" :placeholder="$t('stockManagement.inputInDate')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.backDate')" prop="backDate"> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<!-- <el-input v-model="form.backDate" :placeholder="$t('stockManagement.inputBackDate')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.productGuid')" prop="productGuid"> &lt;!&ndash; 物料GUID &ndash;&gt;-->
<!-- <el-input v-model="form.productGuid" :placeholder="$t('stockManagement.inputProductGuid')" />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.quantity')" prop="quantity"> <!-- 库存数量 -->
<el-input v-model="form.quantity" :placeholder="$t('stockManagement.inputQuantity')" />
</el-form-item>
<el-form-item :label="$t('stockManagement.jobId')" prop="jobId"> <!-- 作业ID -->
<el-input v-model="form.jobId" :placeholder="$t('stockManagement.inputJobId')" />
</el-form-item>
<el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input v-model="form.trayCode" :placeholder="$t('stockManagement.inputTrayCode')" />
</el-form-item>
<el-form-item :label="$t('stockManagement.outQuantity')" prop="outQuantity"> <!-- 出库数量 -->
<el-input v-model="form.outQuantity" :placeholder="$t('stockManagement.inputOutQuantity')" />
</el-form-item>
<el-form-item :label="$t('stockManagement.stockinDetailId')" prop="stockinDetailId"> <!-- 入库子单id -->
<el-input v-model="form.stockinDetailId" :placeholder="$t('stockManagement.inputStockinDetailId')" />
</el-form-item>
<el-form-item :label="$t('stockManagement.stockinId')" prop="stockinId"> <!-- 入库主单 -->
<el-input v-model="form.stockinId" :placeholder="$t('stockManagement.inputStockinId')" />
</el-form-item>
<el-form-item :label="$t('stockManagement.inClassId')" prop="inClassId"> <!-- 入库班组ID -->
<el-input v-model="form.inClassId" :placeholder="$t('stockManagement.inputInClassId')" />
</el-form-item>
<el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input v-model="form.warehouseId" :placeholder="$t('stockManagement.inputWarehouseId')" />
</el-form-item>
<el-form-item label="垛型ID" prop="stackingId">
<el-input v-model="form.stackingId" placeholder="请输入垛型ID" />
</el-form-item>
<el-form-item label="备用字段1" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入备用字段1" />
</el-form-item>
<el-form-item label="备用字段2" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入备用字段2" />
</el-form-item>
<el-form-item label="备用字段3" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入备用字段3" />
</el-form-item>
<el-form-item label="备用字段4" prop="spare4">
<el-input v-model="form.spare4" placeholder="请输入备用字段4" />
</el-form-item>
<el-form-item label="备用字段5" prop="spare5">
<el-input v-model="form.spare5" placeholder="请输入备用字段5" />
</el-form-item>
<el-form-item label="备用字段6" prop="spare6">
<el-input v-model="form.spare6" placeholder="请输入备用字段6" />
</el-form-item>
<!-- <el-form-item :label="$t('stockManagement.jobId')" prop="jobId"> &lt;!&ndash; 作业ID &ndash;&gt;-->
<!-- <el-input v-model="form.jobId" :placeholder="$t('stockManagement.inputJobId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"> &lt;!&ndash; 托盘条码 &ndash;&gt;-->
<!-- <el-input v-model="form.trayCode" :placeholder="$t('stockManagement.inputTrayCode')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.outQuantity')" prop="outQuantity"> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<!-- <el-input v-model="form.outQuantity" :placeholder="$t('stockManagement.inputOutQuantity')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.stockinDetailId')" prop="stockinDetailId"> &lt;!&ndash; 入库子单id &ndash;&gt;-->
<!-- <el-input v-model="form.stockinDetailId" :placeholder="$t('stockManagement.inputStockinDetailId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.stockinId')" prop="stockinId"> &lt;!&ndash; 入库主单 &ndash;&gt;-->
<!-- <el-input v-model="form.stockinId" :placeholder="$t('stockManagement.inputStockinId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.inClassId')" prop="inClassId"> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<!-- <el-input v-model="form.inClassId" :placeholder="$t('stockManagement.inputInClassId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;-->
<!-- <el-input v-model="form.warehouseId" :placeholder="$t('stockManagement.inputWarehouseId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="垛型ID" prop="stackingId">-->
<!-- <el-input v-model="form.stackingId" placeholder="请输入垛型ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段1" prop="spare1">-->
<!-- <el-input v-model="form.spare1" placeholder="请输入备用字段1" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段2" prop="spare2">-->
<!-- <el-input v-model="form.spare2" placeholder="请输入备用字段2" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段3" prop="spare3">-->
<!-- <el-input v-model="form.spare3" placeholder="请输入备用字段3" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段4" prop="spare4">-->
<!-- <el-input v-model="form.spare4" placeholder="请输入备用字段4" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段5" prop="spare5">-->
<!-- <el-input v-model="form.spare5" placeholder="请输入备用字段5" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段6" prop="spare6">-->
<!-- <el-input v-model="form.spare6" placeholder="请输入备用字段6" />-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">{{$t('stockManagement.confirm')}} <!-- 确定 --></el-button>
@@ -394,10 +421,10 @@
<script>
import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
import {listWarehouse} from "@/api/bas/warehouse"
export default {
name: "Management",
dicts: ['product_status', 'stock_status'],
dicts: ['product_status', 'stock_status','cargo_space_status'],
data() {
return {
// 遮罩层
@@ -414,6 +441,8 @@ export default {
total: 0,
// 库存信息表格数据
managementList: [],
// 仓库选项
warehouseOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -451,16 +480,23 @@ export default {
form: {},
// 表单校验
rules: {
stockId: [
/*stockId: [
{ required: true, message: this.$t('stockManagement.stockIdRequired'), trigger: "blur" } // 库存id不能为空
],
]*/
}
}
},
created() {
this.getList()
this.getWarehouseList();
},
methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
this.warehouseOptions = response.rows;
});
},
/** 查询库存信息列表 */
getList() {
this.loading = true

45
ruoyi-ui/src/views/stock/record/index.vue
View File

@@ -41,14 +41,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockRecord.printDate')" prop="printDate"> <!-- 生产日期 -->
<!-- <el-form-item :label="$t('stockRecord.printDate')" prop="printDate"> &lt;!&ndash; 生产日期 &ndash;&gt;
<el-input
v-model="queryParams.printDate"
:placeholder="$t('stockRecord.inputPrintDate')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item :label="$t('stockRecord.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
@@ -85,12 +85,14 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('stockRecord.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input
v-model="queryParams.warehouseId"
:placeholder="$t('stockRecord.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-select v-model="queryParams.warehouseId" :placeholder="$t('stockRecord.warehouseId')">
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="库存字表id" prop="stockDetailId">
<el-input
@@ -188,10 +190,11 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('stockRecord.stockId')" align="center" prop="stockId" /> <!-- 库存编码 -->
<el-table-column :label="$t('stockRecord.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockRecord.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockRecord.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockRecord.productId')" align="center" prop="productId" /> <!-- 物品编码 -->
<el-table-column :label="$t('stockRecord.productName')" align="center" prop="productName" /> <!-- 物品名称 -->
<el-table-column :label="$t('stockRecord.printDate')" align="center" prop="printDate" /> <!-- 生产日期 -->
<!-- <el-table-column :label="$t('stockRecord.printDate')" align="center" prop="printDate" /> &lt;!&ndash; 生产日期 &ndash;&gt;-->
<el-table-column :label="$t('stockRecord.lotNo')" align="center" prop="lotNo" /> <!-- 批号 -->
<el-table-column :label="$t('stockRecord.oldQuantity')" align="center" prop="oldQuantity" /> <!-- 初始数量 -->
<el-table-column :label="$t('stockRecord.quantity')" align="center" prop="quantity" /> <!-- 操作后数量 -->
@@ -200,12 +203,13 @@
<dict-tag :options="dict.type.stock_maintain_method" :value="scope.row.method"/>
</template>
</el-table-column>
<el-table-column :label="$t('stockRecord.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('stockRecord.stockDetailId')" align="center" prop="stockDetailId" /> <!-- 库存字表id -->
<el-table-column :label="$t('stockRecord.operatingTarget')" align="center" prop="operatingTarget" /> <!-- 操作目标 -->
<el-table-column :label="$t('stockRecord.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> <!-- 条码数量 -->
<el-table-column :label="$t('stockRecord.barCodeQuantity')" align="center" prop="barCodeQuantity" /> <!-- 条码数量 -->
<el-table-column :label="$t('stockRecord.productGuid')" align="center" prop="productGuid" /> <!-- 物料guid -->
<el-table-column :label="$t('stockRecord.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockRecord.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
<!-- <el-table-column :label="$t('stockRecord.stockDetailId')" align="center" prop="stockDetailId" /> &lt;!&ndash; 库存字表id &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.operatingTarget')" align="center" prop="operatingTarget" /> &lt;!&ndash; 操作目标 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.barCodeQuantity')" align="center" prop="barCodeQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料guid &ndash;&gt;-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -303,6 +307,7 @@
<script>
import { listRecord, getRecord, delRecord, addRecord, updateRecord, exportRecord } from "@/api/stock/record";
import {listWarehouse} from "@/api/bas/warehouse"
export default {
name: "Record",
@@ -323,6 +328,7 @@ export default {
total: 0,
// 库存操作记录表格数据
recordList: [],
warehouseOptions:[],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -404,9 +410,16 @@ export default {
};
},
created() {
this.getList();
this.getList()
this.getWarehouseList();
},
methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
this.warehouseOptions = response.rows;
});
},
/** 查询库存操作记录列表 */
getList() {
this.loading = true;