Merge remote-tracking branch 'gitee/0.8.X' into 0.8.X

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询实际库区/库位自关联列表
+export function listActualWarehouse(query) {
+  return request({
+    url: '/wms/actualWarehouse/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询实际库区/库位自关联详细
+export function getActualWarehouse(actualWarehouseId) {
+  return request({
+    url: '/wms/actualWarehouse/' + actualWarehouseId,
+    method: 'get'
+  })
+}
+
+// 新增实际库区/库位自关联
+export function addActualWarehouse(data) {
+  return request({
+    url: '/wms/actualWarehouse',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改实际库区/库位自关联
+export function updateActualWarehouse(data) {
+  return request({
+    url: '/wms/actualWarehouse',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除实际库区/库位自关联
+export function delActualWarehouse(actualWarehouseId) {
+  return request({
+    url: '/wms/actualWarehouse/' + actualWarehouseId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,120 @@
+<template>
+  <el-select
+    v-model="selected"
+    :placeholder="placeholder"
+    :clearable="clearable"
+    :disabled="disabled"
+    :size="size"
+    filterable
+    @change="onChange"
+    style="width: 100%"
+  >
+    <el-option
+      v-for="item in warehouseOptions"
+      :key="item.actualWarehouseId"
+      :label="item.actualWarehouseName"
+      :value="item.actualWarehouseId"
+    >
+      <span :style="{ paddingLeft: item.level * 20 + 'px' }">
+        {{ item.actualWarehouseName }}
+      </span>
+    </el-option>
+  </el-select>
+</template>
+
+<script>
+import { listActualWarehouse } from '@/api/wms/actualWarehouse';
+
+export default {
+  name: 'ActualWarehouseSelect',
+  props: {
+    value: {
+      type: [Number, String, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请选择实际库区/库位'
+    },
+    clearable: {
+      type: Boolean,
+      default: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    size: {
+      type: String,
+      default: 'mini'
+    },
+    showTop: {
+      type: Boolean,
+      default: false // 是否显示顶级节点
+    }
+  },
+  data() {
+    return {
+      warehouseOptions: [],
+      selected: this.value
+    };
+  },
+  watch: {
+    value(val) {
+      this.selected = val;
+    }
+  },
+  mounted() {
+    this.loadOptions();
+  },
+  methods: {
+    loadOptions() {
+      listActualWarehouse({ pageSize: 1000 }).then(response => {
+        console.log('实际库区/库位自关联API返回数据:', response);
+        const data = response.rows || [];
+        console.log('处理后的数据:', data);
+        // this.warehouseOptions = this.buildTreeOptions(data);
+        this.warehouseOptions = data;
+        console.log('构建的树形选项:', this.warehouseOptions);
+      }).catch(error => {
+        console.error("加载仓库选项失败:", error);
+        this.warehouseOptions = [];
+      });
+    },
+    buildTreeOptions(data, parentId = null, level = 0) {
+      const options = [];
+      
+      data.forEach(item => {
+        if (item.parentId === parentId) {
+          const option = {
+            warehouseId: item.warehouseId,
+            warehouseName: item.warehouseName,
+            level: level
+          };
+          
+          // 递归构建子节点
+          const children = this.buildTreeOptions(data, item.warehouseId, level + 1);
+          if (children.length > 0) {
+            options.push(option);
+            options.push(...children);
+          } else {
+            options.push(option);
+          }
+        }
+      });
+      
+      return options;
+    },
+    onChange(val) {
+      this.$emit('input', val);
+      this.$emit('change', val);
+    }
+  }
+};
+</script>
+
+<style scoped>
+.el-select {
+  width: 100%;
+}
+</style>

klp-ui/src/views/wms/coil/panels/DrillDownTable.vue

@@ -147,7 +147,7 @@ export default {
       };
 
       // 调用API获取数据
-      listMaterialCoil(params).then(res => {
+      listMaterialCoil({ ...params, dataType: 1 }).then(res => {
         this.list = res.rows || [];
         this.total = res.total || 0;
         this.loading = false;

klp-ui/src/views/wms/coil/panels/base.vue

@@ -18,6 +18,9 @@
       <el-form-item label="所在库位" prop="warehouseId" v-if="!hideWarehouseQuery">
         <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%; display: inline-block;" clearable />
       </el-form-item>
+      <el-form-item label="实际库区" prop="actualWarehouseId" v-if="!hideWarehouseQuery">
+        <actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择实际库位" style="width: 100%; display: inline-block;" clearable />
+      </el-form-item>
       <el-form-item label="厂家卷号" prop="supplierCoilNo">
         <el-input v-model="queryParams.supplierCoilNo" placeholder="请输入厂家原料卷号" clearable
           @keyup.enter.native="handleQuery" />
@@ -68,7 +71,8 @@
       <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo" />
       <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo" />
       <el-table-column label="厂家卷号" align="center" prop="supplierCoilNo" />
-      <el-table-column label="仓库" align="center" prop="warehouseName" v-if="!hideWarehouseQuery"/>
+      <el-table-column label="逻辑库位" align="center" prop="warehouseName" v-if="!hideWarehouseQuery"/>
+      <el-table-column label="实际库区" align="center" prop="actualWarehouseName" v-if="!hideWarehouseQuery"/>
       <el-table-column label="物料类型" align="center" prop="itemType">
         <template slot-scope="scope">
           {{ scope.row.itemType == 'product' ? '成品' : '原料' }}
@@ -94,6 +98,8 @@
         </template>
       </el-table-column> -->
       <el-table-column label="更新时间" align="center" prop="updateTime" />
+      <el-table-column label="更新人" align="center" prop="updateBy" />
+      
       <el-table-column label="二维码" v-if="qrcode">
         <template slot-scope="scope">
           <QRCode :content="scope.row.qrcodeRecordId" :size="50" />
@@ -140,6 +146,9 @@
         <el-form-item label="所在库位" prop="warehouseId">
           <warehouse-select v-model="form.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%;" clearable />
         </el-form-item>
+        <el-form-item label="实际库区" prop="actualWarehouseId">
+          <actual-warehouse-select v-model="form.actualWarehouseId" placeholder="请选择实际库区" style="width: 100%;" clearable />
+        </el-form-item>
         <el-form-item label="班组" prop="team">
           <el-input v-model="form.team" placeholder="请输入班组" />
         </el-form-item>
@@ -200,6 +209,7 @@ import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilTraceResult from "./CoilTraceResult.vue"; // 路径根据实际存放位置调整
 import LabelRender from './LabelRender/index.vue'
 import MaterialSelect from "@/components/KLPService/MaterialSelect";
+import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
 import { findItemWithBom } from "@/store/modules/category";
 
 export default {
@@ -214,7 +224,8 @@ export default {
     RawMaterialInfo,
     BomInfoMini,
     CoilTraceResult,
-    LabelRender
+    LabelRender,
+    ActualWarehouseSelect
   },
   dicts: ['product_coil_status'],
   props: {
@@ -278,6 +289,7 @@ export default {
         supplierCoilNo: undefined,
         warehouseId: undefined,
         nextWarehouseId: undefined,
+        actualWarehouseId: undefined,
         qrcodeRecordId: undefined,
         team: undefined,
         hasMergeSplit: undefined,
@@ -409,6 +421,7 @@ export default {
         warehouseId: undefined,
         nextWarehouseId: undefined,
         qrcodeRecordId: undefined,
+        actualWarehouseId: undefined,
         team: undefined,
         hasMergeSplit: undefined,
         parentCoilNos: undefined,
@@ -532,8 +545,9 @@ export default {
           '入场钢卷号': item.enterCoilNo || '',
           '当前钢卷号': item.currentCoilNo || '',
           '厂家原料卷号': item.supplierCoilNo || '',
-          '库区': item.itemType === 'product' ? '成品' : '原料',
-          '仓库': item.warehouseName || '',
+          '物料类型': item.itemType === 'product' ? '成品' : '原料',
+          '仓区': item.warehouseName || '',
+          '实际库区': item.actualWarehouseName || '',
           '物品': findItemWithBom(item.itemType, item.itemId)?.itemName || '',
           '数据类型': item.dataType === 0 ? '历史数据' : '当前数据',
           '班组': item.team || '',

klp-ui/src/views/wms/warehouse/real.vue

@@ -0,0 +1,370 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
+      <el-form-item label="库位编码" prop="actualWarehouseCode">
+        <el-input
+          v-model="queryParams.actualWarehouseCode"
+          placeholder="请输入库位编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="库位名称" prop="actualWarehouseName">
+        <el-input
+          v-model="queryParams.actualWarehouseName"
+          placeholder="请输入库位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="库位类型" prop="warehouseType">
+        <el-select v-model="queryParams.warehouseType" placeholder="请选择库位类型" clearable>
+          <el-option
+            v-for="dict in dict.type.warehouse_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item label="启用状态" prop="isEnabled">
+        <el-select v-model="queryParams.isEnabled" placeholder="请选择启用状态" clearable>
+          <el-option label="启用" :value="1" />
+          <el-option label="禁用" :value="0" />
+        </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>
+      </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="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <KLPTable
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="warehouseList"
+      row-key="warehouseId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <!-- <el-table-column label="上级节点" prop="parentId" /> -->
+      <el-table-column label="库位编码" align="center" prop="actualWarehouseCode" />
+      <el-table-column label="库位名称" align="center" prop="actualWarehouseName" />
+      <!-- <el-table-column label="库位类型" align="center" prop="warehouseType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.warehouse_type" :value="scope.row.warehouseType"/>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="排序号" align="center" prop="sortNo" />
+      <el-table-column label="启用状态" align="center" prop="isEnabled">
+        <template slot-scope="scope">
+          <span>{{ scope.row.isEnabled == 1 ? '启用' : '禁用' }}</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-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <!-- <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+          >新增</el-button> -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </KLPTable>
+
+    <!-- 添加或修改库位/库区/库位自关联对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <!-- <el-form-item label="上级节点" prop="parentId">
+          <WarehouseSelect v-model="form.parentId" placeholder="请选择上级节点" />
+        </el-form-item> -->
+        <el-form-item label="库位编码" prop="actualWarehouseCode">
+          <el-input v-model="form.actualWarehouseCode" placeholder="请输入库位编码" />
+        </el-form-item>
+        <el-form-item label="库位名称" prop="actualWarehouseName">
+          <el-input v-model="form.actualWarehouseName" placeholder="请输入库位名称" />
+        </el-form-item>
+        <!-- <el-form-item label="库位类型" prop="warehouseType">
+          <el-select v-model="form.warehouseType" placeholder="请选择库位类型">
+            <el-option
+              v-for="dict in dict.type.warehouse_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item label="排序号" prop="sortNo">
+          <el-input v-model="form.sortNo" placeholder="请输入排序号" />
+        </el-form-item>
+        <el-form-item label="启用状态" prop="isEnabled">
+          <el-select v-model="form.isEnabled" placeholder="请选择启用状态">
+            <el-option label="启用" :value="1" />
+            <el-option label="禁用" :value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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 { listActualWarehouse, getActualWarehouse, delActualWarehouse, addActualWarehouse, updateActualWarehouse } from "@/api/wms/actualWarehouse";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+// import ActualWarehouseSelect from '@/components/ActualWarehouseSelect';
+
+export default {
+  name: "ActualWarehouse",
+  // dicts: ['warehouse_type'],
+  components: {
+    Treeselect,
+    // ActualWarehouseSelect
+  },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 库位/库区/库位自关联表格数据
+      warehouseList: [],
+      // 库位/库区/库位自关联树选项
+      warehouseOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        parentId: undefined,
+        actualWarehouseCode: undefined,
+        actualWarehouseName: undefined,
+        warehouseType: undefined,
+        sortNo: undefined,
+        isEnabled: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        actualWarehouseCode: [
+          { required: true, message: "库区编码不能为空", trigger: "blur" }
+        ],
+        actualWarehouseName: [
+          { required: true, message: "库区名称不能为空", trigger: "blur" }
+        ],
+        // warehouseType: [
+        //   { required: true, message: "类型不能为空", trigger: "change" }
+        // ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询库位/库区/库位自关联列表 */
+    getList() {
+      this.loading = true;
+      listActualWarehouse({...this.queryParams, pageNum: 1, pageSize: 1000}).then(response => {
+        const list = response.rows;
+        // const list = this.handleTree(response.data, "warehouseId", "parentId");
+        // // 递归遍历list，通过sortNo排序
+        const sort = (list) => {
+          list.sort((a, b) => a.sortNo - b.sortNo);
+          list.forEach(item => {
+            if (item.children) {
+              sort(item.children);
+            }
+          });
+        };
+        sort(list)
+        this.warehouseList = list;
+        this.loading = false;
+      });
+    },
+    /** 转换库位/库区/库位自关联数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.warehouseId,
+        label: node.warehouseName,
+        children: node.children
+      };
+    },
+	/** 查询库位/库区/库位自关联下拉树结构 */
+    getTreeselect() {
+      listActualWarehouse().then(response => {
+        this.warehouseOptions = [];
+        const data = { warehouseId: 0, warehouseName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "warehouseId", "parentId");
+        this.warehouseOptions.push(data);
+      });
+    }, 
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        warehouseId: null,
+        parentId: null,
+        actualWarehouseCode: null,
+        actualWarehouseName: null,
+        warehouseType: 1,
+        sortNo: null,
+        isEnabled: 1,
+        delFlag: null,
+        remark: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.warehouseId) {
+        this.form.parentId = row.warehouseId;
+      } else {
+        this.form.parentId = 0;
+      }
+      this.open = true;
+      this.title = "添加库位/库区/库位自关联";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+	  this.loading = true;
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentId = row.warehouseId;
+      }
+      getActualWarehouse(row.warehouseId).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;
+          // 处理 parentId 为 0 的情况
+          let submitData = { ...this.form };
+          if (submitData.parentId === 0) {
+            delete submitData.parentId;
+          }
+          if (this.form.actualWarehouseId != null) {
+            updateActualWarehouse(submitData).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addActualWarehouse(submitData).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除库位/库区/库位自关联编号为"' + row.actualWarehouseId + '"的数据项？').then(() => {
+        this.loading = true;
+        return delActualWarehouse(row.actualWarehouseId);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    }
+  }
+};
+</script>