From 86e047bd5e269c3d36e9b8ebe1494b305410edf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 2 Dec 2025 14:45:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=92=A2=E5=8D=B7=E5=8F=91=E8=B4=A7):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=92=A2=E5=8D=B7=E5=8F=91=E8=B4=A7=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增钢卷发货API接口及前端调用
- 将发货操作从状态更新改为专用发货接口
- 移除状态选择列并添加发货按钮
- 更新后端控制器注释和方法类型
---
 klp-ui/src/api/wms/coil.js                    |  8 +++++
 klp-ui/src/views/wms/coil/do/ship.vue         |  8 ++---
 klp-ui/src/views/wms/coil/panels/base.vue     | 35 ++++++++++++-------
 .../controller/WmsMaterialCoilController.java |  4 +--
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js
index 2597622f..1c309d4a 100644
--- a/klp-ui/src/api/wms/coil.js
+++ b/klp-ui/src/api/wms/coil.js
@@ -127,4 +127,12 @@ export function exportAllMaterialCoil(query) {
     method: 'post',
     data: query
   })
+}
+
+// 钢卷发货
+export function exportCoil(coilId) {
+  return request({
+    url: '/wms/materialCoil/exportCoil/' + coilId,
+    method: 'get'
+  })
 }
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/do/ship.vue b/klp-ui/src/views/wms/coil/do/ship.vue
index 1246093d..1c673651 100644
--- a/klp-ui/src/views/wms/coil/do/ship.vue
+++ b/klp-ui/src/views/wms/coil/do/ship.vue
@@ -185,7 +185,7 @@
 </template>
 
 <script>
-import { updateMaterialCoilSimple, getMaterialCoil } from '@/api/wms/coil'
+import { exportCoil, getMaterialCoil } from '@/api/wms/coil'
 import { listPendingAction, addPendingAction } from '@/api/wms/pendingAction'
 import MaterialSelect from "@/components/KLPService/MaterialSelect";
 import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
@@ -305,11 +305,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
-          updateMaterialCoilSimple({
-            ...this.form,
-            coilId: this.form.coilId,
-            status: 1
-          }).then(response => {
+          exportCoil(this.form.coilId).then(response => {
             addPendingAction({
               actionType: 402,
               currentCoilNo: this.form.currentCoilNo,
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index e5301853..ef818251 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -99,14 +99,14 @@
           <QRCode :content="scope.row.qrcodeRecordId" :size="50" />
         </template>
       </el-table-column>
-      <el-table-column label="状态" v-if="showStatus" align="center" prop="status">
+      <!-- <el-table-column label="状态" v-if="showStatus" align="center" prop="status">
         <template slot-scope="scope">
           <el-select v-model="scope.row.status" placeholder="请选择状态" @change="handleStatusChange(scope.row)">
             <el-option v-for="item in dict.type.product_coil_status" :key="item.value" :value="parseInt(item.value)"
               :label="item.label" />
           </el-select>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- <el-table-column label="班组" align="center" prop="team" /> -->
       <!-- <el-table-column label="毛重" align="center" prop="grossWeight" />
       <el-table-column label="净重" align="center" prop="netWeight" /> -->
@@ -134,6 +134,9 @@
           <el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
             导出标签
           </el-button>
+          <el-button size="mini" v-if="showStatus" type="text" icon="el-icon-upload" @click="handleExportCoil(scope.row.coilId)">
+            发货
+          </el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)" v-if="showControl">修正</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-if="showControl">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-search" @click="handleTrace(scope.row)">追溯</el-button>
@@ -228,7 +231,7 @@
 </template>
 
 <script>
-import { listMaterialCoil, getMaterialCoil, delMaterialCoil, addMaterialCoil, updateMaterialCoilSimple, getMaterialCoilTrace, exportAllMaterialCoil } from "@/api/wms/coil";
+import { listMaterialCoil, getMaterialCoil, delMaterialCoil, addMaterialCoil, updateMaterialCoilSimple, getMaterialCoilTrace, exportCoil } from "@/api/wms/coil";
 import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
 import QRCode from "../../print/components/QRCode.vue";
 import * as XLSX from 'xlsx'
@@ -436,15 +439,15 @@ export default {
       });
     },
     /** 状态改变时触发 */
-    handleStatusChange(row) {
-      updateMaterialCoilSimple(row).then(res => {
-        this.$message.success('状态更新成功');
-        this.getList(); // 刷新列表
-      }).catch(err => {
-        console.error('状态更新失败：', err);
-        this.$message.error('状态更新失败，请重试');
-      });
-    },
+    // handleStatusChange(row) {
+    //   updateMaterialCoilSimple(row).then(res => {
+    //     this.$message.success('状态更新成功');
+    //     this.getList(); // 刷新列表
+    //   }).catch(err => {
+    //     console.error('状态更新失败：', err);
+    //     this.$message.error('状态更新失败，请重试');
+    //   });
+    // },
     /** 追溯按钮操作 */
     handleTrace(row) {
       this.traceOpen = true;
@@ -592,6 +595,14 @@ export default {
         this.title = "修改钢卷物料";
       });
     },
+    handleExportCoil(row) {
+      exportCoil(row.coilId).then(response => {
+        this.$modal.msgSuccess("发货成功");
+        this.getList();
+      }).catch(error => {
+        this.$modal.msgError("发货失败");
+      });
+    },
     handleCheck(row) {
       this.isCheck = true;
       this.loading = true;
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
index c0e89a23..34950c24 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
@@ -57,12 +57,12 @@ public class WmsMaterialCoilController extends BaseController {
     }
 
     /**
-     * 删除钢卷物料表
+     * 钢卷发货，将钢卷状态更新为已发货，且更新发货时间
      *
      * @param coilId 主键
      */
     @Log(title = "钢卷物料表", businessType = BusinessType.DELETE)
-    @DeleteMapping("/exportCoil/{coilId}")
+    @GetMapping("/exportCoil/{coilId}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable("coilId") Long coilId) {