From 9bd2b13c016e6e06ec9f7f136557c5883fc50540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Sun, 21 Sep 2025 12:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A0=88=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/automatedWarehouse/callOut.vue    | 31 +++++++++++--------
 .../production-return/productionReturnPDA.vue | 18 +++++------
 .../productionReturnPickingDetail.vue         | 10 +++---
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/views/modules/automatedWarehouse/callOut.vue b/src/views/modules/automatedWarehouse/callOut.vue
index 93e0e48..c1326ab 100644
--- a/src/views/modules/automatedWarehouse/callOut.vue
+++ b/src/views/modules/automatedWarehouse/callOut.vue
@@ -244,19 +244,24 @@ export default {
 
       // 这里添加Cal按钮的具体逻辑
       console.log('Cal操作，选中的栈板:', this.selectedPallets);
-      this.$message.success(`正在处理栈板: ${this.selectedPallets.map(p => p.palletId).join(', ')}`);
-      
-      callPalletFromWcs(this.selectedPallets).then(({ data }) => {
-        if (data && data.code === 0) {
-          this.$message.success('成功发送运输请求！');
-          this.cleanData()
-        } else {
-          this.$message.error(data.msg || '处理失败');
-        }
-      }).catch(error => {
-        console.error('处理栈板失败:', error);
-        this.$message.error('处理失败');
-      });
+      this.$confirm('确定进行[Call车]操作?', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+
+        callPalletFromWcs(this.selectedPallets).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success('成功发送运输请求！');
+            this.cleanData()
+          } else {
+            this.$message.error(data.msg || '处理失败');
+          }
+        }).catch(error => {
+          console.error('处理栈板失败:', error);
+          this.$message.error('处理失败');
+        });
+      })
     },
 
     cleanData(){
diff --git a/src/views/modules/production-return/productionReturnPDA.vue b/src/views/modules/production-return/productionReturnPDA.vue
index 22088fe..ef18c1c 100644
--- a/src/views/modules/production-return/productionReturnPDA.vue
+++ b/src/views/modules/production-return/productionReturnPDA.vue
@@ -65,13 +65,13 @@
 
             <div class="return-method">
               <div class="method-tabs">
-                <button 
+                <button
                   :class="['tab-btn', { active: returnMethod === 'scan' }]"
                   @click="returnMethod = 'scan'"
                 >
                   扫描标签
                 </button>
-                <button 
+                <button
                   :class="['tab-btn', { active: returnMethod === 'manual' }]"
                   @click="returnMethod = 'manual'"
                 >
@@ -320,7 +320,7 @@
                 </div>
               </div>
 
-              <button @click="confirmRequestReturn" class="confirm-btn" 
+              <button @click="confirmRequestReturn" class="confirm-btn"
                 :disabled="!returnQty || !requestReturnForm.returnReason || !requestReturnForm.targetLocation">
                 确认退料并入库 (同步IFS)
               </button>
@@ -360,7 +360,7 @@
 
 <script>
 import {
-  getWorkOrderMaterials,
+  // getWorkOrderMaterials,
   parseMaterialLabel,
   directReturn,
   getReturnRequestMaterials,
@@ -535,7 +535,7 @@ export default {
 
         if (response.code === 0) {
           this.showMessage('退料成功，已同步到IFS', 'success')
-          
+
           // 如果需要打印标签
           if (this.directReturnForm.createLabel) {
             await this.printLabel(response.returnId)
@@ -594,11 +594,11 @@ export default {
         this.showMessage('该物料已退料完成', 'warning')
         return
       }
-      
+
       this.selectedRequestMaterial = material
       this.selectedIssueRecord = null
       this.returnQty = null
-      
+
       // 加载发料记录
       await this.loadIssueRecords(material)
     },
@@ -703,7 +703,7 @@ export default {
 
         if (response.code === 0) {
           this.showMessage('退料成功，已入库并同步到IFS', 'success')
-          
+
           // 如果需要打印标签
           if (this.requestReturnForm.createLabel) {
             await this.printLabel(response.returnId)
@@ -1315,4 +1315,4 @@ export default {
     flex-direction: column;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/production-return/productionReturnPickingDetail.vue b/src/views/modules/production-return/productionReturnPickingDetail.vue
index 0f37c4d..5b43297 100644
--- a/src/views/modules/production-return/productionReturnPickingDetail.vue
+++ b/src/views/modules/production-return/productionReturnPickingDetail.vue
@@ -304,9 +304,9 @@
 
 <script>
 import {
-  getWorkOrderMaterials,
-  parseMaterialLabel,
-  directReturn,
+  // getWorkOrderMaterials,
+  // parseMaterialLabel,
+  // directReturn,
   getInventoryPart
 } from "@/api/production/production-return";
 import moment from "moment";
@@ -680,7 +680,7 @@ export default {
         locationId:"",
       }
       console.log("添加标签:",newLabel);
-      
+
       // 添加到列表
       this.printLabelList.push(newLabel);
       this.$message.success("操作成功");
@@ -1625,4 +1625,4 @@ export default {
     width: 100%;
   }
 }
-</style>
\ No newline at end of file
+</style>