修改功能位置模块

ruoyi-admin/src/main/java/com/ruoyi/asset/domain/TbLocation.java

@@ -26,9 +26,17 @@ public class TbLocation extends BaseEntity
     @Excel(name = "名称")
     private String name;
 
-    /** 所属公司 */
+    /** 父级ID，无则为0 */
     @Excel(name = "所属公司")
-    private String company;
+    private Long parentId;
+
+    /** 祖级列表 */
+    @Excel(name = "祖级列表")
+    private String sequence;
+
+    /** 位置标签 */
+    @Excel(name = "位置标签")
+    private String label;
 
     public void setId(Long id) 
     {
@@ -57,14 +65,29 @@ public class TbLocation extends BaseEntity
     {
         return name;
     }
-    public void setCompany(String company) 
-    {
-        this.company = company;
+
+    public Long getParentId() {
+        return parentId;
     }
 
-    public String getCompany() 
-    {
-        return company;
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
     }
 
     @Override
@@ -73,7 +96,9 @@ public class TbLocation extends BaseEntity
             .append("id", getId())
             .append("number", getNumber())
             .append("name", getName())
-            .append("company", getCompany())
+            .append("parentId", getParentId())
+            .append("sequence", getSequence())
+            .append("label", getLabel())
             .append("remark", getRemark())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())

ruoyi-admin/src/main/java/com/ruoyi/asset/service/impl/TbLocationServiceImpl.java

@@ -1,6 +1,10 @@
 package com.ruoyi.asset.service.impl;
 
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+
+import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,9 +58,39 @@ public class TbLocationServiceImpl implements ITbLocationService
     @Override
     public int insertTbLocation(TbLocation tbLocation)
     {
+        Long parentId = tbLocation.getParentId();
+        if (selectTbLocationById(parentId) == null) {
+            return 0;
+        }
+        String dateTimeId = DateUtils.dateTimeNow("yyyyMMddHHmmssSSS");
+        String orderNumber = "PD" + dateTimeId;
+
+        tbLocation.setNumber(orderNumber);
         tbLocation.setCreateTime(DateUtils.getNowDate());
         tbLocation.setCreateBy(SecurityUtils.getUsername());
-        return tbLocationMapper.insertTbLocation(tbLocation);
+        int flag = tbLocationMapper.insertTbLocation(tbLocation);
+        if (flag < 1) {
+            return flag;
+        }
+
+        HashSet<Long> set = new HashSet<>();
+
+        while (parentId != null && parentId > 0) {
+            TbLocation location = selectTbLocationById(parentId);
+            set.add(location.getId());
+            parentId = location.getParentId();
+        }
+
+        StringBuilder stringBuilder = new StringBuilder("");
+        if (!set.isEmpty()) {
+            for (Long id : set) {
+                stringBuilder.append(id);
+                stringBuilder.append(",");
+            }
+        }
+        stringBuilder.append(tbLocation.getId());
+        tbLocation.setSequence(stringBuilder.toString());
+        return tbLocationMapper.updateTbLocation(tbLocation);
     }
 
     /**

ruoyi-admin/src/main/resources/mapper/asset/TbLocationMapper.xml

@@ -8,7 +8,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="number"    column="number"    />
         <result property="name"    column="name"    />
-        <result property="company"    column="company"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="sequence"    column="sequence"    />
+        <result property="label"    column="label"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -17,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTbLocationVo">
-        select id, number, name, company, remark, create_by, create_time, update_by, update_time from tb_location
+        select id, number, name, parent_id, sequence, label, remark, create_by, create_time, update_by, update_time from tb_location
     </sql>
 
     <select id="selectTbLocationList" parameterType="TbLocation" resultMap="TbLocationResult">
@@ -25,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="number != null  and number != ''"> and number = #{number}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="company != null  and company != ''"> and company = #{company}</if>
+            <if test="parentId != null"> and parent_id = #{parentId}</if>
+            <if test="label != null  and label != ''"> and label = #{label}</if>
         </where>
     </select>
     
@@ -39,7 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="number != null and number != ''">number,</if>
             <if test="name != null">name,</if>
-            <if test="company != null and company != ''">company,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="sequence != null and sequence != ''">sequence,</if>
+            <if test="label != null and label != ''">label,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -49,7 +54,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="number != null and number != ''">#{number},</if>
             <if test="name != null">#{name},</if>
-            <if test="company != null and company != ''">#{company},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="sequence != null and sequence != ''">#{sequence},</if>
+            <if test="label != null and label != ''">#{label},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -63,7 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="number != null and number != ''">number = #{number},</if>
             <if test="name != null">name = #{name},</if>
-            <if test="company != null and company != ''">company = #{company},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="sequence != null and sequence != ''">sequence = #{sequence},</if>
+            <if test="label != null and label != ''">label = #{label},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ruoyi-ui/src/views/asset/location/index.vue

@@ -7,15 +7,11 @@
       <el-form-item label="名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="所属公司" prop="company">
-        <div style="display:inline-block; width: 250px;">
-          <treeselect
-                v-model="queryParams.company"
-                :options="deptOptions"
-                :normalizer="normalizer"
-                placeholder="选择所属公司"
-              />
-        </div>
+      <el-form-item label="上级位置" prop="parentId">
+        <el-input v-model="queryParams.parentId" placeholder="请输入上级位置" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="位置标签" prop="label">
+        <el-input v-model="queryParams.label" placeholder="请输入位置标签" 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>
@@ -44,11 +40,9 @@
       <!-- <el-table-column label="编号" align="center" prop="id" /> -->
       <el-table-column label="位置编号" align="center" prop="number" />
       <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="所属公司" align="center" prop="company">
-        <template slot-scope="scope">
-          <span>{{ scope.row.company != null ? companyName(scope.row.company) : '' }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="上级位置" align="center" prop="parentId" />
+      <el-table-column label="祖级列表" align="center" prop="sequence" />
+      <el-table-column label="位置标签" align="center" prop="label" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -63,14 +57,18 @@
     <!-- 添加或修改所属位置对话框 -->
     <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="number">
-          <el-input v-model="form.number" placeholder="请输入位置编号" />
+        <el-form-item label="位置编号">
+          <el-input v-model="form.number" placeholder="请输入位置编号" disabled/>
         </el-form-item>
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入名称" />
         </el-form-item>
-        <el-form-item label="所属公司" prop="company">
-          <treeselect v-model="form.company" :options="deptOptions" :normalizer="normalizer" placeholder="选择所属公司" />
+        <el-form-item label="上级位置" prop="parentId">
+          <el-input v-model="form.parentId" placeholder="请输入上级位置2" />
+          <!-- <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择所属公司" /> -->
+        </el-form-item>
+        <el-form-item label="位置标签" prop="label">
+          <el-input v-model="form.label" placeholder="请输入位置标签" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -122,14 +120,14 @@ export default {
         pageSize: 10,
         number: null,
         name: null,
-        company: null,
+        parentId: null,
+        label: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        number: [{ required: true, message: '位置编号不能为空', trigger: 'blur' }],
-        company: [{ required: true, message: '所属公司不能为空', trigger: 'blur' }],
+        name: [{ required: true, message: '位置名称不能为空', trigger: 'blur' }],
         createBy: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
         createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
         updateTime: [{ required: true, message: '最后修改时间不能为空', trigger: 'blur' }],
@@ -181,7 +179,8 @@ export default {
         id: null,
         number: null,
         name: null,
-        company: null,
+        parentId: null,
+        label: null,
         remark: null,
         createBy: null,
         createTime: null,

ruoyi-ui/src/views/inventory/inventory/index.vue

@@ -158,7 +158,7 @@
           <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"