解决资产盘点仅有正常/盘亏的盘点状态

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

@@ -109,6 +109,25 @@ public class TbAssetInformation extends BaseEntity
     @Excel(name = "所在位置标签（导出）")
     private String locationLabel;
 
+    /** 位置ID */
+    private Long parentLocationId;
+    /** 位置名称 */
+    @Excel(name = "父级位置名称（导出）")
+    private String parentLocationName;
+    /** 位置标签 */
+    @Excel(name = "父级位置标签（导出）")
+    private String parentLocationLabel;
+
+    /** 位置ID */
+    private Long ancestorLocationId;
+    /** 位置名称 */
+    @Excel(name = "祖级位置名称（导出）")
+    private String ancestorLocationName;
+    /** 位置标签 */
+    @Excel(name = "祖级位置标签（导出）")
+    private String ancestorLocationLabel;
+
+
     /** 资产性质 */
     @Excel(name = "资产性质")
     private String property;

ruoyi-admin/src/main/java/com/ruoyi/asset/mapper/TbAssetInformationMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.asset.mapper;
 
+import java.util.Collection;
 import java.util.List;
 import com.ruoyi.asset.domain.TbAssetInformation;
 import org.apache.ibatis.annotations.Param;
@@ -40,6 +41,13 @@ public interface TbAssetInformationMapper
     TbAssetInformation selectTbAssetInformationByEpc(String epc);
 
     /**
+     * 查询资产信息
+     * @param epcList epc集合
+     * @return
+     */
+    public List<TbAssetInformation> selectTbAssetInformationByEpcList(@Param("epcList") Collection<String> epcList);
+
+    /**
      * 查询资产信息列表
      * 
      * @param tbAssetInformation 资产信息
@@ -55,6 +63,13 @@ public interface TbAssetInformationMapper
     public List<TbAssetInformation> selectInfoList(TbAssetInformation tbAssetInformation);
 
     /**
+     * 根据位置编码获取资产列表
+     * @param locationNumbers
+     * @return
+     */
+    public List<TbAssetInformation> selectTbAssetInformationByLocationNumbers(@Param("locationNumbers") List<String> locationNumbers);
+
+    /**
      * 新增资产信息
      * 
      * @param tbAssetInformation 资产信息
@@ -90,5 +105,5 @@ public interface TbAssetInformationMapper
 
     List<String> selectNumberByLocations(@Param("locations") List<String> locations);
 
-    List<TbAssetInformation> selectAssetInformationByLocations(@Param("locations") List<String> locations);
+    List<TbAssetInformation> selectAssetInformationByLocations(@Param("locations") Collection<String> locations);
 }

ruoyi-admin/src/main/java/com/ruoyi/asset/mapper/TbLocationMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.asset.mapper;
 
+import java.util.Collection;
 import java.util.List;
 import com.ruoyi.asset.domain.TbLocation;
 import org.apache.ibatis.annotations.Param;
@@ -37,7 +38,35 @@ public interface TbLocationMapper
      * @param location
      * @return
      */
-    List<String> selectNumberByFather( String location);
+    List<String> selectNumberByFather(String location);
+
+    /**
+     * 根据Id查询位置及子位置编码
+     * @param id
+     * @return
+     */
+    List<String> selectChildTbLocationById(Long id);
+
+    /**
+     * 根据Id查询位置及子位置编码
+     * @param id
+     * @return
+     */
+    List<String> selectChildTbLocationByIds(@Param("ids") Collection<Long> ids);
+
+    /**
+     * 根据位置编码获取有效位置ID
+     * @param numbers
+     * @return
+     */
+    List<Long> selectTbLocationIdByNumbers(@Param("numbers") Collection<String> numbers);
+
+    /**
+     * 根据IDs查询位置
+     * @param ids
+     * @return
+     */
+    List<TbLocation> selectTbLocationByIds(@Param("ids") Collection<String> ids);
 
     /**
      * 新增所属位置

ruoyi-admin/src/main/java/com/ruoyi/inventory/controller/TbAssetInventoryController.java

@@ -114,7 +114,9 @@ public class TbAssetInventoryController extends BaseController
      */
     @PostMapping("/takeStock")
     public AjaxResult addByTakeStock(@RequestBody List<TakeStockDTO> dto){
-        return toAjax(tbAssetInventoryService.addByTakeStock(dto));
+        // int result = tbAssetInventoryService.addByTakeStock(dto);
+        int result = tbAssetInventoryService.handheldInventory(dto);
+        return toAjax(result);
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/inventory/domain/TbAssetInventory.java

@@ -45,17 +45,20 @@ public class TbAssetInventory extends BaseEntity
     @Excel(name = "盘点位置")
     private String inventoryLocation;
 
+    @Excel(name = "盘点位置（导出）")
+    private String inventoryLocationName;
+
     /** 盘点状态，0:盘点编制，1：盘点执行，2：盘点完毕，3：盘点暂停 */
     @Excel(name = "盘点状态，0:盘点编制，1：盘点执行，2：盘点完毕，3：盘点暂停")
-    private Long inventoryStatus;
+    private Integer inventoryStatus;
 
-    /** 盘点结果，0：盘亏，1：盘盈，2：正常 */
-    @Excel(name = "盘点结果，0：盘亏，1：盘盈，2：正常")
-    private Long inventoryResult;
+    /** 盘点结果，0：未开始，1：盘盈，2：盘亏，3：正常 */
+    @Excel(name = "盘点结果，0：未开始，1：盘盈，2：盘亏，3：正常")
+    private Integer inventoryResult;
 
     /** 记录状态，0：未提交，1：已提交 */
     @Excel(name = "记录状态，0：未提交，1：已提交")
-    private Long recordStatus;
+    private Integer recordStatus;
 
     /** 记录创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -128,34 +131,40 @@ public class TbAssetInventory extends BaseEntity
     {
         return inventoryLocation;
     }
-    public void setInventoryStatus(Long inventoryStatus) 
-    {
-        this.inventoryStatus = inventoryStatus;
+
+    public String getInventoryLocationName() {
+        return inventoryLocationName;
     }
 
-    public Long getInventoryStatus() 
-    {
+    public void setInventoryLocationName(String inventoryLocationName) {
+        this.inventoryLocationName = inventoryLocationName;
+    }
+
+    public Integer getInventoryStatus() {
         return inventoryStatus;
     }
-    public void setInventoryResult(Long inventoryResult) 
-    {
-        this.inventoryResult = inventoryResult;
+
+    public void setInventoryStatus(Integer inventoryStatus) {
+        this.inventoryStatus = inventoryStatus;
     }
 
-    public Long getInventoryResult() 
-    {
+    public Integer getInventoryResult() {
         return inventoryResult;
     }
-    public void setRecordStatus(Long recordStatus) 
-    {
-        this.recordStatus = recordStatus;
+
+    public void setInventoryResult(Integer inventoryResult) {
+        this.inventoryResult = inventoryResult;
     }
 
-    public Long getRecordStatus() 
-    {
+    public Integer getRecordStatus() {
         return recordStatus;
     }
-    public void setCreatedTime(Date createdTime) 
+
+    public void setRecordStatus(Integer recordStatus) {
+        this.recordStatus = recordStatus;
+    }
+
+    public void setCreatedTime(Date createdTime)
     {
         this.createdTime = createdTime;
     }
@@ -176,20 +185,20 @@ public class TbAssetInventory extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("orderNumber", getOrderNumber())
-            .append("name", getName())
-            .append("inventoryDepartment", getInventoryDepartment())
-            .append("inventoryBy", getInventoryBy())
-            .append("inventoryDate", getInventoryDate())
-            .append("inventoryLocation", getInventoryLocation())
-            .append("inventoryStatus", getInventoryStatus())
-            .append("inventoryResult", getInventoryResult())
-            .append("recordStatus", getRecordStatus())
-            .append("remark", getRemark())
-            .append("createdTime", getCreatedTime())
-            .append("updatedTime", getUpdatedTime())
-            .toString();
+        return "TbAssetInventory{" +
+                "id=" + id +
+                ", orderNumber='" + orderNumber + '\'' +
+                ", name='" + name + '\'' +
+                ", inventoryDepartment='" + inventoryDepartment + '\'' +
+                ", inventoryBy='" + inventoryBy + '\'' +
+                ", inventoryDate=" + inventoryDate +
+                ", inventoryLocation='" + inventoryLocation + '\'' +
+                ", inventoryLocationName='" + inventoryLocationName + '\'' +
+                ", inventoryStatus=" + inventoryStatus +
+                ", inventoryResult=" + inventoryResult +
+                ", recordStatus=" + recordStatus +
+                ", createdTime=" + createdTime +
+                ", updatedTime=" + updatedTime +
+                '}';
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/inventory/domain/TbInventoryDetail.java

@@ -1,5 +1,7 @@
 package com.ruoyi.inventory.domain;
 
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.asset.domain.TbAssetInformation;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -34,8 +36,37 @@ public class TbInventoryDetail extends BaseEntity
     @Excel(name = "盘点元数据")
     private String inventoryMetadata;
 
-    /** 是否更新数据 */
+    /** 是否更新数据 0:异常 1:已盘点 2:未盘点 */
     @Excel(name = "是否已盘点")
-    private Long isUpdateData;
+    private Integer isUpdateData;
 
+    /**
+     * 未盘点详细
+     * @param orderNumber
+     * @param assetInformation
+     * @return
+     */
+    public static TbInventoryDetail uncounted(String orderNumber, TbAssetInformation assetInformation) {
+        return new TbInventoryDetail(null, orderNumber, JSONUtil.toJsonStr(assetInformation), 2);
+    }
+
+    /**
+     * 已盘点详细
+     * @param orderNumber
+     * @param assetInformation
+     * @return
+     */
+    public static TbInventoryDetail counted(String orderNumber, TbAssetInformation assetInformation) {
+        return new TbInventoryDetail(null, orderNumber, JSONUtil.toJsonStr(assetInformation), 1);
+    }
+
+    /**
+     * 异常盘点详细
+     * @param orderNumber
+     * @param assetInformation
+     * @return
+     */
+    public static TbInventoryDetail errCounted(String orderNumber, TbAssetInformation assetInformation) {
+        return new TbInventoryDetail(null, orderNumber, JSONUtil.toJsonStr(assetInformation), 0);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/inventory/domain/dto/TbAssetInventoryDTO.java

@@ -46,19 +46,20 @@ public class TbAssetInventoryDTO {
     @Excel(name = "盘点位置")
     private String inventoryLocation;
 
-    private String locationName;
+    @Excel(name = "盘点位置（导出）")
+    private String inventoryLocationName;
 
     /** 盘点状态，0:盘点编制，1：盘点执行，2：盘点完毕，3：盘点暂停 */
     @Excel(name = "盘点状态，0:盘点编制，1：盘点执行，2：盘点完毕，3：盘点暂停")
-    private Long inventoryStatus;
+    private Integer inventoryStatus;
 
     /** 盘点结果，0：盘亏，1：盘盈，2：正常 */
     @Excel(name = "盘点结果，0：盘亏，1：盘盈，2：正常")
-    private Long inventoryResult;
+    private Integer inventoryResult;
 
     /** 记录状态，0：未提交，1：已提交 */
     @Excel(name = "记录状态，0：未提交，1：已提交")
-    private Long recordStatus;
+    private Integer recordStatus;
 
     /** 记录创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")

ruoyi-admin/src/main/java/com/ruoyi/inventory/mapper/TbInventoryDetailMapper.java

@@ -29,6 +29,20 @@ public interface TbInventoryDetailMapper
     public List<TbInventoryDetail> selectTbInventoryDetailList(TbInventoryDetail tbInventoryDetail);
 
     /**
+     * 查询资产盘点明细列表
+     * @param orderNumber 盘点编码
+     * @return 资产盘点明细集合
+     */
+    public List<TbInventoryDetail> selectTbInventoryDetailByOrderNumber(@Param("orderNumber") String orderNumber);
+
+    /**
+     * 统计未盘点资产
+     * @param orderNumber 盘点编码
+     * @return
+     */
+    public int countUncounted(@Param("orderNumber") String orderNumber);
+
+    /**
      * 新增资产盘点明细
      * 
      * @param tbInventoryDetail 资产盘点明细

ruoyi-admin/src/main/java/com/ruoyi/inventory/service/ITbAssetInventoryService.java

@@ -38,7 +38,13 @@ public interface ITbAssetInventoryService
      */
     public int insertTbAssetInventory(TbAssetInventory tbAssetInventory);
 
-    public int addByTakeStock(List<TakeStockDTO> dto);
+    /**
+     * 手持机盘点
+     *
+     * @param takeStockDTOList
+     * @return
+     */
+    public int handheldInventory(List<TakeStockDTO> takeStockDTOList);
 
     /**
      * 修改资产盘点记录

ruoyi-admin/src/main/java/com/ruoyi/inventory/service/impl/TbAssetInventoryServiceImpl.java

@@ -4,10 +4,14 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.logging.SimpleFormatter;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.asset.domain.TbAssetInformation;
+import com.ruoyi.asset.domain.TbLocation;
 import com.ruoyi.asset.mapper.TbAssetInformationMapper;
 import com.ruoyi.asset.mapper.TbLocationMapper;
 import com.ruoyi.common.exception.ServiceException;
@@ -18,13 +22,14 @@ import com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO;
 import com.ruoyi.inventory.mapper.TbInventoryDetailMapper;
 import com.ruoyi.utils.IDUtil;
 import com.ruoyi.utils.RecursionUtil;
-import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.inventory.mapper.TbAssetInventoryMapper;
 import com.ruoyi.inventory.domain.TbAssetInventory;
 import com.ruoyi.inventory.service.ITbAssetInventoryService;
 
+import javax.annotation.Resource;
+
 /**
  * 资产盘点记录Service业务层处理
  * 
@@ -55,13 +60,26 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
     @Override
     public TbAssetInventory selectTbAssetInventoryById(Long id)
     {
-        return tbAssetInventoryMapper.selectTbAssetInventoryById(id);
+        TbAssetInventory tbAssetInventory = tbAssetInventoryMapper.selectTbAssetInventoryById(id);
+        setLocationName(tbAssetInventory);
+
+        return tbAssetInventory;
+    }
+
+    private void setLocationName(TbAssetInventory tbAssetInventory) {
+        String inventoryLocation = tbAssetInventory.getInventoryLocation();
+        String[] strLocationIds = inventoryLocation.split(",");
+        List<TbLocation> tbLocations = locationMapper.selectTbLocationByIds(List.of(strLocationIds));
+        String locationName = Arrays.toString(tbLocations.stream().map(TbLocation::getName).toArray());
+        tbAssetInventory.setInventoryLocationName(locationName);
     }
 
 
     @Override
     public TbAssetInventory selectTbAssetInventoryByNum(String num) {
-        return tbAssetInventoryMapper.selectTbAssetInventoryByNumber(num);
+        TbAssetInventory tbAssetInventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(num);
+        setLocationName(tbAssetInventory);
+        return tbAssetInventory;
     }
 
     /**
@@ -85,62 +103,236 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
     @Override
     public int insertTbAssetInventory(TbAssetInventory tbAssetInventory)
     {
-        tbAssetInventory.setOrderNumber(IDUtil.getUUID1());
-        return tbAssetInventoryMapper.insertTbAssetInventory(tbAssetInventory);
+        String orderNumber = IDUtil.getUUID1();
+        tbAssetInventory.setOrderNumber(orderNumber);
+
+        Integer recordStatus = tbAssetInventory.getRecordStatus();
+        if (recordStatus > 0) {
+            tbAssetInventory.setInventoryStatus(1);
+        } else {
+            tbAssetInventory.setInventoryStatus(0);
+        }
+
+        String inventoryLocation = tbAssetInventory.getInventoryLocation();
+        String[] locationIds = inventoryLocation.split(",");
+        Set<String> locationNumberSet = new HashSet<>();
+        for (String locationId : locationIds) {
+            List<String> locationNumberList = locationMapper.selectChildTbLocationById(Long.valueOf(locationId));
+            locationNumberSet.addAll(locationNumberList);
+        }
+        List<TbAssetInformation> tbAssetInformationList = informationMapper.selectAssetInformationByLocations(locationNumberSet);
+
+        List<TbInventoryDetail> tbInventoryDetails = new ArrayList<>();
+        for (TbAssetInformation tbAssetInformation : tbAssetInformationList) {
+            // 未盘点
+            TbInventoryDetail uncounted = TbInventoryDetail.uncounted(orderNumber, tbAssetInformation);
+            tbInventoryDetails.add(uncounted);
+        }
+
+        int insertTbAssetInventory = tbAssetInventoryMapper.insertTbAssetInventory(tbAssetInventory);
+        if (insertTbAssetInventory == 0) {
+            return 0;
+        }
+
+        for (TbInventoryDetail tbInventoryDetail : tbInventoryDetails) {
+            tbInventoryDetailMapper.insertTbInventoryDetail(tbInventoryDetail);
+        }
+
+        return 1;
     }
 
-    //手持机盘点
+    /**
+     * 手持机盘点
+     *
+     * @param takeStockDTOList
+     * @return
+     */
     @Override
-    public int addByTakeStock(List<TakeStockDTO> _dto){
+    public int handheldInventory(List<TakeStockDTO> takeStockDTOList) {
         int result = 0;
-        for (TakeStockDTO dto : _dto) {
-            //解析实体
-            List<TagInfo> list = dto.getAssetList();
-            String location = dto.getInventoryLocation();
-            String orderNumber = dto.getOrderNumber();
-            //提取epc rfid
-            ArrayList<String> epcList = new ArrayList<>();
-            for (TagInfo tagInfo : list) {
-                String epc = tagInfo.getEpc();
-                // 删除字符串中前导的零
-                epc = epc.replaceFirst("^0+", "");
-                epcList.add(epc);
-            }
-            //根据位置获取包含自身及子位置,递归
-            List<String> locations = new RecursionUtil().getNumberWithChildren(locationMapper, location);
-            //获取所在位置内的资产
-            // List<String> rfidList = informationMapper.selectNumberByLocations(locations);
-            List<TbAssetInformation> informationList = informationMapper.selectAssetInformationByLocations(locations);
-            List<String> rfidList = informationList.stream().map(TbAssetInformation::getEpc).collect(Collectors.toList());
+        for (TakeStockDTO takeStockDTO : takeStockDTOList) {
+            // 获取单据编码
+            String orderNumber = takeStockDTO.getOrderNumber();
+            // 获取手持机的epc
+            Set<String> epcSet = takeStockDTO.getAssetList()
+                    .stream()
+                    .map(tagInfo -> {
+                        String epc = tagInfo.getEpc();
+                        // 删除字符串中前导的零
+                        epc = epc.replaceFirst("^0+", "");
+                        return epc;
+                    })
+                    .collect(Collectors.toSet());
+            if (StrUtil.isNotBlank(orderNumber)) { // 存在盘点计划
+                TbAssetInventory tbAssetInventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
+                if (tbAssetInventory == null) {
+                    continue;
+                }
 
-            //对比盘点
-            List<String> intersection = new ArrayList<>(rfidList);
-            intersection.retainAll(epcList);
-            if (intersection.size() < rfidList.size()) {
-                //盘亏
-                if (!orderNumber.isEmpty()) {
-                    result = takeStock(orderNumber, epcList, 2L);
-                } else {
-                    result = takeStock2(location, 2L, epcList);
+                Integer stockResult = startStock(tbAssetInventory,  epcSet);
+                if (stockResult > 0) {
+                    result++;
                 }
-            } else if (list.size() > intersection.size()) {
-                //盘盈
-                if (!orderNumber.isEmpty()) {
-                    result = takeStock(orderNumber, epcList, 1L);
-                } else {
-                    result = takeStock2(location, 1L, epcList);
+            } else { // 未存在盘点计划
+                // 获取盘点位置编码
+                String inventoryLocation = takeStockDTO.getInventoryLocation();
+                List<String> locationNumbers = List.of(inventoryLocation.split(","));
+
+                // 根据编号获取有效位置ID
+                List<Long> locationIds = locationMapper.selectTbLocationIdByNumbers(locationNumbers);
+                if (locationIds.isEmpty()) {
+                    continue;
                 }
-            } else if (intersection.size() == rfidList.size()) {
-                //正常
-                if (!orderNumber.isEmpty()) {
-                    result = takeStock(orderNumber, epcList, 3L);
-                } else {
-                    result = takeStock2(location, 3L, epcList);
+
+                TbAssetInventory inventory = new TbAssetInventory();
+                Date now = new Date();
+                String nowDateTime = DateUtil.format(now, "yyyy年MM月dd日 HH:mm:ss");
+                inventory.setName(nowDateTime + "临时盘点任务");
+                inventory.setInventoryDepartment("100");
+                inventory.setInventoryBy("admin");
+                inventory.setInventoryDate(now);
+
+                StringBuilder locationStrIds = new StringBuilder();
+                for (int i = 0; i < locationIds.size(); i++) {
+                    locationStrIds.append(locationIds.get(i));
+                    if (i < locationIds.size() - 1) {
+                        locationStrIds.append(",");
+                    }
+                }
+                inventory.setInventoryLocation(locationStrIds.toString());
+                inventory.setRecordStatus(1);
+
+                // 新增盘点计划
+                int insertResult = insertTbAssetInventory(inventory);
+                if (insertResult < 1) { // 新增失败
+                    continue;
+                }
+
+                // 获取单点单号
+                String newOrderNumber = inventory.getOrderNumber();
+                // 获取盘点计划
+                TbAssetInventory tbAssetInventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(newOrderNumber);
+
+                Integer stockResult = startStock(tbAssetInventory, epcSet);
+                if (stockResult > 0) {
+                    result++;
+                }
+            }
+
+        }
+        return result > 0 ? 1 : 0;
+    }
+
+    /**
+     * 开始盘点
+     *
+     * @param tbAssetInventory 盘点计划信息
+     * @param epcSet 盘点epc集合
+     */
+    private Integer startStock(TbAssetInventory tbAssetInventory, Set<String> epcSet) {
+        // 获取盘点单号
+        String orderNumber = tbAssetInventory.getOrderNumber();
+
+        int result = 0;
+        // 设置盘点状态：盘点完毕
+        tbAssetInventory.setInventoryStatus(2);
+        // 记录已盘点epc
+        Set<String> epcRecord = new HashSet<>();
+
+        // 根据盘点单号获取盘点资产详细
+        List<TbInventoryDetail> tbInventoryDetails = tbInventoryDetailMapper.selectTbInventoryDetailByOrderNumber(orderNumber);
+        for (TbInventoryDetail tbInventoryDetail : tbInventoryDetails) {
+            // 获取资产元数据
+            String inventoryMetadata = tbInventoryDetail.getInventoryMetadata();
+            // 将元数据转换为资产信息
+            TbAssetInformation assetInformation = JSONUtil.toBean(inventoryMetadata, TbAssetInformation.class);
+            // 判断是否盘点到该epc
+            boolean flag = epcSet.stream().anyMatch(epc -> epc.equals(assetInformation.getEpc()));
+            if (flag) {
+                // 设置盘点更新状态：已盘点
+                tbInventoryDetail.setIsUpdateData(1);
+                int update = tbInventoryDetailMapper.updateTbInventoryDetail(tbInventoryDetail);
+                if (update > 0) {
+                    // 新增已盘点epc
+                    epcRecord.add(assetInformation.getEpc());
+                    // 删除已盘点epc
+                    epcSet.remove(assetInformation.getEpc());
+                    if (result < 1) {
+                        result = 1;
+                    }
+                }
+            }
+        }
+
+        // 统计未盘点
+        int uncountedCount = tbInventoryDetailMapper.countUncounted(orderNumber);
+
+        // 获取盘点位置
+        String inventoryLocation = tbAssetInventory.getInventoryLocation();
+        List<Long> locationIds = Arrays.stream(inventoryLocation.split(",")).map(Long::valueOf).collect(Collectors.toList());
+        List<String> locationNumbers = locationMapper.selectChildTbLocationByIds(locationIds);
+
+        // 根据盘点位置获取位置下的资产信息
+        List<TbAssetInformation> locationAssetInformationList = informationMapper.selectAssetInformationByLocations(locationNumbers);
+
+        if (!locationAssetInformationList.isEmpty()) {
+            // 获取该位置下的全部资产epc
+            Set<String> newEpcSet = locationAssetInformationList.stream().map(TbAssetInformation::getEpc).collect(Collectors.toSet());
+            // 删除已盘点epc
+            newEpcSet.removeAll(epcRecord);
+
+            if (!newEpcSet.isEmpty()) {
+                // 获取存在该位置且未盘点资产信息
+                List<TbAssetInformation> newEpcAssetInformationList = locationAssetInformationList.stream().map(tbAssetInformation -> {
+                    for (String newEpc : newEpcSet) {
+                        if (tbAssetInformation.getEpc().equals(newEpc)) {
+                            return tbAssetInformation;
+                        }
+                    }
+                    return null;
+                }).collect(Collectors.toList());
+
+                for (TbAssetInformation tbAssetInformation : newEpcAssetInformationList) {
+                    if (tbAssetInformation == null) {
+                        continue;
+                    }
+                    String newEpc = tbAssetInformation.getEpc();
+                    // 判断是否盘点到该epc
+                    boolean flag = epcSet.stream().anyMatch(epc -> epc.equals(newEpc));
+                    if (flag) {
+                        // 已盘点资产详细
+                        TbInventoryDetail counted = TbInventoryDetail.counted(orderNumber, tbAssetInformation);
+                        int inserted = tbInventoryDetailMapper.insertTbInventoryDetail(counted);
+                        if (inserted > 0) {
+                            // 新增已盘点epc
+                            epcRecord.add(newEpc);
+                            // 删除已盘点epc
+                            epcSet.remove(newEpc);
+                            if (result < 1) {
+                                result = 1;
+                            }
+                        }
+                    }
                 }
-            } else {
-                result = 0;
             }
         }
+
+        // 根据未盘点资产epc获取资产信息
+        List<TbAssetInformation> tbAssetInformationList = informationMapper.selectTbAssetInformationByEpcList(epcSet);
+        for (TbAssetInformation tbAssetInformation : tbAssetInformationList) {
+            TbInventoryDetail tbInventoryDetail = TbInventoryDetail.errCounted(orderNumber, tbAssetInformation);
+            tbInventoryDetailMapper.insertTbInventoryDetail(tbInventoryDetail);
+        }
+
+        if (uncountedCount > 0) { // 未盘点统计大于0时 盘亏
+            tbAssetInventory.setInventoryResult(2);
+        } else if (epcRecord.size() > tbInventoryDetails.size()) { // 未盘点统计0，且实际已盘点数大于计划盘点数 盘盈
+            tbAssetInventory.setInventoryResult(1);
+        } else { // 未盘点统计0，且实际已盘点数等于计划盘点数 正常
+            tbAssetInventory.setInventoryResult(3);
+        }
+
+        tbAssetInventoryMapper.updateTbAssetInventory(tbAssetInventory);
         return result;
     }
 
@@ -153,6 +345,12 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
     @Override
     public int updateTbAssetInventory(TbAssetInventory tbAssetInventory)
     {
+        Integer recordStatus = tbAssetInventory.getRecordStatus();
+        if (recordStatus > 0) {
+            tbAssetInventory.setInventoryStatus(1);
+        } else {
+            tbAssetInventory.setInventoryStatus(0);
+        }
         return tbAssetInventoryMapper.updateTbAssetInventory(tbAssetInventory);
     }
 
@@ -190,14 +388,81 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
 
     @Override
     public List<TbAssetInventoryDTO> selectTbAssetInventoryDTOList(TbAssetInventoryDTO dto) {
-        return tbAssetInventoryMapper.selectTbAssetInventoryDTOList(dto);
+        List<TbAssetInventoryDTO> tbAssetInventoryDTOS = tbAssetInventoryMapper.selectTbAssetInventoryDTOList(dto);
+        for (TbAssetInventoryDTO tbAssetInventoryDTO : tbAssetInventoryDTOS) {
+            setLocationNameDTO(tbAssetInventoryDTO);
+        }
+        return tbAssetInventoryDTOS;
+    }
+
+    private void setLocationNameDTO(TbAssetInventoryDTO tbAssetInventoryDTO) {
+        String inventoryLocation = tbAssetInventoryDTO.getInventoryLocation();
+        String[] strLocationIds = inventoryLocation.split(",");
+        List<TbLocation> tbLocations = locationMapper.selectTbLocationByIds(List.of(strLocationIds));
+        String locationName = Arrays.toString(tbLocations.stream().map(TbLocation::getName).toArray());
+        tbAssetInventoryDTO.setInventoryLocationName(locationName);
+    }
+
+    // 旧手持机盘点
+    public int addByTakeStock(List<TakeStockDTO> _dto){
+        int result = 0;
+        for (TakeStockDTO dto : _dto) {
+            //解析实体
+            List<TagInfo> list = dto.getAssetList();
+            String location = dto.getInventoryLocation();
+            String orderNumber = dto.getOrderNumber();
+            //提取epc rfid
+            ArrayList<String> epcList = new ArrayList<>();
+            for (TagInfo tagInfo : list) {
+                String epc = tagInfo.getEpc();
+                // 删除字符串中前导的零
+                epc = epc.replaceFirst("^0+", "");
+                epcList.add(epc);
+            }
+            //根据位置获取包含自身及子位置,递归
+            List<String> locations = new RecursionUtil().getNumberWithChildren(locationMapper, location);
+            //获取所在位置内的资产
+            // List<String> rfidList = informationMapper.selectNumberByLocations(locations);
+            List<TbAssetInformation> informationList = informationMapper.selectAssetInformationByLocations(locations);
+            List<String> rfidList = informationList.stream().map(TbAssetInformation::getEpc).collect(Collectors.toList());
+
+            //对比盘点
+            List<String> intersection = new ArrayList<>(rfidList);
+            intersection.retainAll(epcList);
+            if (intersection.size() < rfidList.size()) {
+                //盘亏
+                if (!orderNumber.isEmpty()) {
+                    result = takeStock(orderNumber, epcList, 2);
+                } else {
+                    result = takeStock2(location, 2, epcList);
+                }
+            } else if (list.size() > intersection.size()) {
+                //盘盈
+                if (!orderNumber.isEmpty()) {
+                    result = takeStock(orderNumber, epcList, 1);
+                } else {
+                    result = takeStock2(location, 1, epcList);
+                }
+            } else if (intersection.size() == rfidList.size()) {
+                //正常
+                if (!orderNumber.isEmpty()) {
+                    result = takeStock(orderNumber, epcList, 3);
+                } else {
+                    result = takeStock2(location, 3, epcList);
+                }
+            } else {
+                result = 0;
+            }
+        }
+        return result;
     }
 
-    private int takeStock(String orderNumber, List<String> list, Long result){
+    // 旧手持机盘点
+    private int takeStock(String orderNumber, List<String> list, Integer result){
         TbAssetInventory inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
-        if (inventory.getRecordStatus() == 1L) {
+        if (inventory.getRecordStatus() == 1) {
             //插入盘点
-            inventory.setInventoryStatus(2L);
+            inventory.setInventoryStatus(2);
             inventory.setInventoryResult(result);
             //插入明细
             setDetail(orderNumber, list);
@@ -207,11 +472,12 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
         }
     }
 
-    private int takeStock2(String location, Long result, List<String> list){
+    // 旧手持机盘点
+    private int takeStock2(String location, Integer result, List<String> list){
         TbAssetInventory inventory = new TbAssetInventory();
-        inventory.setInventoryStatus(2L);
+        inventory.setInventoryStatus(2);
         inventory.setInventoryResult(result);
-        inventory.setRecordStatus(1L);
+        inventory.setRecordStatus(1);
         inventory.setInventoryLocation(location);
         inventory.setInventoryDate(new Date());
         SimpleDateFormat formatter = new SimpleDateFormat("yyMMdd HH:mm:ss");
@@ -227,6 +493,7 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
         return 1;
     }
 
+    // 旧手持机盘点
     private void setDetail(String orderNumber, List<String> list){
         //该位置下的资产
         TbAssetInventory _inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
@@ -253,14 +520,15 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
         //插入详细盘点信息
         TbInventoryDetail detail = new TbInventoryDetail();
         //已盘
-        setInventoryDetail(green, detail, orderNumber, 1L);
+        setInventoryDetail(green, detail, orderNumber, 1);
         //未盘
-        setInventoryDetail(red, detail, orderNumber, 2L);
+        setInventoryDetail(red, detail, orderNumber, 2);
         //异常
-        setInventoryDetail(yellow, detail, orderNumber, 0L);
+        setInventoryDetail(yellow, detail, orderNumber, 0);
     }
 
-    private void setInventoryDetail(List<String> list, TbInventoryDetail detail, String orderNumber, Long isUpdate){
+    // 旧手持机盘点
+    private void setInventoryDetail(List<String> list, TbInventoryDetail detail, String orderNumber, Integer isUpdate){
         for (String epc : list) {
             detail.setOrderNumber(orderNumber);
             TbAssetInformation tbAssetInformation = informationMapper.selectTbAssetInformationByEpc(epc);
@@ -272,5 +540,4 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
             tbInventoryDetailMapper.insertTbInventoryDetail(detail);
         }
     }
-
 }

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

@@ -108,6 +108,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.id locationId,
             b.name locationName,
             b.label locationLabel,
+            g.id parentLocationId,
+            g.name parentLocationName,
+            g.label parentLocationLabel,
+            h.id ancestorLocationId,
+            h.name ancestorLocationName,
+            h.label ancestorLocationLabel,
             c.id categoryId,
             c.name categoryName,
             d.dept_name userDepartmentName,
@@ -115,6 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f.dept_name corporationName
         FROM `tb_asset_information` a
         LEFT JOIN tb_location b ON a.location_number = b.number
+        LEFT JOIN tb_location g ON b.parent_id = g.id
+        LEFT JOIN tb_location h ON g.parent_id = h.id
         LEFT JOIN tb_asset_category c ON a.category_number = c.number
         LEFT JOIN sys_dept d ON a.user_department = d.dept_id
         LEFT JOIN sys_dept e ON a.department = e.dept_id
@@ -307,6 +315,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item}
         </foreach>
     </select>
+
+    <select id="selectTbAssetInformationByEpcList" parameterType="String" resultType="TbAssetInformation">
+        <include refid="selectTbAssetInformation"/>
+        where a.epc in
+        <foreach item="epc" collection="epcList" open="(" separator="," close=")">
+            #{epc}
+        </foreach>
+    </select>
     
 <!--    <select id="selectTbAssetInformationById" parameterType="Long" resultMap="TbAssetInformationResult">-->
 <!--        <include refid="selectTbAssetInformationVo"/>-->

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

@@ -37,6 +37,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectTbLocationByIds" parameterType="String" resultMap="TbLocationResult">
+        <include refid="selectTbLocationVo"/>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
+    <select id="selectTbLocationIdByNumbers" parameterType="String" resultType="Long">
+        SELECT id FROM tb_location WHERE number in
+        <foreach item="number" collection="numbers" open="(" separator="," close=")">
+            #{number}
+        </foreach>
+    </select>
+
     <!--selectTbLocationByNumber-->
     <select id="selectTbLocationByNumber" parameterType="String" resultMap="TbLocationResult">
         <include refid="selectTbLocationVo"/>
@@ -48,6 +63,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.number = #{number}
            or a.parent_id = (select b.id from tb_location b where b.number = #{number})
     </select>
+
+    <select id="selectChildTbLocationById" parameterType="Long" resultType="String">
+        SELECT number FROM `tb_location` where id = #{id} or sequence like concat('%', #{id}, '%');
+    </select>
+
+    <select id="selectChildTbLocationByIds" parameterType="Long" resultType="String">
+        SELECT DISTINCT number FROM `tb_location`
+        <where>
+            id in
+            <foreach item="id" collection="ids" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+            <foreach item="id" collection="ids">
+               or sequence like concat('%', #{id}, '%')
+            </foreach>
+        </where>
+
+    </select>
         
     <insert id="insertTbLocation" parameterType="TbLocation" useGeneratedKeys="true" keyProperty="id">
         insert into tb_location

ruoyi-admin/src/main/resources/mapper/inventory/TbInventoryDetailMapper.xml

@@ -30,6 +30,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTbInventoryDetailVo"/>
         where id = #{id}
     </select>
+
+    <select id="selectTbInventoryDetailByOrderNumber" parameterType="String" resultMap="TbInventoryDetailResult">
+        <include refid="selectTbInventoryDetailVo"/>
+        where order_number = #{orderNumber}
+    </select>
+
+    <select id="countUncounted" parameterType="String" resultType="Integer">
+        SELECT COUNT(0) FROM tb_inventory_detail WHERE order_number = #{orderNumber} and is_update_data &lt;&gt; 1;
+    </select>
         
     <insert id="insertTbInventoryDetail" parameterType="TbInventoryDetail" useGeneratedKeys="true" keyProperty="id">
         insert into tb_inventory_detail

ruoyi-ui/src/components/asset/assetCard.vue

@@ -2,47 +2,53 @@
   <div class="container">
     <el-descriptions :title="title" v-if="assetInfo" :column="column" :border="border">
       <el-descriptions-item label="资产ID" v-if="assetInfo.id">{{assetInfo.id}}</el-descriptions-item>
-      <el-descriptions-item label="资产名称" v-if="assetInfo.name">{{assetInfo.name}}</el-descriptions-item>
       <el-descriptions-item label="资产条码" v-if="assetInfo.code">{{assetInfo.code}}</el-descriptions-item>
+      <el-descriptions-item label="epc" v-if="assetInfo.epc">{{assetInfo.epc}}</el-descriptions-item>
+      <el-descriptions-item label="epc补充长度" v-if="assetInfo.epcReplenishLength">{{assetInfo.epcReplenishLength}}</el-descriptions-item>
       <el-descriptions-item label="资产编号" v-if="assetInfo.number">{{assetInfo.number}}</el-descriptions-item>
-      <el-descriptions-item label="资产分类" v-if="assetInfo.categoryNumber">{{assetInfo.categoryNumber}}</el-descriptions-item>
+      <el-descriptions-item label="资产名称" v-if="assetInfo.name">{{assetInfo.name}}</el-descriptions-item>
+      <el-descriptions-item label="分类ID" v-if="assetInfo.categoryId">{{assetInfo.categoryId}}</el-descriptions-item>
+      <el-descriptions-item label="分类编号" v-if="assetInfo.categoryNumber">{{assetInfo.categoryNumber}}</el-descriptions-item>
+      <el-descriptions-item label="分类名称" v-if="assetInfo.categoryName">{{assetInfo.categoryName}}</el-descriptions-item>
+      <el-descriptions-item label="所在位置ID" v-if="assetInfo.locationId">{{assetInfo.locationId}}</el-descriptions-item>
+      <el-descriptions-item label="所在位置编号" v-if="assetInfo.locationNumber">{{assetInfo.locationNumber}}</el-descriptions-item>
+      <el-descriptions-item label="所在位置名称" v-if="assetInfo.locationName">{{(assetInfo.ancestorLocationName ? assetInfo.ancestorLocationName + "-" : "") +  (assetInfo.parentLocationName ?  assetInfo.parentLocationName + "-" : "") + assetInfo.locationName}}</el-descriptions-item>
+      <el-descriptions-item label="所在位置标签" v-if="assetInfo.locationLabel">{{assetInfo.locationLabel}}</el-descriptions-item>
       <el-descriptions-item label="规格型号" v-if="assetInfo.specificationsModel">{{assetInfo.specificationsModel}}</el-descriptions-item>
       <el-descriptions-item label="ABC分类" v-if="assetInfo.abcCategory">{{assetInfo.abcCategory}}</el-descriptions-item>
       <el-descriptions-item label="管理状态" v-if="assetInfo.manageStatus">{{assetInfo.manageStatus}}</el-descriptions-item>
-      <el-descriptions-item label="使用部门" v-if="assetInfo.userDepartment">{{assetInfo.userDepartment}}</el-descriptions-item>
-      <el-descriptions-item label="管理部门" v-if="assetInfo.department">{{assetInfo.department}}</el-descriptions-item>
+      <el-descriptions-item label="使用部门ID" v-if="assetInfo.userDepartment">{{assetInfo.userDepartment}}</el-descriptions-item>
+      <el-descriptions-item label="使用部门名称" v-if="assetInfo.userDepartmentName">{{assetInfo.userDepartmentName}}</el-descriptions-item>
+      <el-descriptions-item label="管理部门ID" v-if="assetInfo.department">{{assetInfo.department}}</el-descriptions-item>
+      <el-descriptions-item label="管理部门名称" v-if="assetInfo.departmentName">{{assetInfo.departmentName}}</el-descriptions-item>
+      <el-descriptions-item label="所属公司" v-if="assetInfo.corporation">{{assetInfo.corporation}}</el-descriptions-item>
+      <el-descriptions-item label="所属公司名称" v-if="assetInfo.corporationName">{{assetInfo.corporationName}}</el-descriptions-item>
       <el-descriptions-item label="责任人" v-if="assetInfo.responsiblePerson">{{assetInfo.responsiblePerson}}</el-descriptions-item>
-      <el-descriptions-item label="所在位置编号" v-if="assetInfo.locationNumber">{{assetInfo.locationNumber}}</el-descriptions-item>
       <el-descriptions-item label="资产性质" v-if="assetInfo.property">{{assetInfo.property}}</el-descriptions-item>
+      <el-descriptions-item label="资产用途" v-if="assetInfo.purpose">{{assetInfo.purpose}}</el-descriptions-item>
+      <el-descriptions-item label="入账时间" v-if="assetInfo.paymentReceivingTime">{{assetInfo.paymentReceivingTime}}</el-descriptions-item>
       <el-descriptions-item label="购置日期" v-if="assetInfo.purchaseDate">{{assetInfo.purchaseDate}}</el-descriptions-item>
       <el-descriptions-item label="启用日期" v-if="assetInfo.commissioningDate">{{assetInfo.commissioningDate}}</el-descriptions-item>
-      <el-descriptions-item label="资产原值（元）" v-if="assetInfo.originalValue">{{assetInfo.originalValue}}</el-descriptions-item>
       <el-descriptions-item label="使用年限" v-if="assetInfo.durableYears">{{assetInfo.durableYears}}</el-descriptions-item>
+      <el-descriptions-item label="开始使用日期" v-if="assetInfo.startDate">{{assetInfo.startDate}}</el-descriptions-item>
+      <el-descriptions-item label="预计使用期限" v-if="assetInfo.lifeExpectancy">{{assetInfo.lifeExpectancy}}</el-descriptions-item>
+      <el-descriptions-item label="预计使用期限单位" v-if="assetInfo.lifeUnits">{{assetInfo.lifeUnits}}</el-descriptions-item>
+      <el-descriptions-item label="资产原值（元）" v-if="assetInfo.originalValue">{{assetInfo.originalValue}}</el-descriptions-item>
       <el-descriptions-item label="资产净值（元）" v-if="assetInfo.netValue">{{assetInfo.netValue}}</el-descriptions-item>
       <el-descriptions-item label="资产残值（元）" v-if="assetInfo.residualValue">{{assetInfo.residualValue}}</el-descriptions-item>
+      <el-descriptions-item label="折旧方式" v-if="assetInfo.depreciationMethod">{{assetInfo.depreciationMethod}}</el-descriptions-item>
       <el-descriptions-item label="累计折旧（元）" v-if="assetInfo.accumulatedDepreciation">{{assetInfo.accumulatedDepreciation}}</el-descriptions-item>
       <el-descriptions-item label="最近折旧日期" v-if="assetInfo.lastDepreciationDate">{{assetInfo.lastDepreciationDate}}</el-descriptions-item>
-      <el-descriptions-item label="折旧方式" v-if="assetInfo.depreciationMethod">{{assetInfo.depreciationMethod}}</el-descriptions-item>
       <el-descriptions-item label="合同编号" v-if="assetInfo.contractNumber">{{assetInfo.contractNumber}}</el-descriptions-item>
       <el-descriptions-item label="出厂编号" v-if="assetInfo.factoryNumber">{{assetInfo.factoryNumber}}</el-descriptions-item>
       <el-descriptions-item label="制造商" v-if="assetInfo.manufacturer">{{assetInfo.manufacturer}}</el-descriptions-item>
       <el-descriptions-item label="供应商" v-if="assetInfo.supplier">{{assetInfo.supplier}}</el-descriptions-item>
-      <el-descriptions-item label="资产用途" v-if="assetInfo.purpose">{{assetInfo.purpose}}</el-descriptions-item>
-      <el-descriptions-item label="维保到期日期" v-if="assetInfo.maintenanceDate">{{assetInfo.maintenanceDate}}</el-descriptions-item>
-      <el-descriptions-item label="维修电话" v-if="assetInfo.maintenanceTel">{{assetInfo.maintenanceTel}}</el-descriptions-item>
       <el-descriptions-item label="维修人员" v-if="assetInfo.maintenanceUser">{{assetInfo.maintenanceUser}}</el-descriptions-item>
-      <el-descriptions-item label="所属公司" v-if="assetInfo.corporation">{{assetInfo.corporation}}</el-descriptions-item>
+      <el-descriptions-item label="维修电话" v-if="assetInfo.maintenanceTel">{{assetInfo.maintenanceTel}}</el-descriptions-item>
+      <el-descriptions-item label="维保到期日期" v-if="assetInfo.maintenanceDate">{{assetInfo.maintenanceDate}}</el-descriptions-item>
       <el-descriptions-item label="记录状态" v-if="assetInfo.recordStatus">{{assetInfo.recordStatus}}</el-descriptions-item>
-      <el-descriptions-item label="是否白名单" v-if="assetInfo.reservedColumnA">{{assetInfo.isWhitelist}}</el-descriptions-item>
-      <el-descriptions-item label="预留字段B" v-if="assetInfo.reservedColumnB">{{assetInfo.reservedColumnB}}</el-descriptions-item>
-      <el-descriptions-item label="预留字段C" v-if="assetInfo.reservedColumnC">{{assetInfo.reservedColumnC}}</el-descriptions-item>
-      <el-descriptions-item label="预留字段D" v-if="assetInfo.reservedColumnD">{{assetInfo.reservedColumnD}}</el-descriptions-item>
-      <el-descriptions-item label="预留字段E" v-if="assetInfo.reservedColumnE">{{assetInfo.reservedColumnE}}</el-descriptions-item>
-      <el-descriptions-item label="预留字段F" v-if="assetInfo.reservedColumnF">{{assetInfo.reservedColumnF}}</el-descriptions-item>
-      <el-descriptions-item label="预留字段G" v-if="assetInfo.reservedColumnG">{{assetInfo.reservedColumnG}}</el-descriptions-item>
-      <el-descriptions-item label="预留字段H" v-if="assetInfo.reservedColumnH">{{assetInfo.reservedColumnH}}</el-descriptions-item>
-      <el-descriptions-item label="预留字段I" v-if="assetInfo.reservedColumnI">{{assetInfo.reservedColumnI}}</el-descriptions-item>
-      <el-descriptions-item label="预留字段J" v-if="assetInfo.reservedColumnJ">{{assetInfo.reservedColumnJ}}</el-descriptions-item>
+      <el-descriptions-item label="是否白名单" v-if="assetInfo.isWhitelist">{{assetInfo.isWhitelist}}</el-descriptions-item>
+      <el-descriptions-item label="备注" v-if="assetInfo.remark">{{assetInfo.remark}}</el-descriptions-item>
     </el-descriptions>
   </div>
 </template>
@@ -71,47 +77,77 @@ export default {
         /** 资产条码 */
         code: null,
         /** 资产名称 */
-        name: null,
+        epc: null,
         /** 资产编号 */
-        number: null,
+        epcReplenishLength: null,
         /** 图片路径 */
-        imageUrl: null,
+        number: null,
         /** 资产分类编号 */
+        name: null,
+        /** 规格型号 */
+        categoryId: null,
+        /** ABC分类 */
         categoryNumber: null,
+        /** 管理状态，0：闲置 */
+        categoryName: null,
+        /** 所属位置ID */
+        locationId: null,
+        /** 所属位置编号 */
+        locationNumber: null,
+        /** 所属位置名称 */
+        locationName: null,
+        /** 所属位置标签 */
+        locationLabel: null,
         /** 规格型号 */
         specificationsModel: null,
         /** ABC分类 */
         abcCategory: null,
-        /** 管理状态，0：闲置 */
+        /** 管理状态 */
         manageStatus: null,
-        /** 使用部门 */
+        /** 使用部门ID */
         userDepartment: null,
-        /** 管理部门 */
+        /** 使用部门名称 */
+        userDepartmentName: null,
+        /** 管理部门ID */
         department: null,
+        /** 管理部门名称 */
+        departmentName: null,
+        /** 所属公司ID */
+        corporation: null,
+        /** 所属公司名称 */
+        corporationName: null,
         /** 责任人 */
         responsiblePerson: null,
-        /** 所在位置编号 */
-        locationNumber: null,
         /** 资产性质 */
         property: null,
+        /** 资产用途 */
+        purpose: null,
+        /** 入账时间 */
+        paymentReceivingTime: null,
         /** 购置日期 */
         purchase: null,
         /** 启用日期 */
         commissioning: null,
-        /** 原值（元） */
-        originalValue: null,
         /** 使用年限 */
         durableYears: null,
+        /** 开始使用日期 */
+        startDate: null,
+        /** 预计使用期限 */
+        lifeExpectancy: null,
+        /** 预计使用期限单位 */
+        lifeUnits: null,
+        /** 原值（元） */
+        originalValue: null,
         /** 净值（元） */
         netValue: null,
         /** 残值（元） */
         residualValue: null,
+        /** 折旧方式，0：其他 */
+        depreciationMethod: null,
         /** 累计折旧（元） */
         accumulatedDepreciation: null,
         /** 最近折旧日期 */
         lastDepreciation: null,
-        /** 折旧方式，0：其他 */
-        depreciationMethod: null,
         /** 合同编号 */
         contractNumber: null,
         /** 出厂编号 */
@@ -120,38 +156,18 @@ export default {
         manufacturer: null,
         /** 供应商 */
         supplier: null,
-        /** 资产用途 */
-        purpose: null,
-        /** 维保到期日期 */
-        maintenance: null,
-        /** 维修电话 */
-        maintenanceTel: null,
         /** 维修人员 */
         maintenanceUser: null,
-        /** 所属公司 */
-        corporation: null,
+        /** 维修电话 */
+        maintenanceTel: null,
+        /** 维保到期日期 */
+        maintenance: null,
         /** 记录状态，0：未提交，1：已提交 */
         recordStatus: null,
         /** 是否白名单 */
         isWhitelist: null,
-        /** 预留字段b */
-        reservedColumnB: null,
-        /** 预留字段c */
-        reservedColumnC: null,
-        /** 预留字段d */
-        reservedColumnD: null,
-        /** 预留字段e */
-        reservedColumnE: null,
-        /** 预留字段f */
-        reservedColumnF: null,
-        /** 预留字段g */
-        reservedColumnG: null,
-        /** 预留字段h */
-        reservedColumnH: null,
-        /** 预留字段i */
-        reservedColumnI: null,
-        /** 预留字段j */
-        reservedColumnJ: null
+        /** 备注 */
+        remark: null
       }
     }
   }

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

@@ -255,9 +255,9 @@
         </template> -->
       </el-table-column>
       <el-table-column label="所在位置" align="center" prop="locationName" width="120">
-        <!-- <template slot-scope="scope">
-          <span>{{ locationName(scope.row.locationNumber) }}</span>
-        </template> -->
+        <template slot-scope="scope">
+          <span>{{ (scope.row.ancestorLocationName ? scope.row.ancestorLocationName + "-" : "") +  (scope.row.parentLocationName ?  scope.row.parentLocationName + "-" : "") + scope.row.locationName }}</span>
+        </template>
       </el-table-column>
       <el-table-column v-if="isExist('所属公司')" label="所属公司" align="center" prop="corporationName">
         <!-- <template slot-scope="scope">

ruoyi-ui/src/views/index.vue

@@ -222,7 +222,7 @@
           <span>{{ parseTime(scope.row.inventoryDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="盘点位置" align="center" prop="locationName" />
+      <el-table-column label="盘点位置" align="center" prop="inventoryLocationName" />
       <el-table-column label="备注" align="center" prop="remark" />
     </el-table>
 

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

@@ -76,6 +76,11 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="资产名称" align="center" prop="assetInfo.name" />
+      <el-table-column label="资产位置" align="center">
+        <template slot-scope="props">
+          <span>{{(props.row.assetInfo.ancestorLocationName ? props.row.assetInfo.ancestorLocationName + "-" : "") +  (props.row.assetInfo.parentLocationName ?  props.row.assetInfo.parentLocationName + "-" : "") + props.row.assetInfo.locationName}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="资产编号" align="center" prop="assetInfo.number"  v-if="columns[0].visible" />
       <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[1].visible" />
       <el-table-column label="盘点元数据" align="center" prop="inventoryMetadata" v-if="columns[2].visible"  >
@@ -133,7 +138,7 @@
           <el-input v-model="form.orderNumber" placeholder="请输入单据编号" />
         </el-form-item>
         <el-form-item label="盘点元数据" prop="inventoryMetadata">
-          <el-input v-model="form.inventoryMetadata" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.inventoryMetadata" type="textarea" placeholder="请输入内容" disabled />
         </el-form-item>
         <el-form-item label="是否更新数据" prop="isUpdateData">
           <el-select v-model="form.isUpdateData" placeholder="请选择是否更新数据">

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

@@ -127,7 +127,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="inventoryList" @selection-change="handleSelectionChange">
+    <el-table ref="elTable" v-loading="loading" :data="inventoryList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="资产盘点记录编号" align="center" prop="id" />
       <el-table-column label="单据编号" align="center" prop="orderNumber" width="120">
@@ -137,7 +137,7 @@
           </el-tooltip>
         </template>
       </el-table-column>
-      <el-table-column label="任务名称" align="center" prop="name" />
+      <el-table-column label="任务名称" align="center" prop="name" width="190"/>
       <el-table-column label="盘点部门" align="center" prop="deptName" >
         <!-- <template slot-scope="scope">
           <span>{{ scope.row.inventoryDepartment != null ? companyName(scope.row.inventoryDepartment) : ""}}</span>
@@ -149,7 +149,7 @@
           <span>{{ parseTime(scope.row.inventoryDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="盘点位置" align="center" prop="locationName" />
+      <el-table-column label="盘点位置" align="center" prop="inventoryLocationName" width="200"/>
       <el-table-column label="盘点状态 " align="center" prop="inventoryStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.inventory_status" :value="scope.row.inventoryStatus"/>
@@ -177,6 +177,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            :disabled="scope.row.inventoryStatus > 1"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['inventory:inventory:edit']"
           >修改</el-button>
@@ -230,14 +231,29 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="盘点位置" prop="inventoryLocation">
-          <treeselect v-model="form.inventoryLocation" :options="locationOption" :normalizer="tenantIdnormalizer" placeholder="选择位置" />
+          <div v-if="!isUpdate">
+            <treeselect
+            v-model="form.inventoryLocation" 
+            :multiple="true"
+            :clearable="true"
+            :searchable="true"
+            :open-on-click="true"
+            :clear-on-select="true"
+            :sort-value-by="'INDEX'"
+            :options="locationOption"
+            :limit="3" 
+            placeholder="选择位置" />
+          </div>
+          <div v-else>
+            {{form.inventoryLocationName}}
+          </div>
         </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
+        <el-button
           type="warning"
           @click="submitForm(1)"
           >提 交</el-button
@@ -303,6 +319,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      isUpdate: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -349,7 +366,6 @@ export default {
   methods: {
     onOpenDetail(number) {
       this.inventoryNumber = number
-      console.log('inventoryNumber', this.inventoryNumber)
       this.openDetail = true
     },
     /** 查询部门下拉树结构 */
@@ -360,7 +376,6 @@ export default {
     },
     onSelectUser(info) {
       this.openUserSearch = false
-      console.log('获取用户：', info)
       this.form.inventoryBy = info.userName
     },
     tenantIdnormalizer(node) {
@@ -390,9 +405,9 @@ export default {
     },
     //获取公司名
     companyName(val){
-       let num = parseInt(val)
-       let arr2 = this.arr.filter(item => item.deptId===num);
-       return arr2[0].deptName
+      let num = parseInt(val)
+      let arr2 = this.arr.filter(item => item.deptId===num);
+      return arr2[0].deptName
     },
     // 取消按钮
     cancel() {
@@ -401,6 +416,7 @@ export default {
     },
     // 表单重置
     reset() {
+      this.isUpdate = false
       this.form = {
         id: null,
         orderNumber: null,
@@ -430,9 +446,21 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      let count = 0;
+      if (selection.length) {
+        selection.forEach(item => {
+          if (item.inventoryStatus > 1) {
+            this.$refs.elTable.toggleRowSelection(item, false)
+            count++;
+          }
+        });
+      }
+      if (count > 0) {
+        this.$modal.msgWarning("盘点已进行");
+      }
+      this.ids = selection.filter(item => item.inventoryStatus > 1).map(item => item.id)
+      this.single = (selection.length - count) !==1
+      this.multiple = !(selection.length - count)
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -446,6 +474,7 @@ export default {
       const id = row.id || this.ids
       getInventory(id).then(response => {
         this.form = response.data;
+        this.isUpdate = true;
         this.open = true;
         this.title = "修改资产盘点记录";
       });
@@ -454,15 +483,15 @@ export default {
     submitForm(recordStatus) {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.recordStatus = recordStatus
+          this.form.inventoryLocation = String(this.form.inventoryLocation)
           if (this.form.id != null) {
-            this.form.recordStatus = recordStatus
             updateInventory(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            this.form.recordStatus = recordStatus
             addInventory(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;