diff --git a/src/api/production/production-return.js b/src/api/production/production-return.js new file mode 100644 index 0000000..c9e1051 --- /dev/null +++ b/src/api/production/production-return.js @@ -0,0 +1,16 @@ + +import { createAPI } from "@/utils/httpRequest.js"; + + +export const getWorkOrderMaterials = data => createAPI(`/pda/production/issue/getWorkOrderMaterials`,'post',data) + +export const parseMaterialLabel = data => createAPI(`/pda/production/issue/parseMaterialLabel`,'post',data) +export const directReturn = data => createAPI(`/pda/production/issue/directReturn`,'post',data) +export const getReturnRequestMaterials = data => createAPI(`/pda/production/issue/getReturnRequestMaterials`,'post',data) +export const getIssueRecords = data => createAPI(`/pda/production/issue/getIssueRecords`,'post',data) +export const requestReturn = data => createAPI(`/pda/production/issue/requestReturn`,'post',data) +export const validateLocation = data => createAPI(`/pda/production/issue/validateLocation`,'post',data) +export const createReturnLabel = data => createAPI(`/pda/production/issue/createReturnLabel`,'post',data) +export const printReturnLabel = data => createAPI(`/pda/production/issue/printReturnLabel`,'post',data) + + diff --git a/src/router/index.js b/src/router/index.js index 1b361a1..ec9e003 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -35,6 +35,8 @@ const globalRoutes = [ {path: "/handlingunit",name: "handlingunit", component: resolve => require(["@/views/modules/handling-unit/handling-unit-management.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 生产发料 {path: "/productionissue",name: "productionissue", component: resolve => require(["@/views/modules/production-issue/production-issue-pda.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, +//生产退料 + {path: "/productionreturn",name: "productionreturn", component: resolve => require(["@/views/modules/production-issue/productionReturnPDA.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: '/production-issue/pick/:orderNo', name: 'ProductionIssuePick',component: resolve => require(["@/views/modules/production-issue/pick.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, diff --git a/src/views/modules/production-issue/production-issue-pda.vue b/src/views/modules/production-issue/production-issue-pda.vue index b07cf8b..f6026a1 100644 --- a/src/views/modules/production-issue/production-issue-pda.vue +++ b/src/views/modules/production-issue/production-issue-pda.vue @@ -378,7 +378,7 @@ export default { // 直接发料 directIssueForm: { - site: 'MAIN', + site: this.$store.state.user.site, workOrderNo: '', operatorName: 'PDA_USER', remark: '', @@ -395,7 +395,7 @@ export default { // 申请单发料 requestIssueForm: { - site: 'MAIN', + site: this.$store.state.user.site, notifyNo: '', workOrderNo: '', operatorName: 'PDA_USER', @@ -407,7 +407,7 @@ export default { // 托盘拣选 palletForm: { - site: 'MAIN', + site: this.$store.state.user.site, notifyNo: '', operatorName: 'PDA_USER', printerName: '', diff --git a/src/views/modules/production-issue/productionReturnPDA.vue b/src/views/modules/production-issue/productionReturnPDA.vue new file mode 100644 index 0000000..0065e93 --- /dev/null +++ b/src/views/modules/production-issue/productionReturnPDA.vue @@ -0,0 +1,1295 @@ + + + + + + + + 📦 + 直接退料 + 输入工单号,选择材料行,扫描物料标签直接退料 + + + + 📋 + 基于申请单退料 + 选择退料申请单,选择发料记录,录入退料数量 + + + + + + + ← 返回 + 直接退料 + + + + + + 工单号 + + + 确认 + + + + + + + + 工单物料 ({{ directReturnForm.workOrderNo }}) + 重新选择 + + + + + + {{ material.partNo }} + {{ material.partDesc }} + + 已发: {{ material.issuedQty }} | + 可退: {{ material.returnableQty }} | + 已退: {{ material.returnedQty }} + + + + 可退料 + 无可退 + + + + + + + + + 退料方式 + + + + + + 扫描标签 + + + 手工输入 + + + + + + + 物料标签 + + + 解析 + + + + + + + 物料编码: + {{ labelInfo.partNo }} + + + 物料描述: + {{ labelInfo.partDesc }} + + + 批次号: + {{ labelInfo.batchNo }} + + + 当前数量: + {{ labelInfo.currentQty }} + + + + + + + + 批次号 + + + + + + + + + 退料数量 + + + + + 退料原因 + + 请选择退料原因 + 质量问题 + 超发 + 错误物料 + 生产变更 + 其他 + + + + + 备注 + + + + + + + + + 创建卷/箱记录并打印标签 + + + + + 打印机 + + 请选择打印机 + 打印机01 + 打印机02 + + + + + + 确认退料 (同步IFS) + + + + + + + + + ← 返回 + 基于申请单退料 + + + + + + 退料申请单号 + + + 确认 + + + + + + + + 申请单物料 ({{ requestReturnForm.requestNo }}) + 重新选择 + + + + + + {{ material.partNo }} + {{ material.partDesc }} + 工单: {{ material.workOrderNo }} + + 申请: {{ material.requestQty }} | + 已退: {{ material.returnedQty }} | + 剩余: {{ material.remainQty }} + + + + 待退料 + 已完成 + + + + + + + + + 发料记录 + + + + + + 发料ID: {{ record.issueId }} + 发料日期: {{ record.issueDate }} + 批次: {{ record.batchNo }} | 数量: {{ record.issueQty }} + 可退: {{ record.returnableQty }} + + + 可退料 + 已退完 + + + + + + + + + 退料信息 + + + + + 退料数量 + + + + + 退料原因 + + 请选择退料原因 + 质量问题 + 超发 + 错误物料 + 生产变更 + 其他 + + + + + 目标库位 + + + 验证 + + + + + 备注 + + + + + + + + + 创建箱/卷记录并打印纸质标签 + + + + + 打印机 + + 请选择打印机 + 打印机01 + 打印机02 + + + + + + 确认退料并入库 (同步IFS) + + + + + + + + + {{ loadingText }} + + + + + {{ message }} + + + + + + + \ No newline at end of file