新增资产盘点记录分类分颜色展示功能

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

@@ -74,6 +74,7 @@ public class TbAssetInformationServiceImpl implements ITbAssetInformationService
         String locationNumber = tbAssetInformation.getLocationNumber();
         List<String> childrens = new RecursionUtil().getNumberWithChildren(locationMapper, locationNumber);
         tbAssetInformation.setNlist(childrens);
+
         return tbAssetInformationMapper.selectTbAssetInformationList(tbAssetInformation);
     }
 

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

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

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

@@ -1,5 +1,9 @@
 package com.ruoyi.inventory.domain;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,6 +15,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ydl
  * @date 2023-06-01
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class TbInventoryDetail extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -27,54 +35,7 @@ public class TbInventoryDetail extends BaseEntity
     private String inventoryMetadata;
 
     /** 是否更新数据 */
-    @Excel(name = "是否更新数据")
+    @Excel(name = "是否已盘点")
     private Long isUpdateData;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setOrderNumber(String orderNumber) 
-    {
-        this.orderNumber = orderNumber;
-    }
-
-    public String getOrderNumber() 
-    {
-        return orderNumber;
-    }
-    public void setInventoryMetadata(String inventoryMetadata) 
-    {
-        this.inventoryMetadata = inventoryMetadata;
-    }
-
-    public String getInventoryMetadata() 
-    {
-        return inventoryMetadata;
-    }
-    public void setIsUpdateData(Long isUpdateData) 
-    {
-        this.isUpdateData = isUpdateData;
-    }
-
-    public Long getIsUpdateData() 
-    {
-        return isUpdateData;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("orderNumber", getOrderNumber())
-            .append("inventoryMetadata", getInventoryMetadata())
-            .append("isUpdateData", getIsUpdateData())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

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

@@ -21,6 +21,7 @@ public interface ITbAssetInventoryService
      */
     public TbAssetInventory selectTbAssetInventoryById(Long id);
 
+    TbAssetInventory selectTbAssetInventoryByNum(String num);
     /**
      * 查询资产盘点记录列表
      * 
@@ -37,7 +38,7 @@ public interface ITbAssetInventoryService
      */
     public int insertTbAssetInventory(TbAssetInventory tbAssetInventory);
 
-    public int addByTakeStock(TakeStockDTO dto);
+    public int addByTakeStock(List<TakeStockDTO> dto);
 
     /**
      * 修改资产盘点记录

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

@@ -3,8 +3,11 @@ package com.ruoyi.inventory.service.impl;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.logging.SimpleFormatter;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
+import com.ruoyi.asset.domain.TbAssetInformation;
 import com.ruoyi.asset.mapper.TbAssetInformationMapper;
 import com.ruoyi.asset.mapper.TbLocationMapper;
 import com.ruoyi.common.exception.ServiceException;
@@ -15,6 +18,7 @@ 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;
@@ -54,6 +58,11 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
         return tbAssetInventoryMapper.selectTbAssetInventoryById(id);
     }
 
+    @Override
+    public TbAssetInventory selectTbAssetInventoryByNum(String num) {
+        return tbAssetInventoryMapper.selectTbAssetInventoryByNumber(num);
+    }
+
     /**
      * 查询资产盘点记录列表
      * 
@@ -81,47 +90,51 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
 
     //手持机盘点
     @Override
-    public int addByTakeStock(TakeStockDTO dto){
-        //解析实体
-        List<TagInfo> list = dto.getAssetList();
-        String location = dto.getInventoryLocation();
-        String orderNumber = dto.getOrderNumber();
-        //提取epc
-        ArrayList<String> epcList = new ArrayList<>();
-        for (TagInfo tagInfo : list){
-            epcList.add(tagInfo.getEpc());
-        }
-        //根据位置获取包含自身及子位置,递归
-        List<String> locations = new RecursionUtil().getNumberWithChildren(locationMapper, location);
-        //获取所在位置内的资产
-        List<String> rfidList = informationMapper.selectNumberByLocations(locations);
-        //对比盘点
-        List<String> intersection = new ArrayList<>(rfidList);
-        intersection.retainAll(epcList);
-        if (intersection.size()<rfidList.size()){
-            //盘亏
-            if (!orderNumber.isEmpty()){
-                return takeStock(orderNumber, epcList, 2L);
-            }else {
-                return takeStock2(location, 2L, epcList);
-            }
-        }else if (list.size()>intersection.size()){
-            //盘盈
-            if (!orderNumber.isEmpty()){
-                return takeStock(orderNumber, epcList, 1L);
-            }else {
-                return takeStock2(location, 1L, epcList);
+    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
+            ArrayList<String> epcList = new ArrayList<>();
+            for (TagInfo tagInfo : list) {
+                epcList.add(tagInfo.getEpc());
             }
-        }else if (intersection.size()==rfidList.size()){
-            //正常
-            if (!orderNumber.isEmpty()){
-                return takeStock(orderNumber, epcList, 3L);
-            }else {
-                return takeStock2(location, 3L, epcList);
+            //根据位置获取包含自身及子位置,递归
+            List<String> locations = new RecursionUtil().getNumberWithChildren(locationMapper, location);
+            //获取所在位置内的资产
+            List<String> rfidList = informationMapper.selectNumberByLocations(locations);
+            //对比盘点
+            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);
+                }
+            } else if (list.size() > intersection.size()) {
+                //盘盈
+                if (!orderNumber.isEmpty()) {
+                    result = takeStock(orderNumber, epcList, 1L);
+                } else {
+                    result = takeStock2(location, 1L, epcList);
+                }
+            } else if (intersection.size() == rfidList.size()) {
+                //正常
+                if (!orderNumber.isEmpty()) {
+                    result = takeStock(orderNumber, epcList, 3L);
+                } else {
+                    result = takeStock2(location, 3L, epcList);
+                }
+            } else {
+                result = 0;
             }
-        }else {
-            return 0;
         }
+        return result;
     }
 
     /**
@@ -168,15 +181,11 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
     private int takeStock(String orderNumber, List<String> list, Long result){
         TbAssetInventory inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
         if (inventory.getRecordStatus() == 1L) {
+            //插入盘点
             inventory.setInventoryStatus(2L);
             inventory.setInventoryResult(result);
-            //插入盘点明细
-            TbInventoryDetail detail = new TbInventoryDetail();
-            for (String number : list) {
-                detail.setOrderNumber(orderNumber);
-                detail.setInventoryMetadata(JSONUtil.toJsonStr(informationMapper.selectTbAssetInformationByAssetNumber(number)));
-                tbInventoryDetailMapper.insertTbInventoryDetail(detail);
-            }
+            //插入明细
+            setDetail(orderNumber, list);
             return updateTbAssetInventory(inventory);
         }else {
             return 0;
@@ -199,12 +208,50 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
         }
         String orderNumber = inventory.getOrderNumber();
         //插入盘点明细
+        setDetail(orderNumber, list);
+        return 1;
+    }
+
+    private void setDetail(String orderNumber, List<String> list){
+        //该位置下的资产
+        TbAssetInventory _inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
+        TbAssetInformation information = new TbAssetInformation();
+        String location = _inventory.getInventoryLocation();
+        information.setLocationNumber(location);
+        List<String> childrens = new RecursionUtil().getNumberWithChildren(locationMapper, location);
+        information.setNlist(childrens);
+        List<TbAssetInformation> informations = informationMapper.selectTbAssetInformationList(information);
+        if (informations == null || informations.isEmpty() ){
+            return ;
+        }
+        //该位置下资产rfid list
+        List<String> _list = informations.stream().map(TbAssetInformation::getNumber).collect(Collectors.toList());
+
+        //已盘点,1
+        List<String> green = (List) CollectionUtil.intersection(_list, list);
+        //未盘点,2
+        List<String> red = new ArrayList<>(_list);
+        red.removeAll(list);
+        //异常(多余),0
+        List<String> yellow = new ArrayList<>(list);
+        yellow.removeAll(_list);
+        //插入详细盘点信息
         TbInventoryDetail detail = new TbInventoryDetail();
+        //已盘
+        setInventoryDetail(green, detail, orderNumber, 1L);
+        //未盘
+        setInventoryDetail(red, detail, orderNumber, 2L);
+        //异常
+        setInventoryDetail(yellow, detail, orderNumber, 0L);
+    }
+
+    private void setInventoryDetail(List<String> list, TbInventoryDetail detail, String orderNumber, Long isUpdate){
         for (String number : list) {
             detail.setOrderNumber(orderNumber);
             detail.setInventoryMetadata(JSONUtil.toJsonStr(informationMapper.selectTbAssetInformationByAssetNumber(number)));
+            detail.setIsUpdateData(isUpdate);
             tbInventoryDetailMapper.insertTbInventoryDetail(detail);
         }
-        return 1;
     }
+
 }

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

@@ -1,6 +1,18 @@
 package com.ruoyi.inventory.service.impl;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.asset.domain.TbAssetInformation;
+import com.ruoyi.asset.mapper.TbAssetInformationMapper;
+import com.ruoyi.asset.mapper.TbLocationMapper;
+import com.ruoyi.inventory.domain.TbAssetInventory;
+import com.ruoyi.inventory.mapper.TbAssetInventoryMapper;
+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.TbInventoryDetailMapper;
@@ -19,6 +31,14 @@ public class TbInventoryDetailServiceImpl implements ITbInventoryDetailService
     @Autowired
     private TbInventoryDetailMapper tbInventoryDetailMapper;
 
+    @Autowired
+    private TbAssetInventoryMapper tbAssetInventoryMapper;
+
+    @Autowired
+    private TbAssetInformationMapper tbAssetInformationMapper;
+
+    @Autowired
+    private TbLocationMapper locationMapper;
     /**
      * 查询资产盘点明细
      * 
@@ -31,6 +51,7 @@ public class TbInventoryDetailServiceImpl implements ITbInventoryDetailService
         return tbInventoryDetailMapper.selectTbInventoryDetailById(id);
     }
 
+
     /**
      * 查询资产盘点明细列表
      * 

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,11 +6,10 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://114.116.114.108:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://139.9.50.163:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://127.0.0.1:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-#                password: ydl@123456
-                url: jdbc:mysql://43.139.55.209:3306/rfid_hotel_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                password: syLwt@123456
+                password: ydl@123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@ ruoyi:
   # 版权年份
   copyrightYear: 2023
   # 实例演示开关
-  demoEnabled: true
+  demoEnabled: false
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
@@ -22,6 +22,10 @@ server:
   servlet:
     # 应用的访问路径
     context-path: /
+    encoding:
+      charset: UTF-8
+      force: true
+      enabled: true
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8
@@ -73,14 +77,9 @@ spring:
   # redis 配置
   redis:
     # 地址
-    # host: 114.116.114.108
-    # 密码
-    # password: foobared
-
-    # 地址
-    host: 43.139.55.209
+    host: localhost
     # 密码
-    password: syLwt@123456
+    #password: foobared
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -97,6 +96,7 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
+    password:
 
 # token配置
 token:

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

@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.name,
                a.number,
                a.image_url imageUrl,
-               a.category_number categoryNumber,
+               e.name categoryNumber,
                a.specifications_model specificationsModel,
                a.abc_category abcCategory,
                a.manage_status manageStatus,
@@ -100,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.update_time updateTime,
                a.is_whitelist isWhitelist
         from tb_asset_information a
+        left join tb_asset_category e on a.category_number = e.number
         left join sys_dept b on a.user_department = b.dept_id
         left join sys_dept d on a.corporation = d.dept_id
         <where>

ruoyi-ui/src/views/index.vue

@@ -275,6 +275,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         recordStatus: 1,
+        inventoryResult: 0,
         inventoryBy: '',
       },
     };