feat(调拨单): 新增调拨单管理功能

- 新增调拨单主表和明细表相关API接口
- 新增调拨单主表和明细表前端页面
- 新增钢卷选择器组件和调拨明细表格组件
- 修改产品信息和原料信息渲染组件支持更多字段
- 修改产品选择和原料选择组件支持数值类型值
- 修改钢卷号渲染组件支持更多字段和外部数据
- 新增调拨单匹配物料接口

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询调拨单主列表
+export function listTransferOrder(query) {
+  return request({
+    url: '/wms/transferOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询调拨单主详细
+export function getTransferOrder(orderId) {
+  return request({
+    url: '/wms/transferOrder/' + orderId,
+    method: 'get'
+  })
+}
+
+// 新增调拨单主
+export function addTransferOrder(data) {
+  return request({
+    url: '/wms/transferOrder',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改调拨单主
+export function updateTransferOrder(data) {
+  return request({
+    url: '/wms/transferOrder',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除调拨单主
+export function delTransferOrder(orderId) {
+  return request({
+    url: '/wms/transferOrder/' + orderId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,116 @@
+import request from '@/utils/request'
+
+// 查询调拨单明细列表
+export function listTransferOrderItem(query) {
+  return request({
+    url: '/wms/transferOrderItem/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询调拨单明细详细
+export function getTransferOrderItem(orderItemId) {
+  return request({
+    url: '/wms/transferOrderItem/' + orderItemId,
+    method: 'get'
+  })
+}
+
+// 新增调拨单明细
+export function addTransferOrderItem(data) {
+  return request({
+    url: '/wms/transferOrderItem',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改调拨单明细
+export function updateTransferOrderItem(data) {
+  return request({
+    url: '/wms/transferOrderItem',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除调拨单明细
+export function delTransferOrderItem(orderItemId) {
+  return request({
+    url: '/wms/transferOrderItem/' + orderItemId,
+    method: 'delete'
+  })
+}
+
+/**
+ * 同步物料信息
+ */
+export function matchOrCreateMaterial({ itemId, itemType }) {
+  if (!itemId || !itemType) {
+    return Promise.reject('参数错误')
+  }
+  
+  const data = {
+    itemId,
+    itemType
+  }
+  
+  return request({
+    url: '/wms/transferOrderItem/itemType/matchOrCreate',
+    method: 'get',
+    params: data
+  })
+}
+
+/**
+ * 批量新增调拨信息
+ */
+export function batchAddTransferOrderItem({ transferId, coilIds }) {
+  if (!transferId || !coilIds || coilIds.length === 0) {
+    return Promise.reject('参数错误')
+  }
+
+  const data = {
+    transferId,
+    coilIds
+  }
+
+  return request({
+    url: '/wms/transferOrderItem/batch',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 确认调拨
+ */
+export function confirmTransferOrderItem(item) {
+  if (!item.orderItemId) {
+    return Promise.reject('参数错误')
+  }
+
+  return request({
+    url: '/wms/transferOrderItem/confirm',
+    method: 'post',
+    data: item
+  })
+}
+
+/**
+ * 取消调拨
+ */
+export function cancelTransferOrderItem(orderItemId) {
+  if (!orderItemId) {
+    return Promise.reject('参数错误')
+  }
+
+  return request({
+    url: '/wms/transferOrderItem/cancel',
+    method: 'post',
+    params: {
+      orderItemId
+    }
+  })
+}

klp-ui/src/components/KLPService/ProductSelect/index.vue

@@ -153,7 +153,7 @@ export default {
   },
   props: {
     value: {
-      type: String,
+      type: [String, Number],
       default: ''
     },
     readonly: {
@@ -224,7 +224,7 @@ export default {
         this.selectedId = val || '';
         if (this.selectedId) {
           const res = await getProduct(this.selectedId);
-          if (res.code === 200) this.selectedRow = res.data;
+          if (res.code === 200 && res.data != null) this.selectedRow = res.data || {};
         } else {
           this.selectedRow = {};
         }
@@ -233,6 +233,7 @@ export default {
     dialogVisible(val) {
       if (val) {
         this.getList();
+        this.listRecentlySelected();
       }
     }
   },
@@ -408,10 +409,10 @@ export default {
       this.resetForm("form");
     },
   },
-  mounted() {
+  // mounted() {
-    this.listRecentlySelected();
+    
-    this.getList();
+  //   this.getList();
-  },
+  // },
 };
 </script>
 

klp-ui/src/components/KLPService/RawMaterialSelect/index.vue

@@ -139,7 +139,7 @@ export default {
   props: {
     // 绑定值：原材料ID 单选字符串格式
     value: {
-      type: String,
+      type: [String, Number],
       default: ''
     },
     // 是否只读
@@ -222,7 +222,7 @@ export default {
         // 有选中ID则获取详情赋值
         if (this.selectedId) {
           const res = await getRawMaterial(this.selectedId);
-          if (res.code === 200) this.selectedRow = res.data;
+          if (res.code === 200) this.selectedRow = res.data || {};
         } else {
           this.selectedRow = {};
         }
@@ -231,6 +231,7 @@ export default {
     // 弹窗打开时加载数据
     dialogVisible(val) {
       if (val) {
+        this.listRecentlySelected();
         this.getList();
       }
     }
@@ -417,10 +418,10 @@ export default {
       this.dialogVisible = false;
     }
   },
-  mounted() {
+  // mounted() {
-    this.listRecentlySelected();
+  //   this.listRecentlySelected();
-    this.getList();
+  //   this.getList();
-  }
+  // }
 };
 </script>
 

klp-ui/src/components/KLPService/Renderer/CoilNo.vue

@@ -2,7 +2,7 @@
   <div :class="{'g-coil-no': isGCoilNo}">
     <!-- 有coilId时显示popover，无则只显示标签 -->
     <el-popover
-      v-if="coilId"
+      v-if="coilId && coil.enterCoilNo"
       placement="left"
       width="200"
       trigger="hover"
@@ -73,6 +73,10 @@ export default {
       type: String,
       default: ''
     },
+    coil: {
+      type: Object,
+      default: () => {}
+    }
   },
   data() { // 修正：data应该是函数
     return {
@@ -84,37 +88,37 @@ export default {
       return this.coilNo && this.coilNo.startsWith('G');
     },
     specification() {
-      return this.coilInfo.specification || '-'
+      return this.coilInfo.specification || this.coil?.specification || '-'
     },
     itemName() {
-      return this.coilInfo.itemName || '-'
+      return this.coilInfo.itemName || this.coil?.itemName || '-'
     },
     material() {
-      return this.coilInfo.material || '-'
+      return this.coilInfo.material || this.coil?.material || '-'
     },
     manufacturer() {
-      return this.coilInfo.manufacturer || '-'
+      return this.coilInfo.manufacturer || this.coil?.manufacturer || '-'
     },
     currentCoilNo() {
-      return this.coilNo || this.coilInfo?.currentCoilNo || '-'
+      return this.coilNo || this.coil?.currentCoilNo || '-'
     },
     netWeight() {
-      return this.coilInfo.netWeight || '-'
+      return this.coilInfo.netWeight || this.coil?.netWeight || '-'
     },
     supplierCoilNo() {
-      return this.coilInfo.supplierCoilNo || '-'
+      return this.coilInfo.supplierCoilNo || this.coil?.supplierCoilNo || '-'
     },
     length() {
-      return this.coilInfo.length || '-'
+      return this.coilInfo.length || this.coil?.length || '-'
     },
     actualLength() {
-      return this.coilInfo.actualLength || '-'
+      return this.coilInfo.actualLength || this.coil?.actualLength || '-'
     },
     actualWidth() {
-      return this.coilInfo.actualWidth || '-'
+      return this.coilInfo.actualWidth || this.coil?.actualWidth || '-'
     },
     actualThickness() {
-      return this.coilInfo.actualThickness || '-'
+      return this.coilInfo.actualThickness || this.coil?.actualThickness || '-'
     },
   },
   methods: {
@@ -140,7 +144,7 @@ export default {
       if (newVal) {
         this.getCoilInfo();
       } else {
-        this.coilInfo = {};
+        this.coilInfo = this.coil || {};
       }
     }
   }

klp-ui/src/components/KLPService/Renderer/ProductInfo.vue

@@ -64,8 +64,8 @@ export default {
         return {};
       }
       return {
-        productId: this.product.itemId || '',
+        productId: this.product.itemId || this.product.productId || '',
-        productName: this.product.itemName || '',
+        productName: this.product.itemName || this.product.productName || '',
         // productCode: this.product.productCode || '',
         specification: this.product.specification || '',
         material: this.product.material || '',

klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue

@@ -51,8 +51,8 @@ export default {
         return {};
       }
       return {
-        rawMaterialId: this.material.itemId || '',
+        rawMaterialId: this.material.itemId || this.material.rawMaterialId || '',
-        rawMaterialName: this.material.itemName || '',
+        rawMaterialName: this.material.itemName || this.material.rawMaterialName || '',
         // rawMaterialCode: this.material.rawMaterialCode || '',
         specification: this.material.specification || '',
         material: this.material.material || '',

klp-ui/src/components/MemoInput/index.vue

@@ -1,7 +1,7 @@
 <template>
   <el-autocomplete class="inline-input" v-model="inputValue" :fetch-suggestions="querySearch" :placeholder="placeholder"
     :trigger-on-focus="triggerMode === 'focus'" @select="handleSelect" @change="handleInputChange"
-    clearable></el-autocomplete>
+    clearable :disabled="disabled"></el-autocomplete>
 </template>
 
 <script>
@@ -53,6 +53,11 @@ export default {
       type: String,
       default: 'focus',
       validator: (value) => ['focus', 'input'].includes(value)
+    },
+    // 是否禁用输入框，默认false
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

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

@@ -0,0 +1,371 @@
+<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="调拨单号" prop="transferNo">
+        <el-input
+          v-model="queryParams.transferNo"
+          placeholder="请输入调拨单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="调拨单名称" prop="transferName">
+        <el-input
+          v-model="queryParams.transferName"
+          placeholder="请输入调拨单名称，用于帮助记忆与沟通"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="调拨时间" prop="transferTime">
+        <el-date-picker clearable
+          v-model="queryParams.transferTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际调拨时间">
+        </el-date-picker>
+      </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>
+
+    <el-table v-loading="loading" :data="transferOrderList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="调拨单号" align="center" prop="transferNo" />
+      <el-table-column label="调拨单名称" align="center" prop="transferName" />
+      <el-table-column label="调拨状态" align="center" prop="transferStatus" />
+      <el-table-column label="调拨时间" align="center" prop="transferTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.transferTime, '{y}-{m}-{d}') }}</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">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <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="调拨单号" prop="transferNo">
+          <el-input v-model="form.transferNo" placeholder="请输入调拨单号" />
+        </el-form-item>
+        <el-form-item label="调拨单名称" prop="transferName">
+          <el-input v-model="form.transferName" placeholder="请输入调拨单名称，用于帮助记忆与沟通" />
+        </el-form-item>
+        <el-form-item label="调拨时间" prop="transferTime">
+          <el-date-picker clearable
+            v-model="form.transferTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择调拨时间">
+          </el-date-picker>
+        </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>
+
+    <el-dialog title="调拨单明细" v-loading="detailLoading" :visible.sync="detailOpen" fullscreen>
+      <coil-selector v-loading="buttonLoading" ref="coilSelector" multiple @confirm="handleCoilChange"></coil-selector>
+      <transfer-item-table :data="transferOrderItems" @refreshData="getDetailList" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listTransferOrder, getTransferOrder, delTransferOrder, addTransferOrder, updateTransferOrder } 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";
+
+export default {
+  name: "TransferOrder",
+  components: {
+    CoilSelector,
+    TransferItemTable,
+  },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 调拨单主表格数据
+      transferOrderList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        transferNo: undefined,
+        transferName: undefined,
+        transferStatus: undefined,
+        transferTime: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        orderId: [
+          { required: true, message: "调拨单主键ID不能为空", trigger: "blur" }
+        ],
+        transferNo: [
+          { required: true, message: "调拨单号不能为空", trigger: "blur" }
+        ],
+        transferTime: [
+          { required: true, message: "实际调拨时间不能为空", trigger: "blur" }
+        ],
+        remark: [
+          { required: true, message: "备注不能为空", trigger: "blur" }
+        ],
+      },
+      // 详情弹窗loading
+      detailLoading: false,
+      detailOpen: false,
+      // 调拨单明细表格数据
+      transferOrderItems: [],
+      currentOrderId: undefined,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询调拨单主列表 */
+    getList() {
+      this.loading = true;
+      listTransferOrder(this.queryParams).then(response => {
+        this.transferOrderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 钢卷选择器改变 */
+    handleCoilChange(coils) {
+      console.log(coils);
+      this.buttonLoading = true;
+      batchAddTransferOrderItem({
+        transferId: this.currentOrderId,
+        coilIds: coils.map(item => item.coilId)
+      }).then(response => {
+        this.$message({
+          message: "添加成功",
+          type: "success"
+        });
+        this.buttonLoading = false;
+        this.handleView({ orderId: this.currentOrderId });
+      }).catch(() => {
+        this.buttonLoading = false;
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        orderId: undefined,
+        transferNo: undefined,
+        transferName: undefined,
+        transferStatus: undefined,
+        transferTime: undefined,
+        remark: undefined,
+        delFlag: undefined,
+        createBy: undefined,
+        updateBy: undefined,
+        createTime: undefined,
+        updateTime: undefined
+      };
+      this.resetForm("form");
+    },
+    getDetailList() {
+      this.handleView({ orderId: this.currentOrderId });
+    },
+    /** 查看按钮操作 */
+    handleView(row) {
+      // 查看调拨单明细
+      this.detailLoading = true;
+      this.detailOpen = true;
+      this.currentOrderId = row.orderId;
+      listTransferOrderItem({ transferId: row.orderId }).then(response => {
+        console.log(response.rows);
+        this.transferOrderItems = response.rows;
+        this.detailLoading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.orderId)
+      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 orderId = row.orderId || this.ids
+      getTransferOrder(orderId).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.orderId != null) {
+            updateTransferOrder(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addTransferOrder(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const orderIds = row.orderId || this.ids;
+      this.$modal.confirm('是否确认删除调拨单主编号为"' + orderIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delTransferOrder(orderIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/transferOrder/export', {
+        ...this.queryParams
+      }, `transferOrder_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -0,0 +1,227 @@
+<template>
+  <el-table :data="tableData" style="width: 100%" border>
+    <el-table-column prop="coilId" label="钢卷号">
+      <template slot-scope="scope">
+        <CoilNo :coil-no="scope.row.coil.enterCoilNo" :coil="scope.row.coil" />
+      </template>
+    </el-table-column>
+    <el-table-column prop="coilId" label="当前钢卷号">
+      <template slot-scope="scope">
+        <current-coil-no :current-coil-no="scope.row.coil.currentCoilNo" />
+      </template>
+    </el-table-column>
+    <el-table-column prop="materialTypeBefore" label="调拨前类型" width="100">
+      <template slot-scope="scope">
+        {{ scope.row.materialTypeBefore == '1' ? '原料' : '产品' }}
+      </template>
+    </el-table-column>
+    <el-table-column prop="itemIdBefore" label="调拨前物料" width="260">
+      <template slot-scope="scope">
+        <ProductInfo v-if="scope.row.materialTypeBefore == '2'" :product="scope.row.oBefore" />
+        <RawMaterialInfo v-else-if="scope.row.materialTypeBefore == '1'" :material="scope.row.oBefore" />
+      </template>
+    </el-table-column>
+    <el-table-column prop="warehouseNameBefore" label="调拨前库区" width="180" />
+
+    <el-table-column prop="materialTypeAfter" label="调拨后类型" width="100">
+      <template slot-scope="scope">
+        <el-select v-if="!scope.row.isConfirmed" 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">
+          {{ 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">
+          <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>
+        <div v-else>
+          <ProductInfo v-if="scope.row.materialTypeAfter == '2'" :product="scope.row.oAfter" />
+          <RawMaterialInfo v-else-if="scope.row.materialTypeAfter == '1'" :material="scope.row.oAfter" />
+        </div>
+      </template>
+    </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-option v-for="item in warehouseList" :disabled="!item.isEnabled" :key="item.warehouseId"
+            :label="item.warehouseName" :value="item.warehouseId" />
+        </el-select>
+        <div v-else>
+          {{ scope.row.warehouseNameAfter }}
+        </div>
+      </template>
+    </el-table-column>
+
+    <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)"
+          :loading="buttonLoading">确认</el-button>
+        <el-button icon="el-icon-close" size="mini" @click="handleCancel(scope.row)"
+          :loading="buttonLoading">取消</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+import { matchOrCreateMaterial, confirmTransferOrderItem, cancelTransferOrderItem } from '@/api/wms/transferOrderItem'
+import ProductSelect from "@/components/KLPService/ProductSelect";
+import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
+import { listWarehouse } from '@/api/wms/warehouse';
+import CoilNo from "@/components/KLPService/Renderer/CoilNo";
+import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
+import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
+
+export default {
+  props: {
+    data: {
+      type: Array,
+      default: () => []
+    }
+  },
+  components: {
+    // WarehouseSelect,
+    ProductSelect,
+    RawMaterialSelect,
+    CoilNo,
+    ProductInfo,
+    RawMaterialInfo
+  },
+  data() {
+    return {
+      tableData: [],
+      materialLoading: false,
+      warehouseList: [],
+      buttonLoading: false
+    }
+  },
+  mounted() {
+    this.getWarehouseList()
+  },
+  watch: {
+    data: {
+      handler(newVal, oldVal) {
+        if (newVal !== oldVal) {
+          // 预处理数据
+          this.tableData = newVal.map(item => {
+            const isConfirmed = this.isConfirmed(item);
+            if (isConfirmed) {
+              return {
+                ...item,
+                oBefore: {
+                  manufacturer: item.manufacturerBefore,
+                  specification: item.specificationBefore,
+                  material: item.materialBefore,
+                  itemName: item.materialNameBefore,
+                  surfaceTreatmentDesc: item.surfaceTreatmentBefore,
+                  zincLayer: item.zincLayerBefore
+                },
+                oAfter: {
+                  manufacturer: item.manufacturerAfter,
+                  specification: item.specificationAfter,
+                  material: item.materialAfter,
+                  itemName: item.materialNameAfter,
+                  surfaceTreatmentDesc: item.surfaceTreatmentAfter,
+                  zincLayer: item.zincLayerAfter
+                },
+                isConfirmed: true
+              }
+            } else {
+              return {
+                ...item,
+                oBefore: {
+                  manufacturer: item.manufacturerBefore,
+                  specification: item.specificationBefore,
+                  material: item.materialBefore,
+                  itemName: item.materialNameBefore,
+                  surfaceTreatmentDesc: item.surfaceTreatmentBefore,
+                  zincLayer: item.zincLayerBefore
+                },
+                // 将三个after字段设置为与before相同
+                itemIdAfter: item.itemIdBefore,
+                warehouseIdAfter: item.warehouseIdBefore,
+                materialTypeAfter: item.materialTypeBefore,
+                isConfirmed: false
+              }
+            }
+          });
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    // 获取库区列表
+    getWarehouseList() {
+      listWarehouse().then(res => {
+        this.warehouseList = res.data
+      })
+    },
+    // 是否是已调拨状态
+    isConfirmed(item) {
+      // 只有三个after字段有值，才认为是已调拨状态
+      return item && item.itemIdAfter && item.warehouseIdAfter && item.materialTypeAfter
+    },
+    // 确认调拨
+    handleConfirm(item) {
+      this.buttonLoading = true
+      confirmTransferOrderItem(item).then(res => {
+        if (res.code === 200) {
+          this.$message({
+            message: '确认调拨成功',
+            type: 'success'
+          })
+          // 刷新数据
+          this.$emit('refreshData')
+        }
+      }).finally(() => {
+        this.buttonLoading = false
+      })
+    },
+    // 取消调拨
+    handleCancel(item) {
+      this.$confirm('确认取消调拨吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.buttonLoading = true
+        cancelTransferOrderItem(item.orderItemId).then(res => {
+          if (res.code === 200) {
+            this.$message({
+              message: '取消调拨成功',
+              type: 'success'
+            })
+            // 刷新数据
+            this.$emit('refreshData')
+          }
+        }).finally(() => {
+          this.buttonLoading = false
+        })
+      })
+
+    },
+    handleMaterialChange(row) {
+      // 如果修改后是产品，说明切换前是原料
+      const itemType = row.materialTypeAfter == '1' ? 'product' : 'raw_material'
+      this.materialLoading = true
+      matchOrCreateMaterial({
+        itemType,
+        itemId: row.itemIdAfter
+      }).then(res => {
+        row.itemIdAfter = res.data
+        this.materialLoading = false
+      }).catch(() => {
+        this.materialLoading = false
+      })
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,359 @@
+<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/controller/WmsTransferOrderItemController.java

@@ -101,9 +101,9 @@ public class WmsTransferOrderItemController extends BaseController {
      * 根据itemId和itemType匹配或新增物料
      * itemType: raw_material-原料, product-成品
      */
-    @GetMapping("/matchOrCreate")
+    @GetMapping("/itemType/matchOrCreate")
-    public R<Long> matchOrCreateMaterial(@NotNull(message = "itemId不能为空") Long itemId,
+    public R<Long> matchOrCreateMaterial(@RequestParam @NotNull(message = "itemId不能为空") Long itemId,
-                                          @NotNull(message = "itemType不能为空") String itemType) {
+                                         @RequestParam @NotNull(message = "itemType不能为空") String itemType) {
         return R.ok(iWmsTransferOrderItemService.matchOrCreateMaterial(itemId, itemType));
     }