root/wq-wms-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:PDA组盘、PDA入库、采购入库单

Browse Source 
add:多数据源配置
This commit is contained in:
zhaoyf
2026-06-13 13:33:52 +08:00
parent bf66aae879
commit 20aebd4888
56 changed files with 2989 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

267
nladmin-ui/src/views/wms/st/purchase/AddDialog.vue Normal file
View File

@@ -0,0 +1,267 @@
<template>
<el-dialog
:title="crud.status.title"
append-to-body
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0 || crud.status.view > 0"
fullscreen
width="1200px"
@open="open"
@close="close"
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
</el-col>
<el-col :span="4">
<span>
<el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
</span>
</el-col>
</el-row>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据编号" prop="bill_id">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model.trim="form.bill_id" :disabled="crud.status.edit > 0 || crud.status.view > 0" placeholder="单据编号" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="订单号" prop="order_no">
<el-input v-model.trim="form.order_no" :disabled="crud.status.view > 0" placeholder="订单号" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="订单类型" prop="order_type">
<el-input v-model.trim="form.order_type" :disabled="crud.status.view > 0" placeholder="订单类型" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="供应商编码" prop="supplier_code">
<el-input v-model.trim="form.supplier_code" :disabled="crud.status.view > 0" placeholder="供应商编码" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="供应商名称" prop="supplier_name">
<el-input v-model.trim="form.supplier_name" :disabled="crud.status.view > 0" placeholder="供应商名称" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-select v-model="form.bill_status" clearable style="width: 210px" placeholder="单据状态" class="filter-item" disabled>
<el-option v-for="item in billStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="明细数" prop="dtl_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model.trim="form.dtl_count" size="mini" disabled style="width: 210px" />
</el-form-item>
</el-form>
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<slot name="left" />
<el-button
v-if="crud.status.cu > 0"
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="insertEvent"
>
添加明细行
</el-button>
</span>
</div>
<el-table
ref="table"
:data="form.tableData"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip width="120" prop="item_no" label="行号">
<template scope="scope">
<el-input v-if="crud.status.cu > 0" v-model="scope.row.item_no" size="mini" />
<span v-else>{{ scope.row.item_no }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="120" prop="category_code" label="分类编码">
<template scope="scope">
<el-input v-if="crud.status.cu > 0" v-model="scope.row.category_code" size="mini" />
<span v-else>{{ scope.row.category_code }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="120" prop="category_name" label="分类名称">
<template scope="scope">
<el-input v-if="crud.status.cu > 0" v-model="scope.row.category_name" size="mini" />
<span v-else>{{ scope.row.category_name }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="120" prop="sku_code" label="物料编码">
<template scope="scope">
<el-input v-if="crud.status.cu > 0" v-model="scope.row.sku_code" size="mini" />
<span v-else>{{ scope.row.sku_code }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="140" prop="sku_name" label="物料名称">
<template scope="scope">
<el-input v-if="crud.status.cu > 0" v-model="scope.row.sku_name" size="mini" />
<span v-else>{{ scope.row.sku_name }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="100" prop="model" label="规格型号">
<template scope="scope">
<el-input v-if="crud.status.cu > 0" v-model="scope.row.model" size="mini" />
<span v-else>{{ scope.row.model }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="100" prop="house_code" label="仓库编码">
<template scope="scope">
<el-input v-if="crud.status.cu > 0" v-model="scope.row.house_code" size="mini" />
<span v-else>{{ scope.row.house_code }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="120" prop="batch_no" label="批次号">
<template scope="scope">
<el-input v-if="crud.status.cu > 0" v-model="scope.row.batch_no" size="mini" />
<span v-else>{{ scope.row.batch_no }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="100" prop="qty" label="数量">
<template scope="scope">
<el-input-number v-if="crud.status.cu > 0" v-model="scope.row.qty" :controls="false" :min="0" size="mini" style="width: 80px" />
<span v-else>{{ scope.row.qty }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="80" prop="unit" label="单位">
<template scope="scope">
<el-input v-if="crud.status.cu > 0" v-model="scope.row.unit" size="mini" />
<span v-else>{{ scope.row.unit }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="120" prop="track_no" label="跟踪号">
<template scope="scope">
<el-input v-if="crud.status.cu > 0" v-model="scope.row.track_no" size="mini" />
<span v-else>{{ scope.row.track_no }}</span>
</template>
</el-table-column>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="80" fixed="right">
<template scope="scope">
<el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
</template>
</el-table-column>
</el-table>
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from '@crud/crud'
import crudPurchase from '@/views/wms/st/purchase/purchase'
const defaultForm = {
id: '',
bill_id: '',
order_no: '',
order_type: '',
supplier_code: '',
supplier_name: '',
creator: '',
create_time: null,
modify_date: null,
status: 0,
red: 0,
bill_status: '0',
audit_status: '',
audit_msg: '',
dtl_count: '0',
tableData: []
}
export default {
name: 'AddDialog',
mixins: [crud(), form(defaultForm)],
props: {
dialogShow: {
type: Boolean,
default: false
}
},
data() {
return {
billStatusOptions: [
{ value: '0', label: '已创建' },
{ value: '1', label: '执行中' },
{ value: '2', label: '已完成' },
{ value: '3', label: '审核成功' },
{ value: '4', label: '审核失败' }
],
rules: {
bill_id: [
{ required: true, message: '单据编号不能为空', trigger: 'blur' }
],
order_no: [
{ required: true, message: '订单号不能为空', trigger: 'blur' }
],
supplier_code: [
{ required: true, message: '供应商编码不能为空', trigger: 'blur' }
]
}
}
},
methods: {
open() {
},
close() {
this.$emit('AddChanged')
},
[CRUD.HOOK.afterToEdit]() {
crudPurchase.get(this.form.id).then(res => {
if (res && res.tableData) {
this.form.tableData = res.tableData
}
})
},
[CRUD.HOOK.afterToView]() {
crudPurchase.get(this.form.id).then(res => {
if (res && res.tableData) {
this.form.tableData = res.tableData
}
})
},
[CRUD.HOOK.beforeSubmit]() {
if (this.form.tableData.length === 0) {
this.crud.notify('请至少添加一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
},
insertEvent() {
this.form.tableData.push({
item_no: String(this.form.tableData.length + 1),
category_code: '',
category_name: '',
sku_code: '',
sku_name: '',
model: '',
house_code: '',
batch_no: '',
qty: 0,
unit_code: '',
unit: '',
track_no: ''
})
this.form.dtl_count = String(this.form.tableData.length)
},
deleteRow(index, rows) {
rows.splice(index, 1)
this.form.dtl_count = String(this.form.tableData.length)
}
}
}
</script>
<style>
.crud-opts2 {
padding: 4px 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .crud-opts-right2 {
margin-left: auto;
}
</style>

159
nladmin-ui/src/views/wms/st/purchase/ViewDialog.vue Normal file
View File

@@ -0,0 +1,159 @@
<template>
<el-dialog
append-to-body
title="采购入库单详情"
:visible.sync="dialogVisible"
destroy-on-close
fullscreen
@close="close"
@open="open"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据编号" prop="bill_id">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_id" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="订单号" prop="order_no">
<el-input v-model="form.order_no" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="订单类型" prop="order_type">
<el-input v-model="form.order_type" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="供应商编码" prop="supplier_code">
<el-input v-model="form.supplier_code" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="供应商名称" prop="supplier_name">
<el-input v-model="form.supplier_name" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-select v-model="form.bill_status" disabled style="width: 210px">
<el-option v-for="item in billStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="审核状态" prop="audit_status">
<el-input v-model="auditStatusLabel" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="审核信息" prop="audit_msg">
<el-input v-model="form.audit_msg" disabled style="width: 380px" />
</el-form-item>
<el-form-item label="创建人" prop="creator">
<el-input v-model="form.creator" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="创建时间" prop="create_time">
<el-input :value="formatDate(form.create_time)" disabled style="width: 210px" />
</el-form-item>
</el-form>
<div class="crud-opts2">
<span class="role-span2">入库明细</span>
</div>
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<el-table ref="table" :data="tableDtl" style="width: 100%;" max-height="400" size="mini" border :header-cell-style="{background:'#f5f7fa',color:'#606266'}">
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="item_no" label="行号" width="80" align="center" />
<el-table-column show-overflow-tooltip prop="category_code" label="分类编码" width="120" align="center" />
<el-table-column show-overflow-tooltip prop="category_name" label="分类名称" width="120" align="center" />
<el-table-column show-overflow-tooltip prop="sku_code" label="物料编码" width="120" align="center" />
<el-table-column show-overflow-tooltip prop="sku_name" label="物料名称" min-width="140" align="center" />
<el-table-column show-overflow-tooltip prop="model" label="规格型号" width="100" align="center" />
<el-table-column show-overflow-tooltip prop="house_code" label="仓库编码" width="100" align="center" />
<el-table-column show-overflow-tooltip prop="batch_no" label="批次号" width="120" align="center" />
<el-table-column prop="qty" label="数量" width="80" align="center" />
<el-table-column show-overflow-tooltip prop="unit" label="单位" width="80" align="center" />
<el-table-column show-overflow-tooltip prop="track_no" label="跟踪号" width="120" align="center" />
</el-table>
</el-card>
</el-dialog>
</template>
<script>
import { crud } from '@crud/crud'
import crudPurchase from '@/views/wms/st/purchase/purchase'
export default {
name: 'ViewDialog',
mixins: [crud()],
props: {
dialogShow: {
type: Boolean,
default: false
},
rowMst: {
type: Object,
default: () => ({})
}
},
data() {
return {
dialogVisible: false,
tableDtl: [],
form: {},
billStatusOptions: [
{ value: '0', label: '已创建' },
{ value: '1', label: '执行中' },
{ value: '2', label: '已完成' },
{ value: '3', label: '审核成功' },
{ value: '4', label: '审核失败' }
]
}
},
computed: {
auditStatusLabel() {
const map = { '0': '未审核', '1': '已审核' }
return map[this.form.status] || this.form.status || '-'
}
},
watch: {
dialogShow: {
handler(newValue) {
this.dialogVisible = newValue
}
},
rowMst: {
handler(newValue) {
this.form = newValue || {}
},
deep: true
}
},
methods: {
open() {
if (this.form && this.form.id) {
crudPurchase.get(this.form.id).then(res => {
this.tableDtl = (res && res.tableData) || []
})
}
},
close() {
this.$emit('update:dialogShow', false)
this.$emit('AddChanged')
this.tableDtl = []
},
formatDate(val) {
if (!val) return ''
if (typeof val === 'string') return val
const d = new Date(val)
const y = d.getFullYear()
const m = String(d.getMonth() + 1).padStart(2, '0')
const day = String(d.getDate()).padStart(2, '0')
const h = String(d.getHours()).padStart(2, '0')
const min = String(d.getMinutes()).padStart(2, '0')
const s = String(d.getSeconds()).padStart(2, '0')
return y + '-' + m + '-' + day + ' ' + h + ':' + min + ':' + s
}
}
}
</script>
<style>
.crud-opts2 {
padding: 10px 0px 0px 10px;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .role-span2 {
font-size: 16px;
color: #303133;
}
</style>

196
nladmin-ui/src/views/wms/st/purchase/index.vue Normal file
View File

@@ -0,0 +1,196 @@
<template>
<div class="app-container">
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-form :inline="true" class="demo-form-inline" label-position="right" label-width="80px" label-suffix=":">
<el-form-item label="模糊查询">
<el-input v-model="query.blurry" size="mini" clearable placeholder="单据号/订单号/供应商" @keyup.enter.native="crud.toQuery" />
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="query.bill_id" size="mini" clearable placeholder="单据编号" @keyup.enter.native="crud.toQuery" />
</el-form-item>
<el-form-item label="订单号">
<el-input v-model="query.order_no" size="mini" clearable placeholder="订单号" @keyup.enter.native="crud.toQuery" />
</el-form-item>
<el-form-item label="供应商">
<el-input v-model="query.supplier_name" size="mini" clearable placeholder="供应商名称" @keyup.enter.native="crud.toQuery" />
</el-form-item>
<el-form-item label="单据状态">
<el-select v-model="query.bill_status" clearable size="mini" placeholder="全部" class="filter-item" @change="crud.toQuery">
<el-option v-for="item in billStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker v-model="query.createTime" type="daterange" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" @change="crud.toQuery" />
</el-form-item>
<rrOperation />
</el-form>
</div>
<crudOperation :permission="permission">
<el-button slot="right" class="filter-item" type="warning" icon="el-icon-s-promotion" size="mini" :disabled="audit_flag" @click="forceAudit">强制回传</el-button>
</crudOperation>
<el-table ref="table" v-loading="crud.loading" size="mini" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange" @select="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column v-permission="['admin','purchasemst:del','purchasemst:edit']" label="操作" width="115" align="center" fixed="right">
<template slot-scope="scope">
<udOperation :data="scope.row" :permission="permission" :disabled-edit="canUd(scope.row)" :disabled-dle="canUd(scope.row)" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="bill_id" width="160" label="单据编号">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_id }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="order_no" width="150" label="订单号" />
<el-table-column show-overflow-tooltip prop="order_type" width="100" label="订单类型" />
<el-table-column :formatter="billStatusFormat" prop="bill_status" width="100" label="单据状态" />
<el-table-column label="明细数" align="center" prop="dtl_count" width="80" />
<el-table-column label="单据总数" align="center" prop="total_qty" width="80" />
<el-table-column label="入库数量" align="center" prop="instock_qty" width="80" />
<el-table-column show-overflow-tooltip prop="supplier_code" width="120" label="供应商编码" />
<el-table-column show-overflow-tooltip prop="supplier_name" width="150" label="供应商名称" />
<el-table-column show-overflow-tooltip prop="creator" width="100" label="创建人" />
<el-table-column show-overflow-tooltip prop="create_time" width="150" label="创建时间">
<template slot-scope="scope">
{{ formatDate(scope.row.create_time) }}
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="modify_date" width="150" label="修改时间">
<template slot-scope="scope">
{{ formatDate(scope.row.modify_date) }}
</template>
</el-table-column>
<el-table-column prop="status" :formatter="auditStatusFormat" width="100" label="审核状态" />
<el-table-column show-overflow-tooltip prop="audit_msg" width="150" label="审核信息" />
</el-table>
<pagination />
</div>
<AddDialog @AddChanged="querytable" />
<ViewDialog :dialog-show.sync="viewShow" :row-mst="mstrow" @AddChanged="querytable" />
</div>
</template>
<script>
import crudPurchase from '@/views/wms/st/purchase/purchase'
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/st/purchase/AddDialog'
import ViewDialog from '@/views/wms/st/purchase/ViewDialog'
export default {
name: 'Purchase',
components: { AddDialog, ViewDialog, crudOperation, rrOperation, udOperation, pagination },
cruds() {
return CRUD({
title: '采购入库单',
optShow: { add: true, reset: true },
idField: 'id',
url: '/api/purchasemst',
crudMethod: { ...crudPurchase },
queryOnPresenterCreated: true
})
},
mixins: [presenter(), header(), crud()],
data() {
return {
permission: {
add: ['admin', 'purchasemst:add'],
edit: ['admin', 'purchasemst:edit'],
del: ['admin', 'purchasemst:del']
},
viewShow: false,
mstrow: {},
currentRow: null,
audit_flag: true,
billStatusOptions: [
{ value: '0', label: '已创建' },
{ value: '1', label: '执行中' },
{ value: '2', label: '已完成' },
{ value: '3', label: '审核成功' },
{ value: '4', label: '审核失败' }
]
}
},
methods: {
canUd(row) {
return row.bill_status !== '0'
},
billStatusFormat(row) {
const map = { '0': '已创建', '1': '执行中', '2': '已完成', '3': '审核成功', '4': '审核失败' }
return map[row.bill_status] || row.bill_status
},
auditStatusFormat(row) {
const map = { '0': '未审核', '1': '已审核' }
return map[row.status] || row.status || '-'
},
formatDate(val) {
if (!val) return ''
if (typeof val === 'string') return val
const d = new Date(val)
const y = d.getFullYear()
const m = String(d.getMonth() + 1).padStart(2, '0')
const day = String(d.getDate()).padStart(2, '0')
const h = String(d.getHours()).padStart(2, '0')
const min = String(d.getMinutes()).padStart(2, '0')
const s = String(d.getSeconds()).padStart(2, '0')
return y + '-' + m + '-' + day + ' ' + h + ':' + min + ':' + s
},
toView(index, row) {
this.mstrow = row
this.viewShow = true
},
handleSelectionChange(val, row) {
console.log(val.length)
if (val.length == 0) {
// this.$refs.table.clearSelection()
// this.$refs.table.toggleRowSelection(val.pop())
this.audit_flag = true
}else {
this.audit_flag = false
}
},
handleCurrentChange(currentRow) {
if (currentRow === null) {
this.currentRow = {}
} else {
this.currentRow = currentRow
}
this.audit_flag = this.crud.selections.length === 0
},
querytable() {
this.crud.toQuery()
},
forceAudit() {
const selections = this.crud.selections
if (!selections || selections.length === 0) {
this.crud.notify('请至少选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
return
}
const ids = selections.map(s => s.id)
const billIds = selections.map(s => s.bill_id).join('、')
this.$confirm('确认将以下单据强制回传EAS审核？\n' + billIds, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
crudPurchase.forceAudit(ids).then(() => {
this.crud.notify('回传完成', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}).catch(() => {
this.crud.notify('回传失败', CRUD.NOTIFICATION_TYPE.ERROR)
})
}).catch(() => {})
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 10px;
}
</style>

42
nladmin-ui/src/views/wms/st/purchase/purchase.js Normal file
View File

@@ -0,0 +1,42 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: '/api/purchasemst',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: '/api/purchasemst',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: '/api/purchasemst',
method: 'put',
data
})
}
export function get(id) {
return request({
url: '/api/purchasemst/' + id,
method: 'get'
})
}
export function forceAudit(data) {
return request({
url: '/api/purchasemst/forceAudit',
method: 'put',
data
})
}
export default { add, edit, del, get, forceAudit }