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

2026.4.13 早

Browse Source 
接口回传，以及接口接收直接审核，回传表修改
This commit is contained in:
1009473166@qq.com
2026-04-13 09:57:34 +08:00
parent fa00020c38
commit 3729d0df5f
26 changed files with 999 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,16 +21,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="单据来源" prop="stockSource"><!--单据来源-->
<el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" clearable>
<el-option
v-for="dict in dict.type.bill_resource"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="单据来源" prop="stockSource">&lt;!&ndash;单据来源&ndash;&gt;-->
<!-- <el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.bill_resource"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="项目号" prop="departmentNo">
<el-input
v-model="queryParams.departmentNo"
@@ -39,41 +39,49 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合同号" prop="spare1">
<!-- <el-form-item label="合同号" prop="spare1">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare1"-->
<!-- placeholder="请输入合同号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="erp单据号" prop="erpBill">
<el-input
v-model="queryParams.spare1"
placeholder="请输入合同号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="销售订单号" prop="spare2">
<el-input
v-model="queryParams.spare2"
placeholder="请输入销售订单号"
v-model="queryParams.erpBill"
placeholder="请输入erp单据号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="存货名称" prop="materialDesc"><!--品名-->
<el-form-item label="存货名称" prop="productName"><!--品名-->
<el-input
v-model="queryParams.materialDesc"
v-model="queryParams.productName"
placeholder="请输入存货名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批次号" prop="lotNo"><!--品名-->
<el-form-item label="存货编码" prop="productId"><!--品名-->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次号"
v-model="queryParams.productId"
placeholder="请输入存货编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="批次号" prop="lotNo">&lt;!&ndash;品名&ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.lotNo"-->
<!-- placeholder="请输入批次号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="'单据时间'" prop="dateRange">
<el-date-picker
v-model="dateRange"
@@ -172,6 +180,7 @@
<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" sortable/><!--入库订单-->
<el-table-column label="erp单据号" 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"/>
@@ -211,19 +220,23 @@
<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" sortable/><!--子单ID-->
<el-table-column label="子单ID" align="left" prop="stockinDetailId" width="160" /><!--子单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="productId" /><!--品号-->
<el-table-column label="存货名称" align="left" prop="productName" width="160"/><!--品号-->
<el-table-column label="批号" align="left" prop="lotNo" sortable/><!--批号-->
<el-table-column label="批号" align="left" prop="lotNo" /><!--批号-->
<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="quantity" sortable/><!--计划数量-->
<el-table-column label="扫码数量" align="left" prop="scanNum" sortable/><!--扫码数量-->
<el-table-column label="实际数量" align="left" prop="assignNum" sortable/><!--实际数量-->
<el-table-column label="计划数量" align="left" prop="quantity" /><!--计划数量-->
<el-table-column label="扫码数量" align="left" prop="scanNum" /><!--扫码数量-->
<el-table-column label="实际数量" align="left" prop="assignNum" /><!--实际数量-->
<el-table-column label="货位号" align="left" prop="assignNum" /><!--实际数量-->
<el-table-column label="托盘号" align="left" prop="assignNum" /><!--实际数量-->
<el-table-column label="条码号" align="left" prop="assignNum" /><!--实际数量-->
<el-table-column label="采购订单" align="left" prop="assignNum" /><!--实际数量-->
</el-table>
<pagination

59
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -2,21 +2,21 @@
<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="warehouseId"><!--仓库-->
<el-select
v-model="queryParams.warehouseId"
:placeholder="'请选择仓库'"
clearable
@change="handleQuery"
>
<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="'仓库'" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
<!-- <el-select-->
<!-- v-model="queryParams.warehouseId"-->
<!-- :placeholder="'请选择仓库'"-->
<!-- clearable-->
<!-- @change="handleQuery"-->
<!-- >-->
<!-- <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="'出库单编号'" prop="stockoutId"> <!-- 出库单编号 -->
<el-input
v-model="queryParams.stockoutId"
@@ -25,6 +25,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'erp单据号'" prop="erpStockOutId"> <!-- 出库单编号 -->
<el-input
v-model="queryParams.erpStockOutId"
:placeholder="'请输入出库单编号'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'出库类型'" prop="outType"> <!-- 出库类型 -->
<el-select v-model="queryParams.outType" :placeholder="'请选择出库类型'" clearable>
<el-option
@@ -45,10 +53,18 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="'客商名称'" prop="customerName">
<!-- <el-form-item :label="'客商名称'" prop="customerName">-->
<!-- <el-input-->
<!-- v-model="queryParams.customerName"-->
<!-- :placeholder="'请输入客商名称'"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="'存货编码'" prop="productId">
<el-input
v-model="queryParams.customerName"
:placeholder="'请输入客商名称'"
v-model="queryParams.productId"
:placeholder="'请输入存货编码'"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -137,6 +153,7 @@
<el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="'出库单编号'" align="left" prop="stockoutId" />
<el-table-column :label="'erp单据号'" align="left" prop="erpStockOutId" />
<el-table-column :label="'出库类型'" align="left" prop="outType">
<template slot-scope="scope">
<dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
@@ -188,7 +205,7 @@
<el-table-column :label="'存货编码'" align="center" prop="productId" sortable/>
<el-table-column :label="'存货名称'" align="center" prop="productName" />
<el-table-column :label="'批次号'" align="center" prop="lotNo"/>
<el-table-column :label="'供应商编码'" align="center" prop="fid"/>
<!-- <el-table-column :label="'供应商编码'" align="center" prop="fid"/>-->
<el-table-column :label="'计量单位'" align="center" prop="unit"/>
<el-table-column :label="'规格型号'" align="center" prop="spec"/>
<el-table-column :label="'层次关系'" align="center" prop="spare1"/>
@@ -200,6 +217,9 @@
<el-table-column :label="'出库数量'" align="center" prop="quantity"/>
<el-table-column :label="'分配数量'" align="center" prop="allotQuantity"/>
<el-table-column :label="'实际数量'" align="center" prop="assignNum"/>
<el-table-column :label="'货位号'" align="center" prop="cargoSpaceId"/>
<el-table-column :label="'托盘号'" align="center" prop="trayCode"/>
<el-table-column :label="'条码号'" align="center" prop="trayCode"/>
<!-- <el-table-column :label="'备注'" align="center" prop="remark"/>-->
</el-table>
@@ -393,6 +413,7 @@ export default {
pageNum: 1,
pageSize: 10,
stockoutId: null,
erpStockOutId:null,
outType: null,
customerNo: null,
customerName: null,

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

@@ -25,6 +25,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode"><!-- 货位id -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘条码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus"><!-- 库存状态 -->
<el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
<el-option
@@ -110,7 +118,7 @@
<el-table-column width="180" label="物料编码" align="left" prop="productId" />
<el-table-column width="180" label="物料名称" align="left" prop="productName" />
<el-table-column width="180" label="批次号" align="left" prop="lotNo" />
<!-- <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>-->
<el-table-column label="托盘条码" align="center" prop="trayCode" width="160" sortable/>
<el-table-column width="180" label="入库时间" align="left" prop="inDate" sortable/>
<el-table-column width="100" label="数量" align="left" prop="quantity" sortable/>
<el-table-column width="180" label="作业ID" align="left" prop="jobId" sortable/>

8
ruoyi-ui/src/views/stock/pointOut.vue
View File

@@ -17,6 +17,14 @@
@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="项目号" prop="spare4"><!-- 品名 -->
<el-input
v-model="queryParams.spare4"

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 || '若依管理系统' // 网页标题
const baseUrl = 'http://192.168.188.236:8080' // 后端接口
const baseUrl = 'http://127.0.0.1:8080' // 后端接口
const port = process.env.port || process.env.npm_config_port || 80 // 端口