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

rev：出库修改

Browse Source
This commit is contained in:
zhangzhiqiang
2023-07-27 11:22:23 +08:00
parent e60c8a8c0f
commit 4edcab8b9e
24 changed files with 359 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mes/qd/src/api/wms/basedata/st/structattr.js
View File

@@ -38,6 +38,13 @@ export function changeEmp(data) {
data
})
}
export function setMaterial(data) {
return request({
url: 'api/structattr/setMaterial',
method: 'post',
data
})
}
export function getSectCascader(data) {
return request({
@@ -47,4 +54,4 @@ export function getSectCascader(data) {
})
}
export default { add, edit, del, changeActive, getSectCascader, changeEmp }
export default { add, edit, del, changeActive, getSectCascader, changeEmp, setMaterial }

107
mes/qd/src/views/wms/masterdata_manage/st/struct/index.vue
View File

@@ -51,6 +51,61 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<el-dialog
title="仓位物料设置"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="1000px"
close="closeView"
>
<el-form ref="form" :model="materialForm" :rules="rules" size="mini" label-suffix=":" label-width="90px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="是否空载具" prop="is_emptyvehicle">
<el-radio
v-for="item in trueorfalse"
:key="item.value"
v-model="materialForm.is_emptyvehicle"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="载具号">
<label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
<el-input v-model="materialForm.storagevehicle_code" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item v-if="materialForm.is_emptyvehicle==false" label="物料编码">
<el-input v-model="materialForm.material_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料编码" prop="material_code">
<template slot-scope="scope">
<el-input v-model="materialForm.material_code" clearable style="width: 370px">
<el-button slot="append" icon="el-icon-plus" @click="queryMater(materialForm)" />
</el-input>
</template>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="materialForm.is_emptyvehicle==false" label="物料数量">
<el-input-number v-model="materialForm.qty" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="closeView">取消</el-button>
<el-button type="primary" @click="setStructMaterial(form)">确认</el-button>
</div>
</el-dialog>
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -253,18 +308,27 @@
v-permission="['admin','structattr:edit','structattr:del']"
label="操作"
fixed="right"
width="120px"
width="180px"
align="center"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
<span>
<udOperation
:data="scope.row"
:permission="permission"
/>
<el-button size="mini" type="text" icon="el-icon-edit" @click="toView(scope.row)">仓位设置</el-button>
</span>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<MaterDtl
:dialog-show.sync="materialShow"
:is-single="true"
:mater-opt-code="materType"
@setMaterValue="setMaterValue"
/>
<pagination />
</div>
</div>
@@ -278,6 +342,9 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudSectattr from '@/api/wms/basedata/st/sectattr'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import {setMaterial} from "../../../../../api/wms/basedata/st/structattr";
/* import checkoutbill from "@/api/wms/st/core/outbill/checkoutbill";*/
const defaultForm = {
@@ -290,6 +357,7 @@ const defaultForm = {
sect_code: null,
sect_name: null,
stor_id: null,
material_code: null,
stor_code: null,
stor_name: null,
stor_type: null,
@@ -328,7 +396,7 @@ const defaultForm = {
export default {
name: 'Structattr',
dicts: ['ST_HEIGHT_TYPE', 'd_lock_type', 'SCH_TASK_TYPE_DTL'],
components: { pagination, crudOperation, rrOperation, udOperation },
components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -354,7 +422,11 @@ export default {
}
}
return {
materialForm:{},
materialShow: false,
materType: '00',
sects: [],
dialogVisible: false,
trueorfalse: [ { value: true, label: '是' }, { value: false, label: '否' }],
invtypelist: [],
permission: {},
@@ -419,6 +491,21 @@ export default {
val[1] = form.sect_id
form.cascader = val
},
setStructMaterial(data){
console.log(data)
crudStructattr.setMaterial(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
setMaterValue(row) {
console.log(row)
this.materialForm.material_code = row.material_code
this.tableData.splice(this.nowindex, 1, this.nowrow)
},
queryMater(index, row) {
this.materialShow = true
},
sectChange(val) {
this.form.sect_id = val[1]
},
@@ -472,6 +559,14 @@ export default {
}).catch(() => {
})
},
toView(row){
this.materialForm = row
this.dialogVisible = true
},
closeView(){
this.materialForm={}
this.dialogVisible = false
},
changeEmp(data) {
let msg = '设置该仓位非空载具，是否继续！'
if (data.is_emptyvehicle === false) {

2
mes/qd/src/views/wms/pcs/deliveryorder/index.vue
View File

@@ -121,7 +121,7 @@
<el-input v-model="form.deliver_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="销售单单号" prop="deliver_code">
<el-input v-model="form.deliver_code" style="width: 200px;" />
<el-input v-model="form.sale_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="发货单明细" prop="seq_no">
<el-input v-model="form.seq_no" style="width: 200px;" />

6
mes/qd/src/views/wms/pcs/saleorder/index.vue
View File

@@ -181,6 +181,12 @@
min-width="100"
show-overflow-tooltip
/>
<el-table-column
prop="seq_no"
label="销售单行号"
min-width="100"
show-overflow-tooltip
/>
<!-- <el-table-column prop="seq_no" label="明细序号" /> -->
<el-table-column
prop="sale_type"

6
mes/qd/src/views/wms/scheduler_manage/task/index.vue
View File

@@ -152,10 +152,10 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="table_fk_id" label="业务编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="table_fk_id" label="关联业务" min-width="100" show-overflow-tooltip />
<el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_spec" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_id" label="物料id" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_spec" label="规格" min-width="150" show-overflow-tooltip />
<el-table-column prop="task_name" label="任务类型" :min-width="flexWidth('task_name',crud.data,'任务类型')" />
<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter="acsTypeName" />
<el-table-column v-if="false" prop="task_status" label="任务状态" />

3
mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
View File

@@ -152,7 +152,6 @@
<el-table-column show-overflow-tooltip prop="plan_qty" label="出库数量">
<template slot-scope="scope">
<el-input-number
v-show="!scope.row.edit"
v-model="form.tableData[scope.$index].plan_qty"
size="small"
:controls="false"
@@ -161,7 +160,7 @@
:min="0"
@change="changeQty"
/>
<span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
<!-- <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" />