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

add:增加退料入库

Browse Source
This commit is contained in:
zhangzq
2026-07-08 14:22:52 +08:00
parent 8dd3726f68
commit acee4f0695
35 changed files with 1109 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

266
nladmin-ui/src/views/wms/pm_manage/pmReturn/index.vue Normal file
View File

@@ -0,0 +1,266 @@
<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="90px" 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.orderCode" size="mini" clearable placeholder="退料单号" @keyup.enter.native="crud.toQuery" />
</el-form-item>
<el-form-item label="物料编码">
<el-input v-model="query.skuCode" size="mini" clearable placeholder="物料编码" @keyup.enter.native="crud.toQuery" />
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="query.skuName" size="mini" clearable placeholder="物料名称" @keyup.enter.native="crud.toQuery" />
</el-form-item>
<el-form-item label="线边库位">
<el-input v-model="query.targetArea" size="mini" clearable placeholder="线边库位" @keyup.enter.native="crud.toQuery" />
</el-form-item>
<el-form-item label="来源仓别">
<el-input v-model="query.sourceHouseCode" size="mini" clearable placeholder="来源仓别" @keyup.enter.native="crud.toQuery" />
</el-form-item>
<el-form-item label="状态">
<el-select v-model="query.status" clearable size="mini" placeholder="全部" class="filter-item" @change="crud.toQuery">
<el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="操作时间">
<el-date-picker
v-model="query.dateRange"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
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="primary" icon="el-icon-printer" size="mini" :disabled="actionDisabled" @click="printBill">打印</el-button>
</crudOperation>
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" highlight-current-row style="width: 100%;" @selection-change="handleSelectionChange" @current-change="handleCurrentChange">
<el-table-column type="selection" width="55" />
<el-table-column v-permission="['admin','pmReturn:del','pmReturn: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="orderCode" width="160" label="退料单号">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.orderCode }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="serialNo" width="90" label="序号" />
<el-table-column show-overflow-tooltip prop="skuCode" width="140" label="物料编码" />
<el-table-column show-overflow-tooltip prop="skuName" min-width="180" label="物料名称" />
<el-table-column prop="qty" width="100" label="数量" align="right" />
<el-table-column prop="assignQty" width="100" label="已分配数量" align="right" />
<el-table-column show-overflow-tooltip prop="unit" width="80" label="单位" />
<el-table-column show-overflow-tooltip prop="targetArea" width="120" label="线边库位" />
<el-table-column show-overflow-tooltip prop="containerCode" width="120" label="容器编号" />
<el-table-column prop="deliveryMethod" width="100" label="配送方式" :formatter="deliveryMethodFormat" />
<el-table-column show-overflow-tooltip prop="creator" width="100" label="操作人工号" />
<el-table-column show-overflow-tooltip prop="createTime" width="160" label="操作时间" />
<el-table-column show-overflow-tooltip prop="sourceHouseCode" width="120" label="来源仓别" />
<el-table-column prop="status" width="100" label="状态" :formatter="statusFormat" />
<el-table-column show-overflow-tooltip prop="updateName" width="100" label="更新人" />
<el-table-column show-overflow-tooltip prop="updateTime" width="160" label="更新时间" />
</el-table>
<pagination />
</div>
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="980px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px" label-suffix=":" style="border: 1px solid #cfe0df;margin-top: 10px;padding: 10px;">
<el-row>
<el-col :span="12"><el-form-item label="唯一ID" prop="id"><el-input v-model.trim="form.id" :disabled="crud.status.edit > 0" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="退料单号" prop="orderCode"><el-input v-model.trim="form.orderCode" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="序号" prop="serialNo"><el-input v-model.trim="form.serialNo" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="物料编码" prop="skuCode"><el-input v-model.trim="form.skuCode" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="物料名称" prop="skuName"><el-input v-model.trim="form.skuName" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="数量" prop="qty"><el-input-number v-model="form.qty" :min="0" :precision="3" :step="1" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="已分配数量" prop="assignQty"><el-input-number v-model="form.assignQty" :min="0" :precision="3" :step="1" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="单位" prop="unit"><el-input v-model.trim="form.unit" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="线边库位" prop="targetArea"><el-input v-model.trim="form.targetArea" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="容器编号" prop="containerCode"><el-input v-model.trim="form.containerCode" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="配送方式" prop="deliveryMethod"><el-select v-model="form.deliveryMethod" style="width: 300px;" placeholder="请选择配送方式"><el-option v-for="item in deliveryMethodOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item></el-col>
<el-col :span="12"><el-form-item label="操作人工号" prop="creator"><el-input v-model.trim="form.creator" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="操作时间" prop="createTime"><el-date-picker v-model="form.createTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择操作时间" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="来源仓别" prop="sourceHouseCode"><el-input v-model.trim="form.sourceHouseCode" style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="状态" prop="status"><el-select v-model="form.status" style="width: 300px;" placeholder="请选择状态"><el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item></el-col>
<el-col :span="12"><el-form-item label="更新人" prop="updateName"><el-input v-model.trim="form.updateName" style="width: 300px;" /></el-form-item></el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer"><el-button type="text" @click="crud.cancelCU">取消</el-button><el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button></div>
</el-dialog>
<el-dialog :visible.sync="viewShow" title="生产退料单详情" width="980px" :close-on-click-modal="false">
<el-form size="mini" label-width="110px" label-suffix=":" style="border: 1px solid #cfe0df;margin-top: 10px;padding: 10px;">
<el-row>
<el-col :span="12"><el-form-item label="唯一ID"><el-input :value="currentRow.id" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="退料单号"><el-input :value="currentRow.orderCode" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="序号"><el-input :value="currentRow.serialNo" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="物料编码"><el-input :value="currentRow.skuCode" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="物料名称"><el-input :value="currentRow.skuName" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="数量"><el-input :value="currentRow.qty" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="已分配数量"><el-input :value="currentRow.assignQty" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="单位"><el-input :value="currentRow.unit" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="线边库位"><el-input :value="currentRow.targetArea" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="容器编号"><el-input :value="currentRow.containerCode" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="配送方式"><el-input :value="deliveryMethodLabel(currentRow.deliveryMethod)" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="操作人工号"><el-input :value="currentRow.creator" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="操作时间"><el-input :value="currentRow.createTime" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="来源仓别"><el-input :value="currentRow.sourceHouseCode" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="状态"><el-input :value="statusLabel(currentRow.status)" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="更新人"><el-input :value="currentRow.updateName" disabled style="width: 300px;" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="更新时间"><el-input :value="currentRow.updateTime" disabled style="width: 300px;" /></el-form-item></el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer"><el-button type="primary" @click="viewShow = false">关闭</el-button></div>
</el-dialog>
</div>
</template>
<script>
import crudPmReturn from './pmReturn'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation.vue'
import crudOperation from '@crud/CRUD.operation.vue'
import udOperation from '@crud/UD.operation.vue'
import pagination from '@crud/Pagination.vue'
const createDefaultForm = () => ({
id: '',
orderCode: '',
serialNo: '',
skuCode: '',
skuName: '',
qty: undefined,
assignQty: 0,
unit: '',
targetArea: '',
containerCode: '',
deliveryMethod: 1,
creator: '',
createTime: '',
sourceHouseCode: '',
status: 0,
updateTime: '',
updateName: ''
})
export default {
name: 'PmReturn',
components: { crudOperation, rrOperation, udOperation, pagination },
mixins: [presenter(), header(), form(createDefaultForm()), crud()],
cruds() {
return CRUD({
title: '生产退料单',
url: 'api/pmReturn',
idField: 'id',
sort: 'create_time,desc',
crudMethod: { ...crudPmReturn },
optShow: { add: true, reset: true }
})
},
data() {
return {
viewShow: false,
currentRow: {},
actionDisabled: true,
permission: {
add: ['admin', 'pmReturn:add'],
edit: ['admin', 'pmReturn:edit'],
del: ['admin', 'pmReturn:del']
},
statusOptions: [
{ value: 0, label: '生成' },
{ value: 1, label: '失效' },
{ value: 20, label: '执行' },
{ value: 80, label: '完成' }
],
deliveryMethodOptions: [
{ value: 1, label: '人工' },
{ value: 2, label: 'AGV' }
],
rules: {
id: [{ required: true, message: '请输入唯一ID', trigger: 'blur' }],
orderCode: [{ required: true, message: '请输入退料单号', trigger: 'blur' }],
serialNo: [{ required: true, message: '请输入序号', trigger: 'blur' }],
skuCode: [{ required: true, message: '请输入物料编码', trigger: 'blur' }],
skuName: [{ required: true, message: '请输入物料名称', trigger: 'blur' }],
qty: [{ required: true, message: '请输入数量', trigger: 'change' }],
unit: [{ required: true, message: '请输入单位', trigger: 'blur' }],
targetArea: [{ required: true, message: '请输入线边库位', trigger: 'blur' }],
containerCode: [{ required: true, message: '请输入容器编号', trigger: 'blur' }],
deliveryMethod: [{ required: true, message: '请选择配送方式', trigger: 'change' }],
creator: [{ required: true, message: '请输入操作人工号', trigger: 'blur' }],
createTime: [{ required: true, message: '请选择操作时间', trigger: 'change' }],
sourceHouseCode: [{ required: true, message: '请输入来源仓别', trigger: 'blur' }],
status: [{ required: true, message: '请选择状态', trigger: 'change' }]
}
}
},
methods: {
[CRUD.HOOK.beforeRefresh]() {
if (this.query.dateRange) {
this.query.startTime = this.query.dateRange[0]
this.query.endTime = this.query.dateRange.length > 1 ? this.query.dateRange[1] : this.query.dateRange[0]
} else {
this.query.startTime = ''
this.query.endTime = ''
}
},
canUd(row) {
return Number(row.status) !== 0
},
statusLabel(status) {
const target = this.statusOptions.find(item => Number(item.value) === Number(status))
return target ? target.label : status
},
statusFormat(row) {
return this.statusLabel(row.status)
},
deliveryMethodLabel(deliveryMethod) {
const target = this.deliveryMethodOptions.find(item => Number(item.value) === Number(deliveryMethod))
return target ? target.label : deliveryMethod
},
deliveryMethodFormat(row) {
return this.deliveryMethodLabel(row.deliveryMethod)
},
handleSelectionChange(selection) {
this.crud.selectionChangeHandler(selection)
this.actionDisabled = !selection || selection.length === 0
},
handleCurrentChange(currentRow) {
this.currentRow = currentRow || {}
this.actionDisabled = this.crud.selections.length === 0
},
toView(row) {
this.currentRow = { ...row }
this.viewShow = true
},
printBill() {
const selections = this.crud.selections
if (!selections || selections.length === 0) {
this.crud.notify('请至少选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
return
}
const billIds = selections.map(item => item.orderCode || item.id).join('、')
this.$confirm('确认打印以下生产退料单？\n' + billIds, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.crud.notify('当前项目暂未接入打印接口', CRUD.NOTIFICATION_TYPE.INFO)
}).catch(() => {})
}
}
}
</script>
<style scoped>
</style>

34
nladmin-ui/src/views/wms/pm_manage/pmReturn/pmReturn.js Normal file
View File

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

2
nladmin-ui/src/views/wms/sch/point/schBasePoint.js
View File

@@ -49,7 +49,7 @@ export function changeLock(data) {
}
export function getRegionPoints(param) {
return request({
url: 'api/schBasePoint/getRegionPoints',
url: 'api/schBasePoint/getRegionPointSet',
method: 'get',
params: param
})

10
nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -367,8 +367,8 @@ export default {
},
outBoundChange(val) {
if (val.length === 1) {
this.form2.region_code = val[0]
this.form2.point_code = ''
this.form2.region_code = ''
this.form2.point_code = val[0]
}
if (val.length === 0) {
this.form2.region_code = ''
@@ -396,6 +396,11 @@ export default {
this.currentRow = current
this.form2.unassign_qty = current.unassign_qty
this.form2.assign_qty = current.assign_qty
if (current.source_load_port !== null) {
this.outBoundRegion = [
{ label: current.source_load_port, value: current.source_load_port }
];
}
this.tabledis = []
if (current.bill_status === '10') {
this.button1 = false
@@ -499,6 +504,7 @@ export default {
queryTableDdis(iostorinvdtl_id) {
checkoutbill.getOutBillDis({ 'iostorinvdtl_id': iostorinvdtl_id, 'bill_status': '01' }).then(res => {
this.tabledis = res
this.outBoundRegion
}).catch(() => {
this.tabledis = []
})