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

chore: restore source from initial FT546MWS archive

Browse Source
This commit is contained in:
zgw
2026-07-31 09:59:53 +08:00
parent b32da3e05f
commit 6bff484432
165 changed files with 7087 additions and 16145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/api/out/outStockout.js
View File

@@ -62,7 +62,7 @@ export function getOutStockoutDetail(query) {
export function autoAllot(data) {
return request({
url: '/out/outStockout/autoAllot',
method: 'post',
method: 'get',
params: data
})
}

53
ruoyi-ui/src/views/bas/traycode/index.vue
View File

@@ -1,22 +1,22 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<!-- <el-form-item label="格式ID" prop="formatId">-->
<!--&lt;!&ndash; <el-input-->
<!-- v-model="queryParams.formatId"-->
<!-- placeholder="请输入格式ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />&ndash;&gt;-->
<!-- <el-select v-model="queryParams.formatId" placeholder="请选择格式ID">-->
<!-- <el-option-->
<!-- v-for="item in traycodeFormatList"-->
<!-- :key="item.id"-->
<!-- :label="item.remarks"-->
<!-- :value="item.id"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="格式ID" prop="formatId">-->
<!--&lt;!&ndash; <el-input-->
<!-- v-model="queryParams.formatId"-->
<!-- placeholder="请输入格式ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />&ndash;&gt;-->
<!-- <el-select v-model="queryParams.formatId" placeholder="请选择格式ID">-->
<!-- <el-option-->
<!-- v-for="item in traycodeFormatList"-->
<!-- :key="item.id"-->
<!-- :label="item.remarks"-->
<!-- :value="item.id"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="条码" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
@@ -101,16 +101,16 @@
<el-table ref="table" v-loading="loading" :data="traycodeList" @selection-change="handleSelectionChange" max-height="700">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="序号" align="center" prop="id" />-->
<!-- <el-table-column label="格式ID" align="left" prop="formatName" />-->
<!-- <el-table-column label="序号" align="center" prop="id" />-->
<!-- <el-table-column label="格式ID" align="left" prop="formatName" />-->
<el-table-column label="条码" align="center" prop="trayCode" />
<!-- <el-table-column label="Spare Field 1" align="center" prop="spare1" />-->
<!-- <el-table-column label="Spare Field 1" align="center" prop="spare1" />-->
<el-table-column label="是否可用" align="center" prop="spare2" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.spare2"/>
</template>
</el-table-column>
<!-- <el-table-column label="Spare Field 3" align="center" prop="spare3" />-->
<!-- <el-table-column label="Spare Field 3" align="center" prop="spare3" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template slot-scope="scope">
<el-button
@@ -161,7 +161,7 @@
</el-select>
</el-form-item>
<el-form-item label="数量" prop="spare1" v-if="form.id == null">
<el-form-item label="数量" prop="spare1" v-if="form.id == null">
<el-input v-model="form.spare1" placeholder="请输入数量" />
</el-form-item>
<el-form-item label="托盘编码" prop="trayCode" v-if="form.id != null" >
@@ -205,7 +205,6 @@
import { listTraycode, getTraycode, delTraycode, addTraycode, updateTraycode } from "@/api/bas/traycode"
import { listTraycodeFormat } from "@/api/bas/traycodeFormat"
import vueEasyPrint from 'vue-easy-print'
import VueQr from 'vue-qr'
import VueBarcode from 'vue-barcode'
export default {
@@ -451,11 +450,6 @@ export default {
font-family: Arial, sans-serif;
}
.vue-qr {
display: block;
margin: 20px auto;
max-width: 100%;
}
@media print {
@page {
@@ -468,7 +462,7 @@ export default {
}
.vue-easy-print {
padding: 20px;
padding: 5px;
}
.num {
@@ -476,8 +470,5 @@ export default {
margin-top: 10px;
}
.vue-qr {
margin: 10px auto;
}
}
</style>

10
ruoyi-ui/src/views/check/create/index.vue
View File

@@ -670,15 +670,9 @@ export default {
console.log(data)
// 这里需要调用保存接口
saveCheckStock(data).then(response => {
if (response.code==200){
this.$modal.msgSuccess('保存成功：' + response.msg);
this.$tab.refreshPage(this.$route);
}
else {
this.$modal.msgError('建单失败：' + response.msg);
}
this.$modal.msgSuccess('保存成功：' + response.msg);
this.$tab.refreshPage(this.$route);
// this.reset();
});
}

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

@@ -135,7 +135,7 @@
<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="作业编码" align="left" prop="jobId" fixed width="160" />
<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"/>
@@ -249,7 +249,7 @@ export default {
pageNum: 1,
pageSize: 10,
jobId: null,
status: null,
status: '1',
onLineType: null,
taskNo: null,
supplierId: null,

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

@@ -21,62 +21,54 @@
/>
</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="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="departmentNo">
<el-input
v-model="queryParams.departmentNo"
placeholder="请输入项目号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合同号" prop="spare1">
<el-input
v-model="queryParams.departmentNo"
placeholder="请输入项目号"
v-model="queryParams.spare1"
placeholder="请输入合同号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <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-form-item label="销售订单号" prop="spare2">
<el-input
v-model="queryParams.erpBill"
placeholder="请输入erp单据号"
v-model="queryParams.spare2"
placeholder="请输入销售订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="存货名称" prop="productName"><!--品名-->
<el-form-item label="存货名称" prop="materialDesc"><!--品名-->
<el-input
v-model="queryParams.productName"
v-model="queryParams.materialDesc"
placeholder="请输入存货名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="存货编码" prop="productId"><!--品名-->
<el-input
v-model="queryParams.productId"
placeholder="请输入存货编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="组件号" prop="cargoNo"><!--品名-->
<el-form-item label="批次号" prop="lotNo"><!--品名-->
<el-input
v-model="queryParams.cargoNo"
placeholder="请输入组件号"
v-model="queryParams.lotNo"
placeholder="请输入批次号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -160,18 +152,18 @@
>单据确认<!--单据确认-->
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-download"
size="mini"
:disabled="detailMultiple"
@click="handleBarcodePrinting"
v-hasPermi="['in:stockIn:barcodePrinting']"
>打印条码<!--打印条码-->
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-download"
size="mini"
:disabled="detailMultiple"
@click="handleBarcodePrinting"
v-hasPermi="['in:stockIn:barcodePrinting']"
>打印条码<!--打印条码-->
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -180,7 +172,6 @@
<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"/>
@@ -197,17 +188,17 @@
</template>
</el-table-column>
<el-table-column label="仓库" align="left" prop="warehouseName"/><!--仓库-->
<el-table-column label="供应商代码" align="left" prop="supplierNo" width="140"/><!--仓库-->
<el-table-column label="供应商名称" align="left" prop="classNo" width="140"/><!--供应商-->
<el-table-column label="制单人" align="left" prop="createManId" width="140"/><!--创建人-->
<el-table-column label="项目号" align="left" prop="departmentNo" width="140"/><!--部门-->
<el-table-column label="单据时间" align="left" prop="createDate" width="160" sortable/><!--建立时间-->
<el-table-column label="确认时间" align="left" prop="finishDate" width="160" sortable/><!--完成日期-->
<el-table-column label="合同号" align="left" prop="spare1" width="140" sortable/><!--完成日期-->
<el-table-column label="销售单号" align="left" prop="spare2" width="140" sortable/><!--完成日期-->
<el-table-column label="审核时间" align="left" prop="spare3" width="160" sortable/><!--完成日期-->
<el-table-column label="审核人" align="left" prop="spare4"/><!--完成日期-->
<el-table-column label="备注" align="left" prop="spare5"/><!--完成日期-->
<el-table-column label="供应商代码" align="left" prop="supplierNo"/><!--仓库-->
<el-table-column label="供应商名称" align="left" prop="classNo" /><!--供应商-->
<el-table-column label="制单人" align="left" prop="createManId"/><!--创建人-->
<el-table-column label="项目号" align="left" prop="departmentNo"/><!--部门-->
<el-table-column label="单据时间" align="left" prop="createDate" sortable/><!--建立时间-->
<el-table-column label="确认时间" align="left" prop="finishDate" sortable/><!--完成日期-->
<el-table-column label="合同号" align="left" prop="spare1" sortable/><!--完成日期-->
<el-table-column label="销售单号" align="left" prop="spare2" sortable/><!--完成日期-->
<el-table-column label="审核时间" align="left" prop="spare3" sortable/><!--完成日期-->
<el-table-column label="审核人" align="left" prop="spare4" /><!--完成日期-->
<el-table-column label="备注" align="left" prop="spare5" /><!--完成日期-->
</el-table>
<pagination
@@ -220,24 +211,19 @@
<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"/><!--品号-->
<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="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"/><!--计划数量-->
<el-table-column label="扫码数量" align="left" prop="scanNum"/><!--扫码数量-->
<el-table-column label="实际数量" align="left" prop="assignNum"/><!--实际数量-->
<el-table-column label="货位号" align="left" prop="spare9"/><!--实际数量-->
<el-table-column label="托盘号" align="left" prop="spare8"/><!--实际数量-->
<el-table-column label="条码号" align="left" prop="barCode"/><!--实际数量-->
<el-table-column label="组件号" align="left" prop="cargoNo"/><!--组件号-->
<el-table-column label="项目号" align="left" prop="spare4"/><!--项目号-->
<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>
<pagination
@@ -254,7 +240,7 @@
class="vue-easy-print">
<vue-qr :text='item.stockinDetailId' :size="150" :margin="10" :align-item="center" :correctLevel="2"></vue-qr>
<div>
<span class="num">{{ item.productId }} {{ item.productName }}</span>
<span class="num">{{ item.stockinDetailId }}</span>
</div>
</div>
</vue-easy-print>
@@ -342,8 +328,7 @@ export default {
spare2: null,
spare4: null,
spare3: null,
spare5: null,
cargoNo: null
spare5: null
},
queryDetailParams: {
pageNum: 1,
@@ -562,6 +547,11 @@ export default {
font-family: Arial, sans-serif;
}
.vue-qr {
display: block;
margin: 20px auto;
max-width: 100%;
}
@media print {
@page {

14
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<!-- 主表信息录入 -->
<el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
<!-- <el-form-item :label="'仓库'" prop="warehouseId" required>&lt;!&ndash;仓库&ndash;&gt;
<el-form-item :label="'仓库'" prop="warehouseId" required><!--仓库-->
<el-select v-model="formData.warehouseId" :placeholder="'请选择仓库'" clearable>
<el-option
v-for="dict in warehouseOptions"
@@ -11,7 +11,7 @@
:value="dict.warehouseId"
/>
</el-select>
</el-form-item>-->
</el-form-item>
<el-form-item label="项目号" prop="departmentNo">
<el-input v-model="formData.departmentNo" placeholder="请输入项目号"/>
</el-form-item>
@@ -265,9 +265,9 @@ export default {
customerTotal: 0,
// 表单验证规则
rules: {
// warehouseId: [
// { required: true, message: '请选择仓库', trigger: "change" }
// ],
warehouseId: [
{ required: true, message: '请选择仓库', trigger: "change" }
],
customerNo: [
{ required: true, message: '请输入客商编号', trigger: "blur" }
],
@@ -403,10 +403,10 @@ export default {
},
/** 打开选择存货弹窗 */
handleSelectMaterials() {
/*if (!this.formData.warehouseId) {
if (!this.formData.warehouseId) {
this.$modal.msgError('请选择仓库');
return;
}*/
}
if (!this.formData.departmentNo) {
this.$modal.msgError('请输入项目号');
return;

95
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">&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="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="stockoutId"> <!-- 出库单编号 -->
<el-input
v-model="queryParams.stockoutId"
@@ -25,14 +25,6 @@
@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
@@ -43,19 +35,6 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="'出库方向'" prop="spare8"> <!-- 出库方向 -->
<el-select v-model="queryParams.spare8" :placeholder="'请选择出库方向'" clearable>
<el-option
v-for="dict in dict.type.out_location"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="'单据状态'" prop="status"> <!-- 单据状态 -->
<el-select v-model="queryParams.status" :placeholder="'请选择单据状态'" clearable>
<el-option
@@ -66,18 +45,10 @@
/>
</el-select>
</el-form-item>
<!-- <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-form-item :label="'客商名称'" prop="customerName">
<el-input
v-model="queryParams.productId"
:placeholder="'请输入存货编码'"
v-model="queryParams.customerName"
:placeholder="'请输入客商名称'"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -166,7 +137,6 @@
<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"/>
@@ -197,16 +167,10 @@
<!-- <el-table-column :label="'销售订单号'" align="left" prop="spare2" />-->
<el-table-column :label="'审核时间'" align="left" prop="spare3" />
<el-table-column :label="'审核人'" align="left" prop="spare4" />
<el-table-column :label="'出库方向'" align="left" prop="spare8" >
<template slot-scope="scope">
<dict-tag :options="dict.type.out_location" :value="scope.row.spare8"/>
</template>
</el-table-column>
<el-table-column :label="'创建时间'" align="left" prop="createDate" width="160" sortable/>
<el-table-column :label="'开始时间'" align="left" prop="startDate" width="160" sortable/>
<el-table-column :label="'确认时间'" align="left" prop="finishDate" width="160" sortable/>
<el-table-column :label="'备注'" align="left" prop="spare5" />
</el-table>
<pagination
@@ -224,7 +188,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"/>
@@ -236,9 +200,6 @@
<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>
@@ -375,7 +336,7 @@ import {listWarehouse} from "@/api/bas/warehouse";
export default {
name: "OutStockWithDetail",
dicts: ['out_bill_type', 'out_bill_status', 'out_method', 'bill_resource','out_location'],
dicts: ['out_bill_type', 'out_bill_status', 'out_method', 'bill_resource'],
data() {
return {
// 遮罩层
@@ -418,8 +379,8 @@ export default {
},
// 出口选项
exitOptions: [
{ exitId: '1', exitName: '缓存'},
{ exitId: '2', exitName: '线边'},
{ exitId: '1', exitName: '一楼'},
{ exitId: '2', exitName: '二楼'},
],
@@ -432,15 +393,13 @@ export default {
pageNum: 1,
pageSize: 10,
stockoutId: null,
erpStockoutId:null,
outType: null,
customerNo: null,
customerName: null,
productName: null,
startDate: null,
finishDate: null,
status: null,
spare8:null
status: null
},
// 子表分页参数
detailQueryParams: {
@@ -625,14 +584,8 @@ export default {
this.$modal.msgError('请先审核出库单')
return
}
if (this.queryParams.spare8==''||this.queryParams.spare8==null){
this.$modal.msgError('请选择出库方向后，再次点击分配！')
return
}
let data = {
stockoutId: stockoutIds[0],
spare8:this.queryParams.spare8
stockoutId: stockoutIds[0]
}
autoAllot(data).then(response => {
if (response.code !== 200){

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

@@ -25,14 +25,6 @@
@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
@@ -44,14 +36,14 @@
</el-select>
</el-form-item>
<!-- <el-form-item label="入库时间" prop="startDate">&lt;!&ndash; 入库时间 &ndash;&gt;
<el-date-picker clearable
v-model="queryParams.inDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库时间">
</el-date-picker>
</el-form-item>-->
<!-- <el-form-item label="入库时间" prop="startDate">&lt;!&ndash; 入库时间 &ndash;&gt;
<el-date-picker clearable
v-model="queryParams.inDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库时间">
</el-date-picker>
</el-form-item>-->
<el-form-item label="存货名称" prop="productName"><!-- 存货名称 -->
@@ -63,28 +55,6 @@
/>
</el-form-item>
<el-form-item label="托盘类型" prop="ktpType"> <!-- 作业类型 -->
<el-select v-model="queryParams.ktpType" placeholder="请选择托盘类型" clearable>
<el-option
v-for="item in ktpType"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="物料类型" prop="model"> <!-- 作业类型 -->
<el-select v-model="queryParams.model" placeholder="请选择物料类型" clearable>
<el-option
v-for="item in productType"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button><!-- 搜索 -->
@@ -129,36 +99,36 @@
</el-row>
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" align="center"/>
<el-table-column type="selection" align="center" />
<el-table-column label="库存编码" align="left" prop="stockId" width="180" sortable/>
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="180"/>
<el-table-column width="180" label="库存状态" align="center" prop="stockStatus">
<el-table-column width="180" label="库存状态" 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 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="trayCode" width="160" sortable/>
<el-table-column width="180" label="入库时间" align="left" prop="inDate" sortable/>
<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 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/>
<el-table-column width="180" label="出库数量" align="left" prop="outQuantity"/>
<el-table-column width="180" label="入库单ID" align="left" prop="stockinId" sortable/>
<el-table-column width="180" label="作业ID" align="left" prop="jobId" sortable/>
<el-table-column width="180" label="出库数量" align="left" prop="outQuantity" />
<el-table-column width="180" label="入库单ID" align="left" prop="stockinId" sortable/>
<el-table-column width="180" label="入库子单ID" align="left" prop="stockinDetailId" sortable/>
<!-- <el-table-column label="入库类型" align="center" prop="inType" />-->
<!-- <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
<el-table-column width="180" label="层级关系" align="left" prop="spare1"/>
<el-table-column width="180" label="上层物料" align="left" prop="spare2"/>
<el-table-column width="180" label="顶层物料" align="left" prop="spare3"/>
<el-table-column width="180" label="项目号" align="left" prop="spare4"/>
<el-table-column width="180" label="合同号" align="left" prop="spare5"/>
<el-table-column width="180" label="销售订单" align="left" prop="spare6"/>
<el-table-column width="180" label="供应商编码" align="left" prop="voltage"/>
<el-table-column width="180" label="规格型号" align="left" prop="power"/>
<el-table-column width="180" label="计量单位" align="left" prop="phase"/>
<!-- <el-table-column label="净重" align="center" prop="netWeight" />-->
<!-- <el-table-column label="入库类型" align="center" prop="inType" />-->
<!-- <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
<el-table-column width="180" label="层级关系" align="left" prop="spare1" />
<el-table-column width="180" label="上层物料" align="left" prop="spare2" />
<el-table-column width="180" label="顶层物料" align="left" prop="spare3" />
<el-table-column width="180" label="项目号" align="left" prop="spare4" />
<el-table-column width="180" label="合同号" align="left" prop="spare5" />
<el-table-column width="180" label="销售订单" align="left" prop="spare6" />
<el-table-column width="180" label="供应商编码" align="left" prop="voltage" />
<el-table-column width="180" label="规格型号" align="left" prop="power" />
<el-table-column width="180" label="计量单位" align="left" prop="phase" />
<!-- <el-table-column label="净重" align="center" prop="netWeight" />-->
<el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
@@ -190,12 +160,12 @@
<!-- 添加或修改库存信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<!-- <el-form-item label="库存ID" prop="stockId"> &lt;!&ndash; 库存id &ndash;&gt;-->
<!-- <el-input v-model="form.stockId" placeholder="请输入库存ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货位ID" prop="cargoSpaceId"> &lt;!&ndash; 货位id &ndash;&gt;-->
<!-- <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="库存ID" prop="stockId"> &lt;!&ndash; 库存id &ndash;&gt;-->
<!-- <el-input v-model="form.stockId" placeholder="请输入库存ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货位ID" prop="cargoSpaceId"> &lt;!&ndash; 货位id &ndash;&gt;-->
<!-- <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />-->
<!-- </el-form-item>-->
<el-form-item label="物料" prop="productId"> <!-- 物料 -->
<el-input
@@ -237,7 +207,7 @@
</el-form-item>
<el-form-item label="库存数量" prop="quantity"> <!-- 库存数量 -->
<el-input v-model="form.quantity" placeholder="请输入库存数量"/>
<el-input v-model="form.quantity" placeholder="请输入库存数量" />
</el-form-item>
</el-form>
@@ -278,11 +248,11 @@
@row-click="handleProductRowClick"
highlight-current-row
max-height="400">
<el-table-column label="品号" align="center" prop="productId"/>
<el-table-column label="品名" align="center" prop="productName"/>
<el-table-column label="规格" align="center" prop="spec"/>
<el-table-column label="型号" align="center" prop="spare1"/>
<el-table-column label="单位" align="center" prop="unit"/>
<el-table-column label="品号" align="center" prop="productId" />
<el-table-column label="品名" align="center" prop="productName" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="型号" align="center" prop="spare1" />
<el-table-column label="单位" align="center" prop="unit" />
</el-table>
<pagination
@@ -340,17 +310,17 @@
@row-click="handleCargoSpaceRowClick"
highlight-current-row
max-height="400">
<el-table-column label="货位编码" align="center" prop="cargoSpaceId"/>
<el-table-column label="货位名称" align="center" prop="cargoSpaceName"/>
<el-table-column label="仓库名称" align="center" prop="warehouseName"/>
<el-table-column label="货位编码" align="center" prop="cargoSpaceId" />
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="排" align="center" prop="thePlatoon"/>
<el-table-column label="列" align="center" prop="theColumn"/>
<el-table-column label="层" align="center" prop="theFloor"/>
<el-table-column label="排" align="center" prop="thePlatoon" />
<el-table-column label="列" align="center" prop="theColumn" />
<el-table-column label="层" align="center" prop="theFloor" />
</el-table>
<pagination
@@ -370,14 +340,13 @@
</template>
<script>
import {listManagement, getManagement, delManagement, addManagement, updateManagement} from "@/api/stock/management"
import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
import {listWarehouse} from "@/api/bas/warehouse"
import {listBasProduct} from "@/api/bas/BasProduct"
import {listCargoSpace} from "@/api/bas/cargoSpace"
import { listBasProduct } from "@/api/bas/BasProduct"
import { listCargoSpace } from "@/api/bas/cargoSpace"
export default {
name: "Management",
dicts: ['product_status', 'stock_status', 'cargo_space_status', 'cargo_space_lock_status'],
dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'],
data() {
return {
// 遮罩层
@@ -396,8 +365,6 @@ export default {
managementList: [],
// 仓库选项
warehouseOptions: [],
productType: [{label: '半托', value: '0'}, {label: '满托', value: '1'}],
ktpType: [{label: '空托盘', value: '1'}, {label: '物料', value: '2'}],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -430,12 +397,10 @@ export default {
spare3: null,
spare4: null,
spare5: null,
spare6: null,
ktpType: null,
model: null
spare6: null
},
queryWarehouse: {
pageNum: 1,
pageNum:1,
pageSize: 99
},
// 表单参数
@@ -510,6 +475,8 @@ export default {
inDate: null,
backDate: null,
productGuid: null,
productId: null,
productName: null,
quantity: null,
jobId: null,
trayCode: null,
@@ -525,9 +492,7 @@ export default {
spare3: null,
spare4: null,
spare5: null,
spare6: null,
ktpType: null,
productType: null
spare6: null
}
this.resetForm("form")
},
@@ -546,7 +511,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.stockId)
this.single = selection.length !== 1
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
@@ -588,13 +553,12 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const stockIds = row.stockId || this.ids
this.$modal.confirm("是否确认删除库存信息编号为" + stockIds).then(function () { // 是否确认删除库存信息编号为
this.$modal.confirm("是否确认删除库存信息编号为" + stockIds).then(function() { // 是否确认删除库存信息编号为
return delManagement(stockIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功") // 删除成功
}).catch(() => {
})
}).catch(() => {})
},
/** 导出按钮操作 */
handleExport() {

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

@@ -17,14 +17,6 @@
@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"
@@ -87,20 +79,20 @@
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
<el-table-column label="库存编码" align="center" prop="stockId" width="120"/>
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="120"/>
<el-table-column label="入库日期" align="center" prop="inDate" width="160" />
<el-table-column label="批次号" align="center" prop="lotNo"/>
<el-table-column label="托盘条码" align="center" prop="trayCode" width="130" />
<el-table-column label="存货编码" align="center" prop="productId" />
<el-table-column label="存货名称" align="center" prop="productName" width="120"/>
<el-table-column label="存货名称" align="center" prop="productName"/>
<el-table-column label="层级关系" align="center" prop="spare1"/>
<el-table-column label="上层物料" align="center" prop="spare2"/>
<el-table-column label="顶层物料" align="center" prop="spare3"/>
<el-table-column label="项目号" align="center" prop="spare4"/>
<el-table-column label="合同号" align="center" prop="spare5"/>
<el-table-column label="销售订单" align="center" prop="spare6"/>
<el-table-column label="供应商编码" align="center" prop="voltage" width="120"/>
<el-table-column label="供应商编码" align="center" prop="voltage"/>
<el-table-column label="规格型号" align="center" prop="power"/>
<el-table-column label="计量单位" align="center" prop="phase"/>
<el-table-column label="数量" align="center" prop="quantity"/>
@@ -252,8 +244,8 @@ export default {
},
// 出口选项
exitOptions: [
{exitId: '1', exitName: '缓存'},
{exitId: '2', exitName: '线边'},
{exitId: '1', exitName: '一楼'},
{exitId: '2', exitName: '二楼'},
],

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://localhost:8080' // 后端接口
const port = process.env.port || process.env.npm_config_port || 80 // 端口