From ac6bea17721165c9fe75e52b5d0baca1902f10a7 Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Sat, 4 Oct 2025 13:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E9=A2=86=E6=96=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/production/production-issue.js                 |  2 +-
 src/router/index.js                                    |  2 +-
 src/views/modules/production-issue/directIssue.vue     | 10 +++++-----
 .../modules/production-issue/directIssueDetail.vue     | 10 +++++-----
 .../production-issue/productionPickingDetail.vue       |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/api/production/production-issue.js b/src/api/production/production-issue.js
index 3bef56b..9a5d6db 100644
--- a/src/api/production/production-issue.js
+++ b/src/api/production/production-issue.js
@@ -26,7 +26,7 @@ export const validateWorkOrder = data => createAPI(`/pda/production/issue/valida
 // 验证申请单状态
 export const validateNotify = data => createAPI(`/pda/production/issue/validateNotify`,'post',data)
 // 扫描材料是否存在
-export const scanMaterialLabel = data => createAPI(`/pda/production/issue/scanMaterialLabel`,'post',data)
+export const scanMaterialLabelIssue = data => createAPI(`/pda/production/issue/scanMaterialLabelIssue`,'post',data)
 // 获取工单列表
 export const getIssureNotifyByNo = data => createAPI(`/pda/production/issue/getIssureNotifyByNo`,'post',data)
 // 获取工单列表
diff --git a/src/router/index.js b/src/router/index.js
index 3525ee8..9c4a0bb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -51,7 +51,7 @@ 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: "/directIssue", name: "directIssue", component: resolve => require(["@/views/modules/production-issue/directIssue.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
-  { path: "/directIssueDetail/:workOrderNo/:partNo/:partDesc/:requiredQty/:issuedQty/:issueInfo", name: "directIssueDetail", component: resolve => require(["@/views/modules/production-issue/directIssueDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+  { path: "/directIssueDetail/:workOrderNo/:partNo/:issueInfo", name: "directIssueDetail", component: resolve => require(["@/views/modules/production-issue/directIssueDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
 //生产退料
   {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 } },
diff --git a/src/views/modules/production-issue/directIssue.vue b/src/views/modules/production-issue/directIssue.vue
index 73d9d9c..c7418f4 100644
--- a/src/views/modules/production-issue/directIssue.vue
+++ b/src/views/modules/production-issue/directIssue.vue
@@ -262,14 +262,14 @@ export default {
         name: "directIssueDetail",
         params: {
           workOrderNo: this.selectedWorkOrder.orderNo,
-          partNo: material.componentPartNo,
-          partDesc: material.componentPartDesc,
-          requiredQty: material.qtyRequired,
-          issuedQty: material.qtyIssued || 0,
+          partNo: material.componentPartNo,    
           itemNo: material.lineItemNo,
           issueInfo:{
             releaseNo:this.selectedWorkOrder.releaseNo,
-            sequenceNo:this.selectedWorkOrder.sequenceNo
+            sequenceNo:this.selectedWorkOrder.sequenceNo,
+            requiredQty: material.qtyRequired,
+            issuedQty: material.qtyIssued || 0,
+            partDesc: material.componentPartDesc,
           }
         },
       });
diff --git a/src/views/modules/production-issue/directIssueDetail.vue b/src/views/modules/production-issue/directIssueDetail.vue
index 28d2baf..01af054 100644
--- a/src/views/modules/production-issue/directIssueDetail.vue
+++ b/src/views/modules/production-issue/directIssueDetail.vue
@@ -101,7 +101,7 @@
 
 <script>
 import {
-  scanMaterialLabel,
+  scanMaterialLabelIssue,
   confirmDirectIssue,
 } from '@/api/production/production-issue'
 import moment from 'moment'
@@ -147,7 +147,7 @@ export default {
         componentPartNo: this.componentPartNo,
         site: localStorage.getItem('site'),
       }
-      scanMaterialLabel(params)
+      scanMaterialLabelIssue(params)
         .then(({ data }) => {
           if (data && data.code === 0) {
             const exists = this.scannedLabels.find(
@@ -255,9 +255,9 @@ export default {
     initFromRoute() {
       this.workOrderNo = this.$route.params.workOrderNo
       this.componentPartNo = this.$route.params.partNo
-      this.componentPartDesc = this.$route.params.partDesc || ''
-      this.requiredQty = Number(this.$route.params.requiredQty || 0)
-      this.issuedQty = Number(this.$route.params.issuedQty || 0)
+      this.componentPartDesc = this.$route.params.issueInfo.partDesc || ''
+      this.requiredQty = this.$route.params.issueInfo.requiredQty
+      this.issuedQty = this.$route.params.issueInfo.issuedQty 
       this.itemNo = this.$route.params.itemNo || ''
       this.issueInfo = this.$route.params.issueInfo
 
diff --git a/src/views/modules/production-issue/productionPickingDetail.vue b/src/views/modules/production-issue/productionPickingDetail.vue
index 14a71c7..952f840 100644
--- a/src/views/modules/production-issue/productionPickingDetail.vue
+++ b/src/views/modules/production-issue/productionPickingDetail.vue
@@ -165,7 +165,7 @@
 </template>
 
 <script>
-import { scanMaterialLabel,getRequestMaterials } from '@/api/production/production-issue';
+import { scanMaterialLabelIssue,getRequestMaterials } from '@/api/production/production-issue';
 import moment from 'moment';
 import { notify } from 'node-notifier';
 
@@ -209,7 +209,7 @@ export default {
         site: localStorage.getItem('site'),
       };
       
-      scanMaterialLabel(params).then(({ data }) => {
+      scanMaterialLabelIssue(params).then(({ data }) => {
         if (data && data.code === 0) {
           // 检查是否已经扫描过
           const exists = this.labelList.find(item => item.labelCode === labelCode);