feat(wms): add transfer remark field and re-label function

1. 新增调拨备注字段transferRemark到调拨单itemBO
2. 新增执行后重贴标签的复选框和备注输入框
3. 调整调拨确认时传递调拨备注参数
4. 注释调旧的调拨类型获取逻辑，改用传入的调拨备注作为调拨类型

klp-ui/src/views/wms/hrm/attendance/drag.vue

@@ -17,7 +17,7 @@
 
     <!-- 排班表格 -->
     <div class="schedule-table-wrapper">
-      <el-table v-loading="loading" :data="scheduleData" border stripe>
+      <el-table v-loading="loading" :data="scheduleData" border stripe height="calc(100vh - 200px)">
         <!-- 员工列 -->
         <el-table-column prop="employeeName" label="员工" width="120" fixed="left" />
         <!-- 操作列 -->
@@ -116,8 +116,8 @@
             <span class="assignment-count">
               已分配 {{ item.employeeIds ? item.employeeIds.split(',').filter(id => id.trim()).length : 0 }} 人
             </span>
-            <el-button icon="el-icon-copy" size="mini" @click="copyShiftItem(index)"
+            <!-- <el-button icon="el-icon-copy" size="mini" @click="copyShiftItem(index)"
-              title="复制班次配置">复制</el-button>
+              title="复制班次配置">复制</el-button> -->
           </div>
           <EmployeeSelector
             v-model="item.employeeIds"
@@ -126,11 +126,11 @@
             placeholder="选择该班次的员工"
             title="选择班次员工" />
         </div>
-        <div class="quick-actions">
+        <!-- <div class="quick-actions">
           <el-button type="success" icon="el-icon-random" @click="quickAssignByDepartment">
             按部门自动分配
           </el-button>
-        </div>
+        </div> -->
       </div>
 
       <!-- 步骤3：确认生成 -->
@@ -152,7 +152,7 @@
           <el-button @click="prevStep">上一步</el-button>
         </template>
         <template v-if="currentStep < 3">
-          <el-button type="primary" @click="nextStep" :disabled="!canProceed">
+          <el-button type="primary" @click="nextStep" :disabled="!canProceed" :loading="buttonLoading">
             {{ currentStep === 1 ? '下一步：分配人员' : '下一步：确认' }}
           </el-button>
         </template>

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: '确认调拨成功',

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"
+          remote-method="remoteSearchTransferOrder" :remote-loading="transferOrderLoading" placeholder="请输入调拨单号搜索"
-          placeholder="请输入调拨单号搜索" @change="handleRegularSearch" style="width:220px">
+          @change="handleRegularSearch" style="width:220px">
-          <el-option v-for="item in transferOrderOptions" :key="item.orderId"
+          <el-option v-for="item in transferOrderOptions" :key="item.orderId" :label="item.transferNo"
-            :label="item.transferNo" :value="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 
+    <TransferItemTable :data="transferList" :canEdit="false" :canConfirm="true" v-loading="loading"
-      :data="transferList" :canEdit="false" :canConfirm="true" v-loading="loading" ref="transferItemTable" 
+      ref="transferItemTable" :refreshLabel="refreshLabel" :transferRemark="transferRemark"
       @refreshData="handleRegularSearch"></TransferItemTable>
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -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: '',

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;
 }

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) {
+//        if (item.getTransferId() != null) {
-            WmsTransferOrder wmsTransferOrder = wmsTransferOrderMapper.selectById(item.getTransferId());
+//            WmsTransferOrder wmsTransferOrder = wmsTransferOrderMapper.selectById(item.getTransferId());
-            if (wmsTransferOrder != null) {
+//            if (wmsTransferOrder != null) {
-                coil.setTransferType(wmsTransferOrder.getTransferType());
+//                coil.setTransferType(wmsTransferOrder.getTransferType());
-            }
+//            }
+//        }
+        if (bo.getTransferRemark() != null) {
+            coil.setTransferType(bo.getTransferRemark());
         }
         coilMapper.updateById(coil);