root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add：成品移库功能

Browse Source
This commit is contained in:
zhangzhiqiang
2023-09-12 15:22:09 +08:00
parent 9ec53a5ba0
commit 17c1c99928
24 changed files with 530 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
mes/qd/src/views/wms/storage_manage/product/moveInv/AddDialog.vue
View File

@@ -121,16 +121,16 @@
>
添加移库物料
</el-button>
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="queryDtl()"
>
自动分配
</el-button>
<!-- <el-button-->
<!-- slot="left"-->
<!-- class="filter-item"-->
<!-- type="primary"-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="queryDtl()"-->
<!-- >-->
<!-- 自动分配-->
<!-- </el-button>-->
</span>
</div>
@@ -150,7 +150,7 @@
<el-table-column prop="turnout_struct_code" label="移出货位" align="center" />
<el-table-column prop="turnin_struct_code" label="移入货位" align="center" >
<template slot-scope="scope">
<el-input v-show="isedit" v-model="scope.row.turnin_struct_code" clearable style="width: 150px" @clear="scope.row.turnin_struct_code='',scope.row.turnin_struct_name=''">
<el-input v-show="isedit" v-model="scope.row.turnin_struct_code" clearable style="width: 170px" @clear="structClear(scope.row)">
<el-button slot="append" icon="el-icon-plus" @click="queryStruct(scope.$index,scope.row)" ></el-button>
</el-input>
<span v-show="!isedit">{{ scope.row.turnin_struct_code }}</span>
@@ -164,7 +164,7 @@
class="filter-item"
size="mini"
icon="el-icon-delete"
@click.native.prevent="deleteRow(scope.$index, form.tableData)"
@click.native.prevent="deleteRow(scope.row, form.tableData)"
/>
</template>
</el-table-column>
@@ -176,7 +176,7 @@
<script>
import CRUD, { crud, form } from '@crud/crud'
import AddDtl from '@/views/wms/storage_manage/product/productCheck/StructIvt'
import AddDtl from '@/views/wms/storage_manage/product/moveInv/StructIvt'
import AddStruct from '@/views/wms/storage_manage/product/moveInv/AddStruct'
import moveInv from '@/views/wms/storage_manage/product/moveInv/moveInv'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
@@ -282,12 +282,25 @@ export default {
this.nowrow = row
this.structShow = true
},
structClear(row){
this.form.tableData.forEach((a,index)=>{
if (a.struct_code === row.struct_code){
this.$set(a,'turnin_struct_code',"")
this.$set(a,'turnin_struct_name',"")
this.$set(a,'turnin_struct_id',"")
this.form.tableData.splice(index, 1, a)
}
})
},
structChanged(rows){
console.log(rows[0].struct_code)
this.$set(this.nowrow,'turnin_struct_code',rows[0].struct_code)
this.$set(this.nowrow,'turnin_struct_name',rows[0].struct_name)
this.$set(this.nowrow,'turnin_struct_id',rows[0].struct_id)
this.form.tableData.splice(this.nowindex, 1, this.nowrow)
this.form.tableData.forEach((a,index)=>{
if (a.struct_code === this.nowrow.struct_code){
this.$set(a,'turnin_struct_code',rows[0].struct_code)
this.$set(a,'turnin_struct_name',rows[0].struct_name)
this.$set(a,'turnin_struct_id',rows[0].struct_id)
this.form.tableData.splice(index, 1, a)
}
})
},
tableChanged(rows) {
const tablemap = new Map()
@@ -314,8 +327,12 @@ export default {
}
this.form.dtl_num = this.form.tableData.length
},
deleteRow(index, rows) {
rows.splice(index, 1)
deleteRow(row, rows) {
var indexSet = []
let filter = rows.filter(a=>{
return a.turnout_struct_code !== row.turnout_struct_code
});
this.form.tableData = filter
this.nowindex = ''
this.nowrow = {}
this.form.dtl_num = this.form.tableData.length

173
mes/qd/src/views/wms/storage_manage/product/moveInv/AddDtl.vue
View File

@@ -1,173 +0,0 @@
<!--suppress ALL -->
<template>
<el-dialog
title="库存选择"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
:show-close="false"
width="1000px"
@close="close"
@open="open"
>
<el-row>
<el-col :span="6">
<!-- 搜索 -->
<el-cascader
placeholder="库区"
:options="sects"
:props="{ checkStrictly: true }"
clearable
@change="sectQueryChange"
/>
</el-col>
<el-col :span="6">
<el-input
v-model="query.struct_code"
clearable
size="mini"
placeholder="货位号模糊查询"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-col>
<el-col :span="6">
<el-input
v-model="query.remark"
clearable
size="mini"
placeholder="物料"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-col>
<el-col :span="6">
<rrOperation />
</el-col>
</el-row>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="sect_name" label="库区" width="110px" />
<el-table-column show-overflow-tooltip prop="struct_code" label="货位" width="110px" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="150px" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" width="110px" />
<el-table-column show-overflow-tooltip prop="base_qty" label="桶数" :formatter="crud.formatNum0" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="计量单位" />
<el-table-column show-overflow-tooltip prop="storage_qty" :formatter="crud.formatNum3" label="重量" width="110px" />
</el-table>
<!--分页组件-->
<pagination />
<span slot="footer" class="dialog-footer">
<el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
<el-button slot="left" type="primary" @click="submit">保存</el-button>
</span>
</el-dialog>
</template>
<script>
import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import crudSectattr from '@/api/wms/basedata/st/sectattr'
export default {
name: 'AddDtl',
components: { rrOperation, pagination },
cruds() {
return CRUD({ title: '用户', idField: 'stockrecord_id', url: 'api/check/getStructIvt',
query: {
struct_code: '',
remark: '',
sect_id: '',
stor_id: ''
},
optShow: {
add: false,
edit: false,
del: false,
reset: true,
download: false
}})
},
mixins: [presenter(), header()],
props: {
dialogShow: {
type: Boolean,
default: false
},
openParam: {
type: String
}
},
data() {
return {
dialogVisible: false,
opendtlParam: '',
sects: [],
rows: []
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
},
openParam: {
handler(newValue, oldValue) {
this.opendtlParam = newValue
}
}
},
methods: {
open() {
crudSectattr.getSect({ is_materialstore: '1' }).then(res => {
this.sects = res.content
})
this.crud.toQuery()
},
close() {
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
},
sectQueryChange(val) {
if (val.length === 1) {
this.crud.query.stor_id = val[0]
this.crud.query.sect_id = ''
}
if (val.length === 0) {
this.crud.query.sect_id = ''
this.crud.query.stor_id = ''
}
if (val.length === 2) {
this.crud.query.stor_id = val[0]
this.crud.query.sect_id = val[1]
}
},
submit() {
this.rows = this.$refs.table.selection
if (this.rows.length <= 0) {
this.$message('请先勾选载具物料')
return
}
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.rows)
}
}
}
</script>

5
mes/qd/src/views/wms/storage_manage/product/moveInv/AddStruct.vue
View File

@@ -91,7 +91,10 @@ export default {
struct_code: '',
remark: '',
sect_id: '1528631043496742912',
stor_id: '1528627995269533696'
stor_id: '1528627995269533696',
is_used: true,
lock_type: '0',
emptyvehicle: true
},
optShow: {
add: false,

55
mes/qd/src/views/wms/storage_manage/product/moveInv/MoveTaskDialog.vue
View File

@@ -70,6 +70,7 @@
@row-click="clcikRow"
>
<el-table-column prop="seq_no" label="序号" width="50" align="center" />
<el-table-column :formatter="stateFormat" prop="bill_status" label="移库明细状态" width="50" align="center" />
<el-table-column prop="turnout_sect_name" label="移库库区" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="120" align="center" />
<el-table-column prop="qty" label="数量" align="center" :formatter="crud.formatNum0" />
@@ -78,7 +79,7 @@
<el-table-column prop="turnout_struct_code" label="移出货位" align="center" />
<el-table-column prop="turnin_struct_code" label="移入货位" align="center" />
<el-table-column prop="task_code" label="任务编号" align="center" />
<el-table-column prop="task_status" label="任务状态" align="center" />
<el-table-column :formatter="formatStatus" prop="task_status" label="任务状态" align="center" />
</el-table>
</el-card>
</el-dialog>
@@ -87,12 +88,14 @@
<script>
import CRUD, { crud } from '@crud/crud'
import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
import moveInv from '@/views/wms/storage_manage/product/moveInv/moveInv'
export default {
name: 'MoveTaskDialog',
components: {},
mixins: [crud()],
dicts: ['SCH_TASK_TYPE_DTL', 'task_status', 'PCS_SAL_TYPE'],
dicts: ['task_status', 'MOVE_BILL_STATUS'],
props: {
dialogShow: {
type: Boolean,
@@ -141,38 +144,27 @@ export default {
clcikRow(row) {
this.form.dtl_row = row
},
refreshMethod(){
moveInv.getMoveDtl({ 'moveinv_id': this.form.dtl_row.moveinv_id }).then(res => {
this.openParam = res.content
})
},
delTask() {
this.fullscreenLoading = true
crudProductIn.delTask({ 'iostorinvdis_id': this.dis_row.iostorinvdis_id }).then(res => {
this.crud.notify('删除成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.fullscreenLoading = false
this.queryTableDdis()
this.initFlag()
}).catch(() => {
this.fullscreenLoading = false
moveInv.moveTAskOption(this.form.dtl_row,"cancel").then(res => {
this.refreshMethod()
this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
sendTask() {
console.log(this.form.dtl_row)
// this.fullscreenLoading = true
// crudProductIn.sendTask({ 'task_id': this.dis_row.task_id }).then(res => {
// this.crud.notify('下发成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
// this.fullscreenLoading = false
// this.queryTableDdis()
// this.initFlag()
// }).catch(() => {
// this.fullscreenLoading = false
// })
moveInv.moveTAskOption(this.form.dtl_row,"immediateNotifyAcs").then(res => {
this.refreshMethod()
this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
confirmTask() {
this.fullscreenLoading = true
crudProductIn.confirmTask({ 'task_id': this.dis_row.task_id }).then(res => {
moveInv.moveTAskOption(this.form.dtl_row,"forceFinish").then(res => {
this.refreshMethod()
this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.fullscreenLoading = false
this.queryTableDdis()
this.initFlag()
}).catch(() => {
this.fullscreenLoading = false
})
},
tableRowClassName({ row, rowIndex }) {
@@ -187,20 +179,17 @@ export default {
})
}
},
stateFormat(row) {
return this.dict.label.MOVE_BILL_STATUS[row.bill_status]
},
formatStatus(row) {
return this.dict.label.task_status[row.task_status]
},
formatType(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.task_type]
},
initFlag() {
this.dis_del = true
this.dis_send = true
this.dis_confirm = true
},
formatBaseType(row) {
return this.dict.label.PCS_SAL_TYPE[row.base_bill_type]
}
}
}
</script>

177
mes/qd/src/views/wms/storage_manage/product/moveInv/StructIvt.vue Normal file
View File

@@ -0,0 +1,177 @@
<!--suppress ALL -->
<template>
<el-dialog
title="库存选择"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="1200px"
@close="close"
@open="open"
>
<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="日期">
<date-range-picker v-model="query.createTime" class="date-item" value-format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="库区/货位">
<el-input
v-model="query.struct_code"
clearable
size="mini"
placeholder="库区/货位"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料">
<el-input
v-model="query.material_search"
clearable
size="mini"
placeholder="物料"
style="width: 230px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation/>
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column show-overflow-tooltip width="150" prop="sect_code" label="库区"/>
<el-table-column show-overflow-tooltip width="150" prop="struct_name" label="货位"/>
<el-table-column show-overflow-tooltip prop="material_code" width="250" label="物料编号"/>
<el-table-column show-overflow-tooltip width="100" prop="material_name" label="物料名称"/>
<el-table-column show-overflow-tooltip width="150" prop="class_name" label="物料类别"/>
<el-table-column show-overflow-tooltip width="150" prop="canuse_qty" label="重量"/>
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位"/>
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号"/>
</el-table>
<!--分页组件-->
<pagination/>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
</span>
</el-dialog>
</template>
<script>
import CRUD, {crud, header, presenter} from '@crud/crud'
import qs from 'qs'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import moveInv from '@/views/wms/storage_manage/product/moveInv/moveInv'
import {getProductIvt} from "./moveInv";
import {setUserInfo} from "../../../../../store/modules/user";
const start = new Date()
export default {
name: 'AddDtl',
components: {crudOperation, rrOperation, pagination, DateRangePicker},
cruds() {
return CRUD({
title: '成品可用库存',
url: '/api/stIvtStructivtYl/getProductIvt',
crudMethod: {},
optShow: {
reset: true
}
})
},
mixins: [presenter(), header(), crud()],
props: {
dialogShow: {
type: Boolean,
default: false
}
},
data() {
return {
dialogVisible: false,
rows: [],
tableData: []
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
objectSpanMethod({row, column, rowIndex, columnIndex}) {
if (columnIndex === 0) {
if (rowIndex % 2 === 0) {
return {
rowspan: 2,
colspan: 1
}
} else {
return {
rowspan: 0,
colspan: 0
}
}
}
},
open() {
this.crud.toQuery()
},
close() {
this.$emit('update:dialogShow', false)
this.query.struct_search = []
this.query.size = 10
},
submit() {
//struct_code
this.$emit('update:dialogShow', false)
var structs = ''
this.$refs.multipleTable.selection.forEach(a =>{
structs=a.struct_code+","+structs
})
moveInv.getProductIvt({'struct_search':structs,'size':999,'page':0}).then(res => {
this.rows = res.content
var i =1;
this.rows.forEach(a => {
a.seq_no=i
a.turnout_sect_name = a.sect_name
a.turnout_struct_code = a.struct_code
a.qty = a.canuse_qty
i++
})
this.$emit('tableChanged', this.rows)
})
}
}
}
</script>

21
mes/qd/src/views/wms/storage_manage/product/moveInv/index.vue
View File

@@ -126,9 +126,9 @@
:disabled="confirm_flag"
icon="el-icon-check"
size="mini"
@click="confirm"
@click="cancel"
>
强制完成
取消单据
</el-button>
<!--<el-button
slot="right"
@@ -207,6 +207,7 @@ import MoveTaskDialog from '@/views/wms/storage_manage/product/moveInv/MoveTaskD
import crudStorattr from "@/views/wms/storage_manage/basedata/basedata";
import {download} from '@/api/data'
import {downloadFile} from '@/utils'
import {cancel} from "./moveInv";
export default {
name: 'moveInv',
@@ -286,12 +287,7 @@ export default {
if (current !== null) {
this.currentRow = current
this.downdtl_flag = false
if (current.status === '10' || current.status === '30') {
this.check_flag = false
} else {
this.check_flag = true
}
if (current.status === '30' && current.is_nok) {
if (current.bill_status === '10' ) {
this.confirm_flag = false
} else {
this.confirm_flag = true
@@ -331,10 +327,11 @@ export default {
})
this.taskShow = true
},
confirm() {
if (this.currentRow !== null) {
this.$refs.child2.setForm(this.currentRow)
}
cancel() {
check.cancel(this.currentRow).then(res => {
this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
this.crud.toQuery()
},
downdtl() {
if (this.currentRow !== null) {

28
mes/qd/src/views/wms/storage_manage/product/moveInv/moveInv.js
View File

@@ -39,11 +39,37 @@ export function getStructIvt(params) {
})
}
export function getProductIvt(params) {
return request({
url: '/api/stIvtStructivtYl/getProductIvt',
method: 'get',
params
})
}
export function moveTAskOption(params,option) {
return request({
url: '/api/stIvtMoveinvdtlCp/task/'+option,
method: 'post',
data:params
})
}
export function cancel(params) {
return request({
url: '/api/stIvtMoveinvCp/cancel',
method: 'post',
data:params
})
}
export default {
add,
edit,
del,
getMoveDtl,
getStructIvt
cancel,
getStructIvt,
moveTAskOption,
getProductIvt
}