kelvin/wms-dj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
刘名喜 2024-12-05 09:30:04 +08:00
commit 88178cc72e
5 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/md/TASK.js
View File

@ -77,3 +77,11 @@ export function issueOutTaskWcsDJ(data) {
data
})
}
// 查询出库任务详细
export function xmlParam() {
return request({
url: '/md/TASK/xmlParam',
method: 'get'
})
}

11
src/views/md/TASK/index.vue
View File

@ -86,6 +86,7 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<!-- <el-button icon="el-icon-refresh" size="mini" @click="xmlParam">读取XML</el-button>-->
</el-form-item>
</el-form>
@ -311,7 +312,8 @@ import {
issueWmsOutTaskToWcs,
listTASK,
runTASK,
updateTASK
updateTASK,
xmlParam
} from "@/api/md/TASK";
export default {
@ -433,6 +435,9 @@ export default {
this.getList();
},
/** 重置按钮操作 */
xmlParam(){
xmlParam()
},
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
@ -517,9 +522,9 @@ export default {
res.data.outInfoList.forEach(outInfo => {
const param = {
// 计划ID
planId: outInfo.planInId,
planId: res.data.wmsOutPlanId,
// 任务ID
taskId: outInfo.id,
taskId: res.data.wmsOutTaskId,
// 库位 信息
cellCode: outInfo.wmStorageAreaCode,
cellX: outInfo.cellX,

10
src/views/mes/wm/inPlan/index.vue
View File

@ -70,7 +70,7 @@
<el-table-column label="计划编码" align="center" prop="planCode"/>
<el-table-column label="入库类型" align="center" prop="planTypeId">
<template slot-scope="scope">
{{ filterInPlanType(scope.row.planTypeId) }}
{{ filterInPlanType(scope.row.planTypeCode) }}
</template>
</el-table-column>
<el-table-column label="计划类型" align="center" prop="sourceType">
@ -408,15 +408,15 @@ export default {
},
/**
* 过滤出入库类型
* @param id 出入库类型ID
* @param code 出入库类型 编码
* @returns {*}
*/
filterInPlanType(id) {
const filter = this.inPlanTypeList.filter(item => item.typeId === id);
filterInPlanType(code) {
const filter = this.inPlanTypeList.filter(item => item.code === code);
if (filter.length) {
return filter[0].name
}
return id
return code
},
/** 入库类型选择器回调 */
handlePlanTypeSelectChange(typeId) {

12
src/views/mes/wm/wmsInTask/index.vue
View File

@ -32,7 +32,7 @@
<el-table-column label="目标库位" align="center" prop="cellName"/>
<el-table-column label="出入库类型" align="center" prop="planTypeId">
<template slot-scope="scope">
{{ filterInPlanType(scope.row.planTypeId) }}
{{ filterInPlanType(scope.row.planTypeCode) }}
</template>
</el-table-column>
<el-table-column label="物料" align="center" prop="materialName"/>
@ -224,15 +224,15 @@ export default {
},
/**
* 过滤出入库类型
* @param id 出入库类型ID
* @param code 出入库类型 编码
* @returns {*}
*/
filterInPlanType(id) {
const filter = this.inPlanTypeList.filter(item => item.typeId === id);
filterInPlanType(code) {
const filter = this.inPlanTypeList.filter(item => item.code === code);
if (filter.length) {
return filter[0].name
}
return id
return code
},
/**
* 下发任务至 WCS
@ -280,6 +280,8 @@ export default {
issueInTaskWcsDJ(param).then(res => {
this.$modal.msgSuccess("下发成功");
})
} else {
console.error("入库类型不匹配: " + task.planTypeCode)
}
},
/**

4
src/views/mes/wm/zdTask/index.vue
View File

@ -391,7 +391,7 @@ export default {
} else {
return submitOutTask(this.form).then(() => {
this.getList();
this.$modal.msgSuccess("基础物料已出库！");
this.$modal.msgSuccess("基础物料出库中");
this.reset();
}).catch(() => {});
}
@ -442,7 +442,7 @@ export default {
return submitOutTask(row)
}).then(() => {
this.getList();
this.$modal.msgSuccess("基础物料已出库！");
this.$modal.msgSuccess("基础物料出库中");
}).catch(() => {});
}
},