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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	ruoyi-ui/src/views/in/stockIn/index.vue
#	ruoyi-ui/src/views/out/outStockoutManage.vue
This commit is contained in:
zj
2025-12-19 11:20:56 +08:00
parent c62b3346f7 b767f4c480
commit bfbd87010c
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -146,8 +146,8 @@
@row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
<el-table-column label="入库订单" align="left" prop="stockinId" width="150"/><!--入库订单-->
<el-table-column label="订单号" align="left" prop="erpBill" width="150"/><!--入库订单-->
<el-table-column label="入库订单" align="left" prop="stockinId" width="150" sortable/><!--入库订单-->
<el-table-column label="订单号" align="left" prop="erpBill" width="150" sortable/><!--入库订单-->
<el-table-column label="入库类型" align="left" prop="inType"><!--入库类型-->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
@@ -181,11 +181,11 @@
<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="left" prop="stockinDetailId" width="160"/><!--子单ID-->
<el-table-column label="子单ID" align="left" prop="stockinDetailId" width="160" sortable/><!--子单ID-->
<el-table-column label="主单ID" align="left" prop="stockinId" width="160"/><!--主单ID-->
<el-table-column label="品号" align="left" prop="productId" sortable/><!--品号-->
<el-table-column label="品名" align="left" prop="productName" width="160"/><!--品号-->
<el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
<el-table-column label="批号" align="left" prop="lotNo" sortable/><!--批号-->
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
<el-table-column label="规格" align="left" prop="spec"/><!--规格-->
@@ -197,9 +197,9 @@
<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="right" prop="quantity"/><!--计划数量-->
<el-table-column label="扫码数量" align="right" prop="scanNum"/><!--扫码数量-->
<el-table-column label="实际数量" align="right" prop="assignNum"/><!--实际数量-->
<el-table-column label="计划数量" align="right" prop="quantity" sortable/><!--计划数量-->
<el-table-column label="扫码数量" align="right" prop="scanNum" sortable/><!--扫码数量-->
<el-table-column label="实际数量" align="right" prop="assignNum" sortable/><!--实际数量-->
</el-table>
<pagination

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

@@ -100,7 +100,7 @@
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" align="center" />
<el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
<el-table-column label="库存编码" align="center" prop="stockId" width="160" sortable/>
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="160"/>
<el-table-column label="库存状态" align="center" prop="stockStatus" >
<template slot-scope="scope">
@@ -109,14 +109,14 @@
</el-table-column>
<el-table-column label="品号" align="center" prop="productId" />
<el-table-column label="品名" align="center" prop="productName" width="160"/>
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="订单号" align="center" prop="orderId" width="160"/>
<el-table-column label="入库时间" align="center" prop="inDate" width="160"/>
<el-table-column label="数量" align="center" prop="quantity" />
<el-table-column label="作业编码" align="center" prop="jobId" width="160"/>
<el-table-column label="批次号" align="center" prop="lotNo" sortable width="160"/>
<el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>
<el-table-column label="入库时间" align="center" prop="inDate" width="160" sortable/>
<el-table-column label="数量" align="center" prop="quantity" sortable/>
<el-table-column label="作业编码" align="center" prop="jobId" width="160" sortable/>
<el-table-column label="出库数量" align="center" prop="outQuantity" />
<el-table-column label="入库子单号" align="center" prop="stockinDetailId" width="160"/>
<el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
<el-table-column label="入库子单号" align="center" prop="stockinDetailId" width="160" sortable/>
<el-table-column label="入库单号" align="center" prop="stockinId" width="160" sortable/>
<!-- <el-table-column label="入库类型" align="center" prop="inType" />-->
<!-- <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
<el-table-column label="规格" align="center" prop="spare1" />