diff --git a/src/api/mr/mr.js b/src/api/mr/mr.js index a226e4c..05cae45 100644 --- a/src/api/mr/mr.js +++ b/src/api/mr/mr.js @@ -16,4 +16,10 @@ export const getReturnMrInfo = data => createAPI(`/pda/mr/getReturnMrInfo`, 'pos export const getMrMaterials = data => createAPI(`/pda/mr/getMrMaterials`, 'post', data) -export const getIssueForMaterialRequisition = data => createAPI(`/pda/mr/getIssueForMaterialRequisition`, 'post', data) \ No newline at end of file +export const getIssueForMaterialRequisition = data => createAPI(`/pda/mr/getIssueForMaterialRequisition`, 'post', data) + +export const scanMaterialLabelNotInStock = data => createAPI(`/pda/mr/scanMaterialLabelNotInStock`, 'post', data) + +export const getInventoryPart = data => createAPI(`/pda/mr/getInventoryPart`, 'post', data) + +export const confirmMrUnIssue = data => createAPI(`/pda/mr/confirmMrUnIssue`, 'post', data) \ No newline at end of file diff --git a/src/api/outsourcing/outsourcing-return.js b/src/api/outsourcing/outsourcing-return.js new file mode 100644 index 0000000..50a9641 --- /dev/null +++ b/src/api/outsourcing/outsourcing-return.js @@ -0,0 +1,16 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// 搜索委外订单(用于退料) +export const searchOutsourcingOrdersForReturn = data => createAPI(`/pda/outsourcing/return/searchOutsourcingOrdersForReturn`,'post',data) + +// 获取委外订单发料记录 +export const getUnissueMatericalForOutsourcingOrder = data => createAPI(`/pda/outsourcing/return/getUnissueMatericalForOutsourcingOrder`,'post',data) + +// 获取委外订单物料详情 +export const getInventoryPartForOutsourcing = data => createAPI(`/pda/outsourcing/return/getInventoryPartForOutsourcing`,'post',data) + +// 扫描委外退料标签 +export const scanMaterialLabelForOutsourcing = data => createAPI(`/pda/outsourcing/return/scanMaterialLabelForOutsourcing`,'post',data) + +// 确认委外退料 +export const outsourcingReturnUnissueConfirm = data => createAPI(`/pda/outsourcing/return/outsourcingReturnUnissueConfirm`,'post',data) diff --git a/src/router/index.js b/src/router/index.js index 64d61d8..624df66 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -76,6 +76,11 @@ const globalRoutes = [ { path: "/outsourcingPicking", name: "outsourcingPicking", component: resolve => require(["@/views/modules/outsourcing-issue/outsourcingPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, { path: "/outsourcingPickingDetail/:outsourcingNo", name: "outsourcingPickingDetail", component: resolve => require(["@/views/modules/outsourcing-issue/outsourcingPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + // 委外退料 + { path: "/outsourcingReturn", name: "outsourcingReturn", component: resolve => require(["@/views/modules/outsourcing-return/index.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + { path: "/outsourcingReturnPDAList/:outsourcingOrderNo/:partNo/:unissureQty/:itemNo", name: "outsourcingReturnPDAList", component: resolve => require(["@/views/modules/outsourcing-return/outsourcingReturnPDAList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + { path: "/outsourcingReturnPDAIssueList/:outsourcingOrderNo/:material", name: "outsourcingReturnPDAIssueList", component: resolve => require(["@/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + // 客户订单发货 {path: "/saleshipping",name: "saleshipping", component: resolve => require(["@/views/modules/sales-delivery/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, @@ -99,7 +104,7 @@ const globalRoutes = [ // MR退料 {path: "/mrPickingReturn", name: "mrPickingReturn", component: resolve => require(["@/views/modules/mr-issue/mrPickingReturn.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, {path: "/mrReturnIssueList", name: "mrReturnIssueList", component: resolve => require(["@/views/modules/mr-issue/mrReturnIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, - {path: "/mrReturnPickingDetail/:orderNo/:orderType/:partNo/:transactionId/:quantity/:batchNo", name: "mrReturnPickingDetail", component: resolve => require(["@/views/modules/mr-issue/mrReturnPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + {path: "/mrReturnPickingDetail/:orderNo/:orderType/:partNo/:transactionId/:quantity/:batchNo/:issueInfo", name: "mrReturnPickingDetail", component: resolve => require(["@/views/modules/mr-issue/mrReturnPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, // 盘点 {path: "/stocktaking",name: "stocktaking", component: resolve => require(["@/views/modules/inventory/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, diff --git a/src/views/modules/mr-issue/mrPicking.vue b/src/views/modules/mr-issue/mrPicking.vue index f99f045..6e34b0a 100644 --- a/src/views/modules/mr-issue/mrPicking.vue +++ b/src/views/modules/mr-issue/mrPicking.vue @@ -28,7 +28,7 @@
暂无扫描标签
+暂无发料记录
+加载中...
+