FeiDaBaoKai/wms_web_xugongteji
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
15066119699 2025-03-06 16:37:22 +08:00
parent d3f1342f9d
commit 5162156045
4 changed files with 235 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/api/system/pmsOrderOut.js
View File

@ -1,7 +1,7 @@
import request from '@/utils/request'
// 查询【请填写功能名称】列表
export function listOut(query) {
// 查询出库单列表
export function listPmsOrderOut(query) {
return request({
url: '/app/pmsOrderOut/list',
method: 'get',
@ -9,16 +9,16 @@ export function listOut(query) {
})
}
// 查询【请填写功能名称】详细
export function getOut(listId) {
// 查询出库单详细
export function getPmsOrderOut(recordId) {
return request({
url: '/app/pmsOrderOut/' + listId,
url: '/app/pmsOrderOut/' + recordId,
method: 'get'
})
}
// 新增【请填写功能名称】
export function addOut(data) {
// 新增出库单
export function addPmsOrderOut(data) {
return request({
url: '/app/pmsOrderOut',
method: 'post',
@ -26,8 +26,8 @@ export function addOut(data) {
})
}
// 修改【请填写功能名称】
export function updateOut(data) {
// 修改出库单
export function updatePmsOrderOut(data) {
return request({
url: '/app/pmsOrderOut',
method: 'put',
@ -35,10 +35,10 @@ export function updateOut(data) {
})
}
// 删除【请填写功能名称】
export function delOut(listId) {
// 删除出库单
export function delPmsOrderOut(recordId) {
return request({
url: '/app/pmsOrderOut/' + listId,
url: '/app/pmsOrderOut/' + recordId,
method: 'delete'
})
}

9
src/api/system/task.js
View File

@ -50,3 +50,12 @@ export function taskOutRequest(data) {
data: data
})
}
//出库单出库请求
export function createOutRequestByPmsOrders(data){
return request({
url: '/app/task/createOutRequestByPmsOrders',
method: 'post',
data: data
})
}

227
src/views/system/pmsOrderOut/index.vue
View File

@ -1,10 +1,18 @@
<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="客户名称" prop="customerId">
<el-form-item label="单号" prop="orderId">
<el-input
v-model="queryParams.customerId"
placeholder="请输入客户名称"
v-model="queryParams.orderId"
placeholder="请输入单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出库单号" prop="listId">
<el-input
v-model="queryParams.listId"
placeholder="请输入出库单号"
clearable
@keyup.enter.native="handleQuery"
/>
@ -17,34 +25,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出库数量" prop="goodsNum">
<el-form-item label="是否锁定" prop="isLock">
<el-input
v-model="queryParams.goodsNum"
placeholder="请输入出库数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料描述" prop="goodsDesc">
<el-input
v-model="queryParams.goodsDesc"
placeholder="请输入物料描述"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="预留1" prop="spare1">
<el-input
v-model="queryParams.spare1"
placeholder="请输入预留1"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="预留2" prop="spare2">
<el-input
v-model="queryParams.spare2"
placeholder="请输入预留2"
v-model="queryParams.isLock"
placeholder="请输入是否锁定"
clearable
@keyup.enter.native="handleQuery"
/>
@ -98,20 +82,44 @@
v-hasPermi="['app:pmsOrderOut:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-remove"
size="mini"
@click="handleOut"
>出库</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="outList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="pmsOrderOutList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="记录号" align="center" prop="recordId" /> -->
<el-table-column label="单号" align="center" prop="orderId" width="270"/>
<el-table-column label="出库单号" align="center" prop="listId" />
<el-table-column label="出库单类型" align="center" prop="orderType" />
<el-table-column label="客户名称" align="center" prop="customerId" />
<el-table-column label="物料号" align="center" prop="goodsId" />
<el-table-column label="出库数量" align="center" prop="goodsNum" />
<el-table-column label="订单出库数量" align="center" prop="goodsNum" />
<el-table-column label="总出库数量" align="center" prop="pickNum" />
<el-table-column label="确认出库数量" align="center" prop="trNum" />
<el-table-column label="本次出库数量" align="center" prop="shelvesNum" width="200">
<template slot-scope="scope">
<el-input-number
class="item"
v-model="scope.row.shelvesNum"
:min="0"
:max="scope.row.goodsNum"
:disabled="scope.row.orderStatus == 1"
></el-input-number>
</template>
</el-table-column>
<el-table-column label="库存数量" align="center" prop="stockNum" />
<el-table-column label="物料描述" align="center" prop="goodsDesc" />
<el-table-column label="预留1" align="center" prop="spare1" />
<el-table-column label="预留2" align="center" prop="spare2" />
<el-table-column label="订单状态" align="center" prop="orderStatus" />
<el-table-column label="是否锁定" align="center" prop="isLock" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -140,17 +148,35 @@
@pagination="getList"
/>
<!-- 添加或修改【请填写功能名称】对话框 -->
<!-- 添加或修改出库单对话框 -->
<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="wms订单号" prop="orderId">
<el-input v-model="form.orderId" placeholder="请输入wms订单号" />
</el-form-item>
<el-form-item label="出库单号" prop="listId">
<el-input v-model="form.listId" placeholder="请输入出库单号" />
</el-form-item>
<el-form-item label="客户名称" prop="customerId">
<el-input v-model="form.customerId" placeholder="请输入客户名称" />
</el-form-item>
<el-form-item label="物料号" prop="goodsId">
<el-input v-model="form.goodsId" placeholder="请输入物料号" />
</el-form-item>
<el-form-item label="出库数量" prop="goodsNum">
<el-input v-model="form.goodsNum" placeholder="请输入出库数量" />
<el-form-item label="订单出库数量" prop="goodsNum">
<el-input v-model="form.goodsNum" placeholder="请输入订单出库数量" />
</el-form-item>
<el-form-item label="总出库数量" prop="pickNum">
<el-input v-model="form.pickNum" placeholder="请输入总出库数量" />
</el-form-item>
<el-form-item label="确认出库数量" prop="trNum">
<el-input v-model="form.trNum" placeholder="请输入确认出库数量" />
</el-form-item>
<el-form-item label="本次出库数量" prop="shelvesNum">
<el-input v-model="form.shelvesNum" placeholder="请输入本次出库数量" />
</el-form-item>
<el-form-item label="库存数量" prop="stockNum">
<el-input v-model="form.stockNum" placeholder="请输入库存数量" />
</el-form-item>
<el-form-item label="物料描述" prop="goodsDesc">
<el-input v-model="form.goodsDesc" placeholder="请输入物料描述" />
@ -161,6 +187,9 @@
<el-form-item label="预留2" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入预留2" />
</el-form-item>
<el-form-item label="是否锁定" prop="isLock">
<el-input v-model="form.isLock" placeholder="请输入是否锁定" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -171,10 +200,10 @@
</template>
<script>
import { listOut, getOut, delOut, addOut, updateOut } from "@/api/system/pmsOrderOut";
import { listPmsOrderOut, getPmsOrderOut, delPmsOrderOut, addPmsOrderOut, updatePmsOrderOut } from "@/api/system/pmsOrderOut";
import {createOutRequestByPmsOrders} from "@/api/system/task";
export default {
name: "Out",
name: "PmsOrderOut",
data() {
return {
// 遮罩层
@ -189,8 +218,8 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 【请填写功能名称】表格数据
outList: [],
// 出库单表格数据
pmsOrderOutList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@ -199,40 +228,31 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
orderType: null,
customerId: null,
orderId: null,
listId: null,
goodsId: null,
goodsNum: null,
goodsDesc: null,
spare1: null,
spare2: null,
orderStatus: null
orderStatus: null,
isLock: null
},
// 表单参数
form: {},
// 表单校验
rules: {
orderType: [
{ required: true, message: "出库单类型不能为空", trigger: "change" }
recordId: [
{ required: true, message: "记录号不能为空", trigger: "blur" }
],
customerId: [
{ required: true, message: "客户名称不能为空", trigger: "blur" }
orderId: [
{ required: true, message: "wms订单号不能为空", trigger: "blur" }
],
listId: [
{ required: true, message: "出库单号不能为空", trigger: "blur" }
],
goodsId: [
{ required: true, message: "物料号不能为空", trigger: "blur" }
],
goodsNum: [
{ required: true, message: "出库数量不能为空", trigger: "blur" }
{ required: true, message: "订单出库数量不能为空", trigger: "blur" }
],
goodsDesc: [
{ required: true, message: "物料描述不能为空", trigger: "blur" }
],
spare1: [
{ required: true, message: "预留1不能为空", trigger: "blur" }
],
orderStatus: [
{ required: true, message: "订单状态不能为空", trigger: "change" }
]
}
};
},
@ -240,11 +260,11 @@ export default {
this.getList();
},
methods: {
/** 查询【请填写功能名称】列表 */
/** 查询出库单列表 */
getList() {
this.loading = true;
listOut(this.queryParams).then(response => {
this.outList = response.rows;
listPmsOrderOut(this.queryParams).then(response => {
this.pmsOrderOutList = response.rows;
this.total = response.total;
this.loading = false;
});
@ -257,15 +277,22 @@ export default {
// 表单重置
reset() {
this.form = {
recordId: null,
orderId: null,
listId: null,
orderType: null,
customerId: null,
goodsId: null,
goodsNum: null,
pickNum: null,
trNum: null,
shelvesNum: null,
stockNum: null,
goodsDesc: null,
spare1: null,
spare2: null,
orderStatus: null
orderStatus: null,
isLock: null
};
this.resetForm("form");
},
@ -281,7 +308,12 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.listId)
this.ids = selection.map(item => item.recordId)
selection.forEach((element) => {
if (element.shelvesNum == undefined || element.shelvesNum == 0) {
element.shelvesNum = element.goodsNum - element.pickNum;
}
});
this.single = selection.length!==1
this.multiple = !selection.length
},
@ -289,30 +321,30 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加【请填写功能名称】";
this.title = "添加出库单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const listId = row.listId || this.ids
getOut(listId).then(response => {
const recordId = row.recordId || this.ids
getPmsOrderOut(recordId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改【请填写功能名称】";
this.title = "修改出库单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.listId != null) {
updateOut(this.form).then(response => {
if (this.form.recordId != null) {
updatePmsOrderOut(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addOut(this.form).then(response => {
addPmsOrderOut(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -323,14 +355,53 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const listIds = row.listId || this.ids;
this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + listIds + '"的数据项？').then(function() {
return delOut(listIds);
const recordIds = row.recordId || this.ids;
this.$modal.confirm('是否确认删除出库单编号为"' + recordIds + '"的数据项？').then(function() {
return delPmsOrderOut(recordIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
handleOut(row){
const recordIds = row.recordId || this.ids;
if (recordIds == "" || recordIds == undefined || recordIds.length == 0) {
this.$modal.msgError("请选择要出库的通知单列表！");
return;
}
var reqArr = [];
var error = false;
for (var j = 0; j < recordIds.length; j++) {
for (var i = 0; i < this.pmsOrderOutList.length; i++) {
if (recordIds[j] == this.pmsOrderOutList[i].recordId) {
if(this.pmsOrderOutList[i].shelvesNum ==0){
this.$modal.msgError("物料号为" + this.pmsOrderOutList[i].goodsId + "已出库完成！");
error = true;
break;
}
reqArr.push(this.pmsOrderOutList[i]);
break;
}
}
}
if (error) {
return;
}
this.$modal
.confirm("请确认本次出库数量是否正确，是否出库？")
.then(function () {
return createOutRequestByPmsOrders(reqArr);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("出库任务创建成功");
})
.catch(() => {
this.$modal.msgSuccess("出库任务创建异常");
});
},
/** 导出按钮操作 */
handleExport() {
this.download('app/pmsOrderOut/export', {

65
src/views/system/vehicle/index.vue
View File

@ -80,6 +80,9 @@
v-hasPermi="['app:vehicle:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:vehicle:import']">导入</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
@ -193,12 +196,31 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 容器导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的容器数据
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.open = false">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listVehicle, getVehicle, delVehicle, addVehicle, updateVehicle } from "@/api/system/vehicle";
import { getToken } from "@/utils/auth";
export default {
name: "Vehicle",
data() {
@ -242,6 +264,21 @@ export default {
}],
// 表单参数
form: {},
// 容器导入参数
upload: {
// 是否显示弹出层（容器导入）
open: false,
// 弹出层标题（容器导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/app/vehicle/importData"
},
// 表单校验
rules: {
vehicleType: [
@ -363,6 +400,32 @@ export default {
this.download('app/vehicle/export', {
...this.queryParams
}, `vehicle_${new Date().getTime()}.xlsx`)
},
/** 导入按钮操作 */
handleImport() {
this.upload.title = "容器导入";
this.upload.open = true;
},
/** 下载模板操作 */
importTemplate() {
this.download('app/vehicle/importTemplate', {
}, `user_template_${new Date().getTime()}.xlsx`)
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
this.getList();
},
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit();
}
}
};