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

opt:移库单功能wql改成myb-plus

Browse Source
This commit is contained in:
zds
2024-10-17 18:01:00 +08:00
parent 22dedcf4ae
commit 49300aa60d
23 changed files with 913 additions and 1163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue
View File

@@ -333,8 +333,7 @@
<script>
import CRUD, { crud, form } from '@crud/crud'
import AddDtl from '@/views/wms/st/inStor/change/AddDtl'
import handmovestor from '@/views/wms/st/inStor/change/change'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import change from '@/views/wms/st/inStor/change/change'
import StructDiv from '@/views/wms/pub/StructDialog'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
@@ -409,7 +408,7 @@ export default {
this.$emit('AddChanged')
},
[CRUD.HOOK.afterToEdit]() {
handmovestor.getOutBillDtl({ 'changeinv_id': this.form.changeinv_id }).then(res => {
change.getOutBillDtl({ 'changeinv_id': this.form.changeinv_id }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
@@ -421,7 +420,7 @@ export default {
},
[CRUD.HOOK.afterToView]() {
debugger
handmovestor.getOutBillDtl({ 'changeinv_id': this.form.changeinv_id }).then(res => {
change.getOutBillDtl({ 'changeinv_id': this.form.changeinv_id }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {

50
lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDialog.vue
View File

@@ -174,40 +174,18 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column key="1" type="index" label="序号" width="50" align="center" />
<el-table-column
v-if="crud.status.add!==1"
key="2"
prop="work_status"
label="状态"
align="center"
:formatter="bill_statusFormat"
/>
<el-table-column key="3" show-overflow-tooltip prop="material_code" label="物料编码" width="120" align="center" />
<el-table-column key="4" prop="material_name" label="物料名称" align="center" min-width="120" show-overflow-tooltip />
<el-table-column key="5" prop="pcsn" label="批次号" align="center" min-width="100" show-overflow-tooltip />
<el-table-column key="6" prop="qty_unit_name" label="单位" align="center" />
<el-table-column
key="7"
prop="quality_scode"
label="品质类型"
align="center"
width="110px"
:formatter="quality_scodeFormat"
/>
<el-table-column
key="10"
show-overflow-tooltip
prop="qty"
label="重量"
:formatter="crud.formatNum3"
width="120"
align="center"
/>
<el-table-column key="11" show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column key="12" show-overflow-tooltip prop="turnout_sect_name" label="移出库区" />
<el-table-column key="13" show-overflow-tooltip prop="turnout_struct_code" label="移出货位" />
<el-table-column key="14" show-overflow-tooltip prop="turnin_sect_name" label="移入库区" />
<el-table-column key="15" show-overflow-tooltip prop="turnin_struct_code" label="移入货位" width="190" align="center">
<el-table-column v-if="crud.status.add!==1" key="2" prop="work_status" label="状态" align="center" :formatter="bill_statusFormat"/>
<el-table-column key="3" show-overflow-tooltip prop="material_code" label="物料编码" min-width="120" align="center" />
<el-table-column key="4" show-overflow-tooltip prop="material_name" label="物料名称" align="center" min-width="120" />
<el-table-column key="5" show-overflow-tooltip prop="pcsn" label="批次号" align="center" min-width="140" />
<el-table-column key="6" show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" min-width="50" />
<el-table-column key="7" show-overflow-tooltip prop="quality_scode" label="品质类型" align="center" min-width="80" :formatter="quality_scodeFormat"/>
<el-table-column key="10" show-overflow-tooltip prop="qty" label="重量" :formatter="crud.formatNum3" min-width="80" align="center"/>
<el-table-column key="11" show-overflow-tooltip prop="storagevehicle_code" label="载具号" min-width="110" />
<el-table-column key="12" show-overflow-tooltip prop="turnout_sect_name" label="移出库区" min-width="80" />
<el-table-column key="13" show-overflow-tooltip prop="turnout_struct_code" label="移出货位" min-width="90" />
<el-table-column key="14" show-overflow-tooltip prop="turnin_sect_name" label="移入库区" min-width="80" />
<el-table-column key="15" show-overflow-tooltip prop="turnin_struct_code" label="移入货位" width="170" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.turnin_struct_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryStruct(scope.$index, scope.row)" />
@@ -254,7 +232,6 @@
import CRUD, { crud, form } from '@crud/crud'
import AddDtl from '@/views/wms/st/inStor/moveStor/AddDtl'
import handmovestor from '@/views/wms/st/inStor/moveStor/handmovestor'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import StructDiv from '@/views/wms/pub/StructDialog'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
@@ -270,7 +247,7 @@ const defaultForm = {
bill_type: '29',
remark: '',
biz_date: new Date(),
create_mode: '',
create_mode: '01',
tableData: []
}
export default {
@@ -457,7 +434,6 @@ export default {
this.form.detail_count = this.form.tableData.length
},
structChanged(row) {
debugger
let structflag = false
for (let i = 0; i < this.form.tableData.length; i++) {
if ((this.form.tableData[i].turnin_struct_id === row.struct_id) || (this.form.tableData[i].turnout_struct_id === row.struct_id)) {

5
lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDtl.vue
View File

@@ -90,9 +90,9 @@
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="pcsn" label="子卷号" :min-width="flexWidth('pcsn',crud.data,'子卷号')" />
<el-table-column prop="quality_scode" label="品质类型" align="center" width="110px" :formatter="quality_scodeFormat" />
<el-table-column prop="quality_scode" label="品质类型" :min-width="flexWidth('quality_scode',crud.data,'品质类型')" :formatter="quality_scodeFormat" />
<el-table-column show-overflow-tooltip prop="qty" label="重量" :formatter="crud.formatNum3" width="110px" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" :min-width="flexWidth('qty_unit_name',crud.data,'重量单位')" />
</el-table>
<!--分页组件-->
<pagination />
@@ -108,7 +108,6 @@
import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
import handmovestor from '@/views/wms/st/inStor/moveStor/handmovestor'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'

8
lms/nladmin-ui/src/views/wms/st/inStor/moveStor/handmovestor.js
View File

@@ -31,12 +31,6 @@ export function getOutBillDtl(params) {
params
})
}
export function getInvTypes() {
return request({
url: '/api/handmovestor/getInvTypes',
method: 'get'
})
}
export function insertDtl(data) {
return request({
url: '/api/handmovestor/insertDtl',
@@ -80,4 +74,4 @@ export function checkReturn() {
method: 'post'
})
}
export default { add, edit, del, getOutBillDtl,getStructIvt,confirm,getInvTypes,handdown, getBoxIvt, checkReturn }
export default { add, edit, del, getOutBillDtl, getStructIvt, confirm, handdown, getBoxIvt, checkReturn }

15
lms/nladmin-ui/src/views/wms/st/inStor/moveStor/index.vue
View File

@@ -210,7 +210,6 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/st/inStor/moveStor/AddDialog'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
export default {
@@ -262,7 +261,6 @@ export default {
return row.bill_status !== '10'
},
[CRUD.HOOK.beforeRefresh]() {
this.crud.query.buss_type = ''
this.handleCurrentChange(null)
},
stateFormat(row) {
@@ -281,7 +279,7 @@ export default {
this.buttonChange(row)
} else if (val.length === 1) {
this.buttonChange(row)
}else{
} else {
this.handleCurrentChange(null)
}
},
@@ -316,8 +314,6 @@ export default {
},
taskOpen() {
this.loadingConfirm = true
debugger
const a = this.currentRow
handmovestor.handdown({ 'moveinv_id': this.currentRow.moveinv_id, 'bill_type': this.currentRow.bill_type }).then(res => {
this.querytable()
this.loadingConfirm = false
@@ -325,15 +321,6 @@ export default {
this.loadingConfirm = false
})
},
taskOpen2() {
this.loadingConfirm = true
handmovestor.handdown({ 'moveinv_id': this.currentRow.moveinv_id }).then(res => {
this.querytable()
this.loadingConfirm = false
}).catch(() => {
this.loadingConfirm = false
})
},
confirm() {
handmovestor.confirm({ 'moveinv_id': this.currentRow.moveinv_id }).then(res => {
this.querytable()

1
lms/nladmin-ui/src/views/wms/st/inStor/reCutPlan/AddDtl.vue
View File

@@ -120,7 +120,6 @@ import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
import handmovestor from '@/views/wms/st/inStor/moveStor/handmovestor'
export default {
name: 'AddDtl',

113
lms/nladmin-ui/src/views/wms/st/inbill/BucketDtlDialog.vue
View File

@@ -1,113 +0,0 @@
<template>
<el-dialog
title="载具明细"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="1000px"
@close="close"
>
<!--表格渲染-->
<el-table
ref="table2"
:data="this.bucketParam"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@select="handleSelectionChange"
@select-all="onSelectAll"
>
<el-table-column prop="bucketunique" label="桶号" min-width="100" show-overflow-tooltip />
<el-table-column prop="label" label="桶类别" />
<el-table-column prop="material_code" label="物料编码" width="120px" />
<el-table-column prop="material_name" label="物料名称" min-width="120" />
<el-table-column prop="pcsn" label="批次" min-width="100" show-overflow-tooltip />
<el-table-column prop="storage_qty" label="数量">
<template slot-scope="scope">
{{ fun(scope.row.storage_qty) }}
</template>
</el-table-column>
<el-table-column prop="qty_unit_name" label="单位" />
<el-table-column prop="quality_scode" :formatter="qualityFormat" label="品质类型" />
<el-table-column prop="ivt_level" :formatter="ivtFormat" label="库存等级" />
<el-table-column prop="is_active" :formatter="activeFormat" label="是否可用" />
<el-table-column prop="storagevehicle_code" label="载具号" />
<el-table-column prop="record_order" label="顺序号" />
<el-table-column prop="bag_qty" label="袋数" />
</el-table>
<!--分页组件-->
<pagination />
</el-dialog>
</template>
<script>
import CRUD, { crud } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
export default {
name: 'BucketDtlDiv',
components: { crudOperation, pagination },
mixins: [crud()],
props: {
dialogShow: {
type: Boolean,
default: false
},
bucketParam: {
type: Array,
default: () => { return [] }
}
},
dicts: ['MD_BUCKET_TYPE', 'bucket_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'IS_OR_NOT'],
data() {
return {
sects: [],
classes: [],
dialogVisible: false,
checkrow: {},
rows: []
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
fun(val) {
return Number(val).toFixed(3)
},
[CRUD.HOOK.beforeRefresh]() {
return true
},
handleSelectionChange(val, row) {
if (val.length > 1) {
this.$refs.table.clearSelection()
this.$refs.table.toggleRowSelection(val.pop())
} else {
this.checkrow = row
}
},
onSelectAll() {
this.$refs.table.clearSelection()
},
close() {
this.$emit('update:dialogShow', false)
},
qualityFormat(row, column) {
return this.dict.label.ST_QUALITY_SCODE[row.quality_scode]
},
ivtFormat(row, column) {
return this.dict.label.ST_IVT_LEVEL[row.ivt_level]
},
activeFormat(row, column) {
return this.dict.label.IS_OR_NOT[row.is_active]
}
}
}
</script>

12
lms/nladmin-ui/src/views/wms/st/inbill/index.vue
View File

@@ -144,17 +144,6 @@
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<!-- <el-button
slot="right"
class="filter-item"
type="warning"
icon="el-icon-check"
size="mini"
:disabled="audit_flag"
@click="audit"
>
审核
</el-button>-->
<el-button
slot="right"
class="filter-item"
@@ -297,7 +286,6 @@ export default {
del: ['admin', 'inbill:del']
},
stor_id: null,
audit_flag: true,
dis_flag: true,
task_flag: true,
disShow: false,