From f75794f3ff02e67fbc51cc7e049265dc391a9e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Sun, 11 Jan 2026 19:04:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=92=A2=E5=8D=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=92=A4=E5=9B=9E=E5=8F=91=E8=B4=A7=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9D=90=E8=B4=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在钢卷管理模块中新增撤回发货功能，允许用户撤回已发货的钢卷
同时优化外标签预览中材质的显示方式，增加厂家首字母信息
---
 klp-ui/src/api/wms/coil.js                    |  8 +++++
 .../panels/LabelRender/OuterTagPreview.vue    |  8 ++++-
 klp-ui/src/views/wms/coil/panels/base.vue     | 29 ++++++++++++++++++-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js
index cb472417..ea433277 100644
--- a/klp-ui/src/api/wms/coil.js
+++ b/klp-ui/src/api/wms/coil.js
@@ -183,4 +183,12 @@ export function listCoilWithIds(data) {
     method: 'post',
     data
   })
+}
+
+// 撤回钢卷发货
+export function cancelExportCoil(coilId) {
+  return request({
+    url: '/wms/materialCoil/withdrawExportCoil/' + coilId,
+    method: 'get'
+  })
 }
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
index 111aced8..63cf2745 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
@@ -49,7 +49,7 @@
       <!-- 第四行：材质 + 表面质量 -->
       <div class="info-grid-item label-cell">材质</div>
       <div class="info-grid-item value-cell">
-        <input type="text" class="nob" :value="content.material || ''" />
+        <input type="text" class="nob" :value="materialWithManufacturer || ''" />
       </div>
       <div class="info-grid-item label-cell">质量要求</div>
       <div class="info-grid-item value-cell">
@@ -158,6 +158,12 @@ export default {
       default: 100
     }
   },
+  computed: {
+    // 材质展示信息,额外带上厂家的首字母
+    materialWithManufacturer() {
+      return this.content.material + ' - ' + this.content.manufacturer
+    }
+  },
   data() {
     return {
       logo,
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index b44a647e..0c89a006 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -135,6 +135,10 @@
             @click="handleExportCoil(scope.row)">
             发货
           </el-button>
+          <el-button size="mini" v-if="showExportTime" type="text" icon="el-icon-close"
+            @click="handleCancelExport(scope.row)">
+            撤回发货
+          </el-button>
           <el-button size="mini" v-if="showAbnormal" type="text" icon="el-icon-upload"
             @click="handleAbnormal(scope.row)">查看异常</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)"
@@ -272,7 +276,15 @@
 </template>
 
 <script>
-import { listMaterialCoil, getMaterialCoil, delMaterialCoil, addMaterialCoil, updateMaterialCoilSimple, getMaterialCoilTrace, exportCoil } from "@/api/wms/coil";
+import { 
+  listMaterialCoil, 
+  getMaterialCoil, 
+  delMaterialCoil, 
+  addMaterialCoil, 
+  updateMaterialCoilSimple, 
+  getMaterialCoilTrace, 
+  exportCoil,
+  cancelExportCoil } from "@/api/wms/coil";
 import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
 import QRCode from "../../print/components/QRCode.vue";
 import * as XLSX from 'xlsx'
@@ -768,6 +780,21 @@ export default {
         }
       });
     },
+    handleCancelExport(row) {
+      // 将相关的action改为已取消，然后将钢卷的已发货状态撤回
+      this.$modal.confirm('是否确认撤回钢卷编号为"' + row.currentCoilNo + '"的发货操作？').then(() => {
+        this.buttonLoading = true;
+        cancelExportCoil(row.coilId).then(response => {
+          this.$modal.msgSuccess("撤回发货成功");
+          this.getList();
+        }).catch(error => {
+          this.$modal.msgError("撤回发货失败");
+        }).finally(() => {
+          this.buttonLoading = false;
+        });
+      }).catch(() => {
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const coilIds = row.coilId || this.ids;