From be75c1a4b82da1e8d101e3716d5e18eb2fc493e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Fri, 22 May 2026 16:19:24 +0800
Subject: [PATCH] feat(wms): add transfer remark field and re-label function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 新增调拨备注字段transferRemark到调拨单itemBO
2. 新增执行后重贴标签的复选框和备注输入框
3. 调整调拨确认时传递调拨备注参数
4. 注释调旧的调拨类型获取逻辑，改用传入的调拨备注作为调拨类型
---
 .../wms/move/components/tranferItemTable.vue  | 36 +++++++++++++++++--
 klp-ui/src/views/wms/move/do.vue              | 26 +++++++++-----
 .../klp/domain/bo/WmsTransferOrderItemBo.java |  2 ++
 .../impl/WmsTransferOrderItemServiceImpl.java | 13 ++++---
 4 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/klp-ui/src/views/wms/move/components/tranferItemTable.vue b/klp-ui/src/views/wms/move/components/tranferItemTable.vue
index 684e9483..8dc60090 100644
--- a/klp-ui/src/views/wms/move/components/tranferItemTable.vue
+++ b/klp-ui/src/views/wms/move/components/tranferItemTable.vue
@@ -131,6 +131,14 @@ export default {
       type: Boolean,
       default: false
     },
+    refreshLabel: {
+      type: Boolean,
+      default: false
+    },
+    transferRemark: {
+      type: String,
+      default: ''
+    },
   },
   components: {
     // WarehouseSelect,
@@ -235,7 +243,19 @@ export default {
     // 确认调拨
     handleConfirm(item) {
       this.buttonLoading = true
-      confirmTransferOrderItem(item).then(res => {
+      let transferRemark = this.transferRemark
+      if (this.refreshLabel && !transferRemark) {
+        transferRemark = '调拨'
+      }
+      if (!this.refreshLabel) {
+        transferRemark = ''
+      }
+      // console.log(transferRemark, this.refreshLabel, this.transferRemark)
+      // return;
+      confirmTransferOrderItem({
+        ...item,
+        transferRemark
+      }).then(res => {
         if (res.code === 200) {
           this.$message({
             message: '确认调拨成功',
@@ -260,8 +280,20 @@ export default {
         return;
       }
 
+      let transferRemark = this.transferRemark
+      if (this.refreshLabel && !transferRemark) {
+        transferRemark = '调拨'
+      }
+      if (!this.refreshLabel) {
+        transferRemark = ''
+      }
+      // console.log(transferRemark)
+      // return;
       this.buttonLoading = true;
-      batchConfirmTransferOrderItem(unconfirmedItems).then(res => {
+      batchConfirmTransferOrderItem(unconfirmedItems.map(item => ({
+        ...item,
+        transferRemark
+      }))).then(res => {
         if (res.code === 200) {
           this.$message({
             message: '确认调拨成功',
diff --git a/klp-ui/src/views/wms/move/do.vue b/klp-ui/src/views/wms/move/do.vue
index 68cae7a2..55418979 100644
--- a/klp-ui/src/views/wms/move/do.vue
+++ b/klp-ui/src/views/wms/move/do.vue
@@ -18,10 +18,10 @@
       </el-form-item>
       <el-form-item label="调拨单号">
         <el-select v-model="queryParams.transferNo" filterable remote clearable
-          remote-method="remoteSearchTransferOrder" :remote-loading="transferOrderLoading"
-          placeholder="请输入调拨单号搜索" @change="handleRegularSearch" style="width:220px">
-          <el-option v-for="item in transferOrderOptions" :key="item.orderId"
-            :label="item.transferNo" :value="item.transferNo" />
+          remote-method="remoteSearchTransferOrder" :remote-loading="transferOrderLoading" placeholder="请输入调拨单号搜索"
+          @change="handleRegularSearch" style="width:220px">
+          <el-option v-for="item in transferOrderOptions" :key="item.orderId" :label="item.transferNo"
+            :value="item.transferNo" />
         </el-select>
       </el-form-item>
       <el-form-item label="生效状态">
@@ -36,9 +36,15 @@
       </el-form-item>
     </el-form>
 
+    <div style="display: flex; align-items: center; gap: 10px;">
+      <el-checkbox v-model="refreshLabel" @change="handleRegularSearch">执行后重贴标签</el-checkbox>
+      <el-input v-if="refreshLabel" style="width: 200px" v-model="transferRemark" placeholder="输入重贴备注"></el-input>
+      <span v-if="refreshLabel">请填写重贴原因，不填则默认为：’调拨‘</span>
+    </div>
+
     <!-- 调拨表格, 显示调拨记录, 常规筛选作用下生效 -->
-    <TransferItemTable 
-      :data="transferList" :canEdit="false" :canConfirm="true" v-loading="loading" ref="transferItemTable" 
+    <TransferItemTable :data="transferList" :canEdit="false" :canConfirm="true" v-loading="loading"
+      ref="transferItemTable" :refreshLabel="refreshLabel" :transferRemark="transferRemark"
       @refreshData="handleRegularSearch"></TransferItemTable>
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -51,7 +57,7 @@
           <current-coil-no :currentCoilNo="coil.currentCoilNo"></current-coil-no>
           ({{ coil.enterCoilNo }})
           <span style="margin-left: 20px; font-size: 14px; font-weight: normal;">
-            {{ coil.dataType === 1 ? '当前卷' : '历史卷' }} | 
+            {{ coil.dataType === 1 ? '当前卷' : '历史卷' }} |
             {{ coil.status === 1 ? '已发货' : '未发货' }}
           </span>
         </h3>
@@ -65,7 +71,7 @@
           <el-descriptions-item label="材质">{{ coil.material || '-' }}</el-descriptions-item>
           <el-descriptions-item label="厂家">{{ coil.manufacturer || '-' }}</el-descriptions-item>
         </el-descriptions>
-        <TransferItemTable :data="coil.transferRecords" :canEdit="false"></TransferItemTable>
+        <TransferItemTable :data="coil.transferRecords" :canEdit="false" :refreshLabel="refreshLabel" :transferRemark="transferRemark"></TransferItemTable>
       </div>
     </el-dialog>
   </div>
@@ -89,6 +95,8 @@ export default {
         currentCoilNo: '',
         enterCoilNo: '',
       },
+      refreshLabel: false,
+      transferRemark: '',
       queryParams: {
         warehouseIdBefore: '',
         warehouseIdAfter: '',
@@ -143,7 +151,7 @@ export default {
             })
           );
           this.tracedCoils = tracedCoilsData.filter(coil => coil.transferRecords.length > 0);
-          
+
         } else {
           this.$message.info('未找到符合条件的钢卷');
         }
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java
index 82e54384..40a70030 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java
@@ -82,4 +82,6 @@ public class WmsTransferOrderItemBo extends BaseEntity {
     // 修改之后的itemType
     private String itemTypeAfter;
 
+    // 重贴标签的备注
+    private String transferRemark;
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java
index abbd2561..a97153a3 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java
@@ -589,11 +589,14 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer
         coil.setWarehouseId(finalWarehouseId);
 
         // 设置调拨类型
-        if (item.getTransferId() != null) {
-            WmsTransferOrder wmsTransferOrder = wmsTransferOrderMapper.selectById(item.getTransferId());
-            if (wmsTransferOrder != null) {
-                coil.setTransferType(wmsTransferOrder.getTransferType());
-            }
+//        if (item.getTransferId() != null) {
+//            WmsTransferOrder wmsTransferOrder = wmsTransferOrderMapper.selectById(item.getTransferId());
+//            if (wmsTransferOrder != null) {
+//                coil.setTransferType(wmsTransferOrder.getTransferType());
+//            }
+//        }
+        if (bo.getTransferRemark() != null) {
+            coil.setTransferType(bo.getTransferRemark());
         }
         coilMapper.updateById(coil);