From 6f94a226e627480b01a84a517e0bc1a01c1fa9e8 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Fri, 29 Aug 2025 10:34:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E9=A1=B5=E9=9D=A2=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/production/production-inbound.js | 11 + src/api/purchase/purchase-return.js | 12 + src/router/index.js | 18 +- src/views/main.vue | 4 +- .../production-inbound/inboundRegister.vue | 387 +++++ .../inboundRegisterDetail.vue | 1027 ++++++++++++ .../modules/production-inbound/index.vue | 1373 ++--------------- .../modules/production-inbound/production.vue | 166 ++ .../production-inbound/productionPick.vue | 387 +++++ .../productionPickingDetail.vue | 982 ++++++++++++ .../modules/production-issue/production.vue | 38 +- .../pick.vue | 0 .../modules/production-return/production.vue | 169 ++ .../productionReturnPDA.vue | 0 .../productionReturnPicking.vue | 440 ++++++ .../productionReturnPickingDetail.vue | 1128 ++++++++++++++ src/views/modules/purchase-return/index.vue | 165 ++ .../purchase-return/purchaseReturnPicking.vue | 387 +++++ .../purchaseReturnPickingDetail.vue | 982 ++++++++++++ 19 files changed, 6384 insertions(+), 1292 deletions(-) create mode 100644 src/api/purchase/purchase-return.js create mode 100644 src/views/modules/production-inbound/inboundRegister.vue create mode 100644 src/views/modules/production-inbound/inboundRegisterDetail.vue create mode 100644 src/views/modules/production-inbound/production.vue create mode 100644 src/views/modules/production-inbound/productionPick.vue create mode 100644 src/views/modules/production-inbound/productionPickingDetail.vue rename src/views/modules/{production-issue => production-return}/pick.vue (100%) create mode 100644 src/views/modules/production-return/production.vue rename src/views/modules/{production-issue => production-return}/productionReturnPDA.vue (100%) create mode 100644 src/views/modules/production-return/productionReturnPicking.vue create mode 100644 src/views/modules/production-return/productionReturnPickingDetail.vue create mode 100644 src/views/modules/purchase-return/index.vue create mode 100644 src/views/modules/purchase-return/purchaseReturnPicking.vue create mode 100644 src/views/modules/purchase-return/purchaseReturnPickingDetail.vue diff --git a/src/api/production/production-inbound.js b/src/api/production/production-inbound.js index 00334f4..133f274 100644 --- a/src/api/production/production-inbound.js +++ b/src/api/production/production-inbound.js @@ -20,3 +20,14 @@ export const getInboundRecords = data => createAPI(`/production/inbound/getInbou export const returnStock = data => createAPI(`/production/inbound/returnStock`,'post',data) // 扫描单元获取退库信息 export const scanUnitForReturn = data => createAPI(`/production/inbound/scanUnitForReturn`,'post',data) + +// 获取入库通知单信息 +export const getInboundNotifyByNo = data => createAPI(`/production/inbound/getInboundNotifyByNo`,'post',data) +// 获取入库通知单列表 +export const getInboundNotifyListByNo = data => createAPI(`/production/inbound/getInboundNotifyListByNo`,'post',data) +// 扫描物料标签 +export const scanMaterialLabel = data => createAPI(`/production/inbound/scanMaterialLabel`,'post',data) +// 获取申请物料清单 +export const getRequestMaterials = data => createAPI(`/production/inbound/getRequestMaterials`,'post',data) +// 确认生产入库 +export const confirmProductionInbound = data => createAPI(`/production/inbound/confirmProductionInbound`,'post',data) diff --git a/src/api/purchase/purchase-return.js b/src/api/purchase/purchase-return.js new file mode 100644 index 0000000..cff1571 --- /dev/null +++ b/src/api/purchase/purchase-return.js @@ -0,0 +1,12 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// 获取采购退库通知单信息 +export const getPurchaseReturnNotifyByNo = data => createAPI(`/purchase/return/getPurchaseReturnNotifyByNo`,'post',data) +// 获取采购退库通知单列表 +export const getPurchaseReturnNotifyListByNo = data => createAPI(`/purchase/return/getPurchaseReturnNotifyListByNo`,'post',data) +// 扫描物料标签 +export const scanMaterialLabel = data => createAPI(`/purchase/return/scanMaterialLabel`,'post',data) +// 获取退库物料清单 +export const getReturnMaterials = data => createAPI(`/purchase/return/getReturnMaterials`,'post',data) +// 确认采购退库 +export const confirmPurchaseReturn = data => createAPI(`/purchase/return/confirmPurchaseReturn`,'post',data) \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 965e329..3e99e42 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -25,6 +25,11 @@ const globalRoutes = [ // 采购入库 {path: "/porecv",name: "porecv", component: resolve => require(["@/views/modules/recv/po-recv.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/recv",name: "recv", component: resolve => require(["@/views/modules/recv/recv.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + + // 采购退库 + {path: "/purchasereturn",name: "purchaseReturn", component: resolve => require(["@/views/modules/purchase-return/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/purchaseReturnPicking",name: "purchaseReturnPicking", component: resolve => require(["@/views/modules/purchase-return/purchaseReturnPicking.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/purchaseReturnPickingDetail/:returnNo",name: "purchaseReturnPickingDetail", component: resolve => require(["@/views/modules/purchase-return/purchaseReturnPickingDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/qualifiedStorage",name: "qualifiedStorage", component: resolve => require(["@/views/modules/recv/qualifiedStorage.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/inspectionResults",name: "inspectionResults", component: resolve => require(["@/views/modules/recv/inspectionResults.vue"], resolve), @@ -38,12 +43,17 @@ const globalRoutes = [ { path: "/productionPicking", name: "productionPicking", component: resolve => require(["@/views/modules/production-issue/productionPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, { path: "/productionPickingDetail/:outboundNo", name: "productionPickingDetail", component: resolve => require(["@/views/modules/production-issue/productionPickingDetail.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), + {path: "/productionreturn",name: "productionreturn", component: resolve => require(["@/views/modules/production-return/production.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/productionReturnPicking", name: "productionReturnPicking", component: resolve => require(["@/views/modules/production-return/productionReturnPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } }, + {path: '/production-return/pick/:orderNo', + name: 'ProductionIssuePick',component: resolve => require(["@/views/modules/production-return/pick.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 生产入库 - {path: "/productionInbound",name: "productionInbound", component: resolve => require(["@/views/modules/production-inbound/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/productionInboundProduction",name: "productionInboundProduction", component: resolve => require(["@/views/modules/production-inbound/production.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/productionPick",name: "productionPick", component: resolve => require(["@/views/modules/production-inbound/productionPick.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/productionInboundDetail/:inboundNo",name: "productionInboundDetail", component: resolve => require(["@/views/modules/production-inbound/productionPickingDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/inboundRegister",name: "inboundRegister", component: resolve => require(["@/views/modules/production-inbound/inboundRegister.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/inboundRegisterDetail/:inboundNo",name: "inboundRegisterDetail", component: resolve => require(["@/views/modules/production-inbound/inboundRegisterDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 委外 {path: "/outsource",name: "outsource", component: resolve => require(["@/views/modules/outsourcing-issue/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, diff --git a/src/views/main.vue b/src/views/main.vue index d63f77e..09ad835 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -32,7 +32,7 @@ -