feat: 增加调拨单审批功能及界面优化

fix(调拨单): 修正审批状态校验逻辑
feat(调拨单): 添加审批API接口
refactor(调拨单明细): 重构表格组件支持不同状态操作
style(调拨单): 优化界面显示和操作按钮
perf(发货单): 自动设置发货时间为当前时间
chore: 删除无用调拨记录页面

klp-ui/src/api/wms/transferOrder.js

@@ -42,3 +42,11 @@ export function delTransferOrder(orderId) {
     method: 'delete'
   })
 }
+
+// 审批调拨单
+export function approveTransferOrder(orderId, status) {
+  return request({
+    url: '/wms/transferOrder/approve/' + orderId + '/' + status,
+    method: 'put'
+  })
+}

klp-ui/src/views/crm/coil/index.vue

@@ -146,7 +146,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 99,
+        pageSize: 99999,
         status: 0,
         dateType: 1,
         warehouseId: undefined,

klp-ui/src/views/wms/delivery/waybill/index.vue

@@ -509,6 +509,8 @@ export default {
         if (this.selectedPlan.planName) {
           this.form.waybillName = `发货单_${this.selectedPlan.planName}`;
         }
+        // deliveryTime设置为当前时间，格式为yyyy-MM-dd HH:mm:ss，北京时间，
+        this.form.deliveryTime = this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}');
       }
       this.open = true;
       this.title = "添加发货单";

klp-ui/src/views/wms/move/batch.vue

@@ -25,6 +25,18 @@
           placeholder="请选择实际调拨时间">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="调拨类型" prop="transferType">
+        <dict-select v-model="queryParams.transferType" dict-type="coil_move_type" placeholder="请选择调拨类型" clearable>
+        </dict-select>
+      </el-form-item>
+      <el-form-item label="审批状态" prop="approveStatus">
+        <el-select v-model="queryParams.approveStatus" placeholder="请选择审批状态" clearable>
+          <el-option label="未申请" :value="'0'" />
+          <el-option label="待审批" :value="'1'" />
+          <el-option label="已通过" :value="'2'" />
+          <el-option label="已驳回" :value="'3'" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -83,6 +95,21 @@
           <span>{{ parseTime(scope.row.transferTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="调拨类型" align="center" prop="transferType" width="120"></el-table-column>
+       <el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
+        <template slot-scope="scope">
+          <el-tag :type="getapproveStatusType(scope.row.approveStatus)">
+            {{ getapproveStatusText(scope.row.approveStatus) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批人" align="center" prop="approver" />
+     
+      <el-table-column label="审批时间" align="center" prop="approveTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ scope.row.approveTime ? parseTime(scope.row.approveTime, '{y}-{m}-{d} {h}:{i}') : '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -97,13 +124,55 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            :disabled="!canEdit(scope.row)"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            :disabled="!canDelete(scope.row)"
           >删除</el-button>
+          <el-button
+            size="mini"
+            plain
+            type="text"
+            @click="handleSubmitapprove(scope.row)"
+            v-if="(scope.row.approveStatus || '0') == '0'"
+            icon="el-icon-check"
+          >提交</el-button>
+          <el-button
+            size="mini"
+            plain
+            type="text"
+            @click="handleWithdrawapprove(scope.row)"
+            v-if="scope.row.approveStatus == '1'"
+            icon="el-icon-refresh"
+          >撤回</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            plain
+            @click="handleReSubmit(scope.row)"
+            v-if="scope.row.approveStatus == '3' || scope.row.approveStatus == '2'"
+            icon="el-icon-refresh"
+          >重新提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-hasPermi="['coil:move:approval']"
+            @click="handleResolve(scope.row)"
+            icon="el-icon-check"
+            v-if="scope.row.approveStatus == '1'"
+          >通过</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-hasPermi="['coil:move:approval']"
+            @click="handleReject(scope.row)"
+            v-if="scope.row.approveStatus == '1'"
+            icon="el-icon-close"
+          >驳回</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -133,6 +202,10 @@
             placeholder="请选择调拨时间">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="调拨类型" prop="transferType">
+          <dict-select v-model="form.transferType" dict-type="coil_move_type" placeholder="请选择调拨类型" clearable>
+          </dict-select>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -147,15 +220,16 @@
       <div style="margin-bottom: 10px; display: flex; align-items: center;">
         <el-button icon="el-icon-download" type="warning" plain @click="handleExportDetail">导出</el-button>
         <el-button style="margin-right: 10px;" icon="el-icon-refresh" type="success" plain @click="handleRefreshDetailList">刷新</el-button>
-        <coil-selector v-loading="buttonLoading" ref="coilSelector" multiple @confirm="handleCoilChange"></coil-selector>
+        <el-button :loading="buttonLoading" style="margin-right: 10px;" icon="el-icon-check" type="primary" plain @click="handleConfirmAll" v-if="currentOrderStatus == '2'">执行全部</el-button>
+        <coil-selector v-loading="buttonLoading" ref="coilSelector" multiple @confirm="handleCoilChange" v-if="canAddCoils"></coil-selector>
       </div>
-      <transfer-item-table :data="transferOrderItems" @refreshData="getDetailList" />
+      <transfer-item-table ref="transferItemTable" :data="transferOrderItems" @refreshData="getDetailList" :orderStatus="currentOrderStatus" :canEdit="canAddCoils" />
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listTransferOrder, getTransferOrder, delTransferOrder, addTransferOrder, updateTransferOrder } from "@/api/wms/transferOrder";
+import { listTransferOrder, getTransferOrder, delTransferOrder, addTransferOrder, updateTransferOrder, approveTransferOrder } from "@/api/wms/transferOrder";
 import { listTransferOrderItem, batchAddTransferOrderItem } from "@/api/wms/transferOrderItem";
 import CoilSelector from "@/components/CoilSelector";
 import TransferItemTable from "@/views/wms/move/components/tranferItemTable.vue";
@@ -196,6 +270,7 @@ export default {
         transferName: undefined,
         transferStatus: undefined,
         transferTime: undefined,
+        approveStatus: undefined,
       },
       // 表单参数
       form: {},
@@ -220,6 +295,10 @@ export default {
       // 调拨单明细表格数据
       transferOrderItems: [],
       currentOrderId: undefined,
+      // 是否可以添加钢卷
+      canAddCoils: false,
+      // 当前审批状态
+      currentOrderStatus: undefined,
     };
   },
   created() {
@@ -235,6 +314,124 @@ export default {
         this.loading = false;
       });
     },
+    handleResolve(row) {
+      approveTransferOrder(row.orderId, '2').then(response => {
+        this.$modal.msgSuccess('审批成功');
+        this.getList();
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    handleReject(row) {
+      approveTransferOrder(row.orderId, '3').then(response => {
+        this.$modal.msgSuccess('审批成功');
+        this.getList();
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 获取审批状态文本 */
+    getapproveStatusText(status) {
+      // 如果没有状态字段，则视为未提交
+      if (!status) {
+        return '未申请';
+      }
+      const statusMap = {
+        '0': '未申请',
+        '1': '待审批',
+        '2': '已通过',
+        '3': '已驳回'
+      };
+      return statusMap[status] || '未申请';
+    },
+    /** 获取审批状态标签类型 */
+    getapproveStatusType(status) {
+      // 如果没有状态字段，则视为未提交
+      if (!status) {
+        return 'info';
+      }
+      const typeMap = {
+        '0': 'info',
+        '1': 'warning',
+        '2': 'success',
+        '3': 'danger'
+      };
+      return typeMap[status] || 'info';
+    },
+    /** 判断是否可以编辑 */
+    canEdit(row) {
+      // 如果没有状态字段，则视为未提交
+      const status = row.approveStatus || '0';
+      return status === '0' || status === '1' || status === '3';
+    },
+    /** 判断是否可以删除 */
+    canDelete(row) {
+      // 如果没有状态字段，则视为未提交
+      const status = row.approveStatus || '0';
+      return status === '0';
+    },
+    /** 提交审批 */
+    handleSubmitapprove(row) {
+      this.$confirm('确定要提交审批吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.loading = true;
+        updateTransferOrder({
+          ...row,
+          approveStatus: '1',
+        }).then(response => {
+          this.$modal.msgSuccess('提交审批成功');
+          this.getList();
+        }).finally(() => {
+          this.loading = false;
+        });
+      });
+    },
+    /** 撤回审批 */
+    handleWithdrawapprove(row) {
+      this.$confirm('确定要撤回审批吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.loading = true;
+        updateTransferOrder({
+          ...row,
+          approveStatus: '0',
+        }).then(response => {
+          this.$modal.msgSuccess('撤回审批成功');
+          this.getList();
+        }).finally(() => {
+          this.loading = false;
+        });
+      });
+    },
+    /** 重新提交 */
+    handleReSubmit(row) {
+      this.$confirm('确定要重新提交审批吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'info'
+      }).then(() => {
+        this.loading = true;
+        // 这里需要调用重新提交的API
+        // 假设API为reSubmitapprove
+        // reSubmitapprove(row.orderId).then(response => {
+        //   this.$modal.msgSuccess('重新提交成功');
+        //   this.getList();
+        // }).finally(() => {
+        //   this.loading = false;
+        // });
+        // 模拟API调用
+        setTimeout(() => {
+          this.loading = false;
+          this.$modal.msgSuccess('重新提交成功');
+          this.getList();
+        }, 1000);
+      });
+    },
     /** 刷新调拨单明细列表 */
     handleRefreshDetailList() {
       this.getDetailList();
@@ -354,24 +551,27 @@ export default {
       this.reset();
     },
     // 表单重置
-    reset() {
+      reset() {
-      this.form = {
+        this.form = {
-        orderId: undefined,
+          orderId: undefined,
-        transferNo: undefined,
+          transferNo: undefined,
-        transferName: undefined,
+          transferName: undefined,
-        transferStatus: undefined,
+          transferStatus: undefined,
-        transferTime: undefined,
+          transferTime: undefined,
-        remark: undefined,
+          remark: undefined,
-        delFlag: undefined,
+          delFlag: undefined,
-        createBy: undefined,
+          createBy: undefined,
-        updateBy: undefined,
+          updateBy: undefined,
-        createTime: undefined,
+          createTime: undefined,
-        updateTime: undefined
+          updateTime: undefined,
-      };
+          approveStatus: '0',
-      this.resetForm("form");
+          approver: undefined,
-    },
+          approveTime: undefined
+        };
+        this.resetForm("form");
+      },
     getDetailList() {
-      this.handleView({ orderId: this.currentOrderId });
+      this.handleView({ orderId: this.currentOrderId, approveStatus: this.currentOrderStatus });
     },
     /** 查看按钮操作 */
     handleView(row) {
@@ -379,6 +579,10 @@ export default {
       this.detailLoading = true;
       this.detailOpen = true;
       this.currentOrderId = row.orderId;
+      // 根据审批状态设置是否可以添加钢卷，如果没有状态字段，则视为未提交
+      const status = row.approveStatus || '0';
+      this.currentOrderStatus = status;
+      this.canAddCoils = status === '0';
       listTransferOrderItem({ transferId: row.orderId }).then(response => {
         console.log(response.rows);
         this.transferOrderItems = response.rows;
@@ -483,6 +687,15 @@ export default {
       this.download('wms/transferOrder/export', {
         ...this.queryParams
       }, `transferOrder_${new Date().getTime()}.xlsx`)
+    },
+    /** 执行全部调拨 */
+    handleConfirmAll() {
+      if (this.$refs.transferItemTable) {
+        this.buttonLoading = true;
+        this.$refs.transferItemTable.handleConfirmAll().finally(() => {
+          this.buttonLoading = false;
+        });
+      }
     }
   }
 };

klp-ui/src/views/wms/move/components/tranferItemTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-table :data="tableData" style="width: 100%" border>
+  <el-table :data="tableData" style="width: 100%" border v-loading="confirmLoading">
     <el-table-column prop="coilId" label="钢卷号">
       <template slot-scope="scope">
         <CoilNo :coil-no="scope.row.coil.enterCoilNo" :coil="scope.row.coil" />
@@ -25,19 +25,19 @@
 
     <el-table-column prop="materialTypeAfter" label="调拨后类型" width="100">
       <template slot-scope="scope">
-        <el-select v-if="!scope.row.isConfirmed" v-model="scope.row.materialTypeAfter"
+        <el-select v-if="!scope.row.isConfirmed && canEdit" v-model="scope.row.materialTypeAfter"
           @change="handleMaterialChange(scope.row)" placeholder="请选择">
           <el-option label="原料" :value="1" />
           <el-option label="产品" :value="2" />
         </el-select>
-        <div v-else slot-scope="scope">
+        <div v-else>
           {{ scope.row.materialTypeAfter == '1' ? '原料' : '产品' }}
         </div>
       </template>
     </el-table-column>
     <el-table-column prop="itemIdAfter" v-loading="materialLoading" label="调拨后物料" width="260">
       <template slot-scope="scope">
-        <div v-loading="materialLoading" v-if="!scope.row.isConfirmed">
+        <div v-loading="materialLoading" v-if="!scope.row.isConfirmed && canEdit">
           <RawMaterialSelect v-model="scope.row.itemIdAfter" v-if="scope.row.materialTypeAfter == '1'" />
           <ProductSelect v-model="scope.row.itemIdAfter" v-else-if="scope.row.materialTypeAfter == '2'" />
         </div>
@@ -49,7 +49,7 @@
     </el-table-column>
     <el-table-column prop="warehouseIdAfter" label="调拨后库区" width="200">
       <template slot-scope="scope">
-        <el-select v-if="!scope.row.isConfirmed" v-model="scope.row.warehouseIdAfter" placeholder="请选择">
+        <el-select v-if="!scope.row.isConfirmed && canEdit" v-model="scope.row.warehouseIdAfter" placeholder="请选择">
           <el-option v-for="item in warehouseList" :disabled="!item.isEnabled" :key="item.warehouseId"
             :label="item.warehouseName" :value="item.warehouseId" />
         </el-select>
@@ -61,17 +61,25 @@
 
     <el-table-column type="action" label="操作" width="180">
       <template slot-scope="scope">
-        <el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleConfirm(scope.row)"
+        <div v-if="orderStatus == 0">
-          :loading="buttonLoading">确认</el-button>
+          <el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleUpdate(scope.row)"
-        <el-button icon="el-icon-close" size="mini" @click="handleCancel(scope.row)"
+            :loading="buttonLoading">保存</el-button>
-          :loading="buttonLoading">取消</el-button>
+          <el-button icon="el-icon-close" size="mini" @click="handleCancel(scope.row)"
+            :loading="buttonLoading">删除</el-button>
+        </div>
+        <div v-else>
+          <el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleConfirm(scope.row)"
+            :loading="buttonLoading" :disabled="orderStatus != '2'">执行</el-button>
+          <!-- <el-button icon="el-icon-close" size="mini" @click="handleCancel(scope.row)"
+            :loading="buttonLoading" :disabled="orderStatus !== '2'">取消</el-button> -->
+        </div>
       </template>
     </el-table-column>
   </el-table>
 </template>
 
 <script>
-import { matchOrCreateMaterial, confirmTransferOrderItem, cancelTransferOrderItem } from '@/api/wms/transferOrderItem'
+import { matchOrCreateMaterial, confirmTransferOrderItem, cancelTransferOrderItem, updateTransferOrderItem } from '@/api/wms/transferOrderItem'
 import ProductSelect from "@/components/KLPService/ProductSelect";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
 import { listWarehouse } from '@/api/wms/warehouse';
@@ -84,6 +92,14 @@ export default {
     data: {
       type: Array,
       default: () => []
+    },
+    canEdit: {
+      type: Boolean,
+      default: false
+    },
+    orderStatus: {
+      type: String,
+      default: ''
     }
   },
   components: {
@@ -99,7 +115,8 @@ export default {
       tableData: [],
       materialLoading: false,
       warehouseList: [],
-      buttonLoading: false
+      buttonLoading: false,
+      confirmLoading: false,
     }
   },
   mounted() {
@@ -111,8 +128,8 @@ export default {
         if (newVal !== oldVal) {
           // 预处理数据
           this.tableData = newVal.map(item => {
-            const isConfirmed = this.isConfirmed(item);
+            const isEmpty = this.isEmpty(item);
-            if (isConfirmed) {
+            if (isEmpty) {
               return {
                 ...item,
                 oBefore: {
@@ -131,7 +148,7 @@ export default {
                   surfaceTreatmentDesc: item.surfaceTreatmentAfter,
                   zincLayer: item.zincLayerAfter
                 },
-                isConfirmed: true
+                isConfirmed: this.isConfirmed(item)
               }
             } else {
               return {
@@ -148,7 +165,7 @@ export default {
                 itemIdAfter: item.itemIdBefore,
                 warehouseIdAfter: item.warehouseIdBefore,
                 materialTypeAfter: item.materialTypeBefore,
-                isConfirmed: false
+                isConfirmed: this.isConfirmed(item)
               }
             }
           });
@@ -167,8 +184,23 @@ export default {
     // 是否是已调拨状态
     isConfirmed(item) {
       // 只有三个after字段有值，才认为是已调拨状态
+      // return item && item.itemIdAfter && item.warehouseIdAfter && item.materialTypeAfter
+      return item.isTransferred == 1
+    },
+    // isEmpty 是否为空
+    isEmpty(item) {
       return item && item.itemIdAfter && item.warehouseIdAfter && item.materialTypeAfter
     },
+    handleUpdate(row) {
+      updateTransferOrderItem(row).then(res => {
+        this.$message({
+          message: '保存成功',
+          type: 'success'
+        })
+        // 刷新数据
+        this.$emit('refreshData')
+      })
+    },
     // 确认调拨
     handleConfirm(item) {
       this.buttonLoading = true
@@ -185,6 +217,35 @@ export default {
         this.buttonLoading = false
       })
     },
+    handleConfirmAll() {
+      const unconfirmedItems = this.tableData.filter(item => !item.isConfirmed && !item.isTransferred);
+      if (unconfirmedItems.length === 0) {
+        this.$message({ message: '没有可执行的调拨项', type: 'info' });
+        return;
+      }
+      
+      this.buttonLoading = true;
+      const promises = unconfirmedItems.map(item => confirmTransferOrderItem(item));
+      this.confirmLoading = true;
+      return Promise.all(promises).then(results => {
+        const successCount = results.filter(res => res.code === 200).length;
+        if (successCount > 0) {
+          this.$message({
+            message: `成功执行 ${successCount} 项调拨`,
+            type: 'success'
+          });
+          this.$emit('refreshData');
+        }
+      }).catch(error => {
+        this.$message({
+          message: '执行调拨时发生错误',
+          type: 'error'
+        });
+      }).finally(() => {
+        this.buttonLoading = false;
+        this.confirmLoading = false;
+      });
+    },
     // 取消调拨
     handleCancel(item) {
       this.$confirm('确认取消调拨吗？', '提示', {

klp-ui/src/views/wms/move/record.vue

@@ -1,359 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="钢卷id" prop="coilId">
-        <el-input
-          v-model="queryParams.coilId"
-          placeholder="请输入钢卷id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调拨前itemId" prop="itemIdBefore">
-        <el-input
-          v-model="queryParams.itemIdBefore"
-          placeholder="请输入调拨前itemId"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调拨后itemId" prop="itemIdAfter">
-        <el-input
-          v-model="queryParams.itemIdAfter"
-          placeholder="请输入调拨后itemId"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="修改前物料类型 1-原料 2-成品" prop="materialTypeBefore">
-        <el-input
-          v-model="queryParams.materialTypeBefore"
-          placeholder="请输入修改前物料类型 1-原料 2-成品"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="修改后物料类型 1-原料 2-成品" prop="materialTypeAfter">
-        <el-input
-          v-model="queryParams.materialTypeAfter"
-          placeholder="请输入修改后物料类型 1-原料 2-成品"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调拨前逻辑库区ID" prop="warehouseIdBefore">
-        <el-input
-          v-model="queryParams.warehouseIdBefore"
-          placeholder="请输入调拨前逻辑库区ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调拨后逻辑库区ID" prop="warehouseIdAfter">
-        <el-input
-          v-model="queryParams.warehouseIdAfter"
-          placeholder="请输入调拨后逻辑库区ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <TransferItemTable :data="list" />
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改调拨单明细对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="关联调拨单ID" prop="transferId">
-          <el-input v-model="form.transferId" placeholder="请输入关联调拨单ID" />
-        </el-form-item>
-        <el-form-item label="钢卷id" prop="coilId">
-          <el-input v-model="form.coilId" placeholder="请输入钢卷id" />
-        </el-form-item>
-        <el-form-item label="调拨前itemId" prop="itemIdBefore">
-          <el-input v-model="form.itemIdBefore" placeholder="请输入调拨前itemId" />
-        </el-form-item>
-        <el-form-item label="调拨后itemId" prop="itemIdAfter">
-          <el-input v-model="form.itemIdAfter" placeholder="请输入调拨后itemId" />
-        </el-form-item>
-        <el-form-item label="修改前物料类型 1-原料 2-成品" prop="materialTypeBefore">
-          <el-input v-model="form.materialTypeBefore" placeholder="请输入修改前物料类型 1-原料 2-成品" />
-        </el-form-item>
-        <el-form-item label="修改后物料类型 1-原料 2-成品" prop="materialTypeAfter">
-          <el-input v-model="form.materialTypeAfter" placeholder="请输入修改后物料类型 1-原料 2-成品" />
-        </el-form-item>
-        <el-form-item label="调拨前逻辑库区ID" prop="warehouseIdBefore">
-          <el-input v-model="form.warehouseIdBefore" placeholder="请输入调拨前逻辑库区ID" />
-        </el-form-item>
-        <el-form-item label="调拨后逻辑库区ID" prop="warehouseIdAfter">
-          <el-input v-model="form.warehouseIdAfter" placeholder="请输入调拨后逻辑库区ID" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listTransferOrderItem, getTransferOrderItem, delTransferOrderItem, addTransferOrderItem, updateTransferOrderItem } from "@/api/wms/transferOrderItem";
-import TransferItemTable from "./components/tranferItemTable.vue";
-
-export default {
-  name: "TransferOrderItem",
-  components: {
-    TransferItemTable,
-  },
-  data() {
-    return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 调拨单明细表格数据
-      transferOrderItemList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        transferId: undefined,
-        coilId: undefined,
-        itemIdBefore: undefined,
-        itemIdAfter: undefined,
-        materialTypeBefore: undefined,
-        materialTypeAfter: undefined,
-        warehouseIdBefore: undefined,
-        warehouseIdAfter: undefined,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        orderItemId: [
-          { required: true, message: "调拨明细主键ID不能为空", trigger: "blur" }
-        ],
-        transferId: [
-          { required: true, message: "关联调拨单ID不能为空", trigger: "blur" }
-        ],
-        coilId: [
-          { required: true, message: "钢卷id不能为空", trigger: "blur" }
-        ],
-        itemIdBefore: [
-          { required: true, message: "调拨前itemId不能为空", trigger: "blur" }
-        ],
-        itemIdAfter: [
-          { required: true, message: "调拨后itemId不能为空", trigger: "blur" }
-        ],
-        materialTypeBefore: [
-          { required: true, message: "修改前物料类型 1-原料 2-成品不能为空", trigger: "blur" }
-        ],
-        materialTypeAfter: [
-          { required: true, message: "修改后物料类型 1-原料 2-成品不能为空", trigger: "blur" }
-        ],
-        warehouseIdBefore: [
-          { required: true, message: "调拨前逻辑库区ID不能为空", trigger: "blur" }
-        ],
-        warehouseIdAfter: [
-          { required: true, message: "调拨后逻辑库区ID不能为空", trigger: "blur" }
-        ],
-        remark: [
-          { required: true, message: "备注不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询调拨单明细列表 */
-    getList() {
-      this.loading = true;
-      listTransferOrderItem(this.queryParams).then(response => {
-        this.transferOrderItemList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        orderItemId: undefined,
-        transferId: undefined,
-        coilId: undefined,
-        itemIdBefore: undefined,
-        itemIdAfter: undefined,
-        materialTypeBefore: undefined,
-        materialTypeAfter: undefined,
-        warehouseIdBefore: undefined,
-        warehouseIdAfter: undefined,
-        remark: undefined,
-        delFlag: undefined,
-        createBy: undefined,
-        updateBy: undefined,
-        createTime: undefined,
-        updateTime: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.orderItemId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加调拨单明细";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const orderItemId = row.orderItemId || this.ids
-      getTransferOrderItem(orderItemId).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改调拨单明细";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.orderItemId != null) {
-            updateTransferOrderItem(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addTransferOrderItem(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const orderItemIds = row.orderItemId || this.ids;
-      this.$modal.confirm('是否确认删除调拨单明细编号为"' + orderItemIds + '"的数据项？').then(() => {
-        this.loading = true;
-        return delTransferOrderItem(orderItemIds);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('wms/transferOrderItem/export', {
-        ...this.queryParams
-      }, `transferOrderItem_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>

klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java

@@ -541,7 +541,7 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer
                 throw new IllegalArgumentException("调拨单不存在");
             }
             // 审批状态: 0-待审批 1-已通过 2-已驳回
-            if (wmsTransferOrder.getApproveStatus() == null || wmsTransferOrder.getApproveStatus() != 1) {
+            if (wmsTransferOrder.getApproveStatus() == null || wmsTransferOrder.getApproveStatus() != 2) {
                 throw new IllegalArgumentException("审批未通过，不能调拨");
             }
         }

klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderServiceImpl.java

@@ -141,7 +141,7 @@ public class WmsTransferOrderServiceImpl implements IWmsTransferOrderService {
         if (order == null) {
             throw new RuntimeException("调拨单不存在");
         }
-        if (order.getApproveStatus() != null && order.getApproveStatus() != 0) {
+        if (order.getApproveStatus() != null && order.getApproveStatus() != 1) {
             throw new RuntimeException("该调拨单已审批，不能重复审批");
         }
         order.setApproveStatus(approveStatus);