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 @@ + + + + + \ No newline at end of file