增加盘点接口

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

@@ -3,6 +3,7 @@ package com.ruoyi.inventory.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.inventory.domain.dto.TakeStockDTO;
 import com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO;
 import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -96,6 +97,11 @@ public class TbAssetInventoryController extends BaseController
         return toAjax(tbAssetInventoryService.insertTbAssetInventory(tbAssetInventory));
     }
 
+    @PostMapping("/takeStock")
+    public AjaxResult addByTakeStock(@RequestBody TakeStockDTO dto){
+        return toAjax(tbAssetInventoryService.addByTakeStock(dto));
+    }
+
     /**
      * 修改资产盘点记录
      */

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

@@ -101,4 +101,5 @@ public class TbInventoryDetailController extends BaseController
     {
         return toAjax(tbInventoryDetailService.deleteTbInventoryDetailByIds(ids));
     }
+
 }

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

@@ -0,0 +1,26 @@
+package com.ruoyi.inventory.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TagInfo {
+    private Long index;
+    private String type;
+    private String epc;
+    private Long count;
+    private String tid;
+    private String rssi;
+    private String userData;
+    private String reservedData;
+    private String nmv2d;
+    private String epcData;
+    private Integer ltu27;
+    private Integer ltu31;
+    private String moisture;
+    private int ctesius;
+    private boolean isShowTid ;
+}

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

@@ -0,0 +1,25 @@
+package com.ruoyi.inventory.domain.dto;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.inventory.domain.TagInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TakeStockDTO {
+    /** 单据编号 */
+    @Excel(name = "单据编号")
+    private String orderNumber;
+
+    /** 盘点位置 */
+    @Excel(name = "盘点位置")
+    private String inventoryLocation;
+
+    /** 盘点资产RFID列表*/
+    private List<TagInfo> assetList;
+}

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

@@ -20,6 +20,8 @@ public interface TbAssetInventoryMapper
      */
     public TbAssetInventory selectTbAssetInventoryById(Long id);
 
+    public TbAssetInventory selectTbAssetInventoryByNumber(String orderNumber);
+
     /**
      * 查询资产盘点记录列表
      * 

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

@@ -2,6 +2,7 @@ package com.ruoyi.inventory.service;
 
 import java.util.List;
 import com.ruoyi.inventory.domain.TbAssetInventory;
+import com.ruoyi.inventory.domain.dto.TakeStockDTO;
 import com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO;
 
 /**
@@ -36,6 +37,8 @@ public interface ITbAssetInventoryService
      */
     public int insertTbAssetInventory(TbAssetInventory tbAssetInventory);
 
+    public int addByTakeStock(TakeStockDTO dto);
+
     /**
      * 修改资产盘点记录
      * 

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

@@ -1,7 +1,13 @@
 package com.ruoyi.inventory.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
+import com.ruoyi.asset.domain.TbAssetInformation;
+import com.ruoyi.asset.mapper.TbAssetInformationMapper;
+import com.ruoyi.inventory.domain.TagInfo;
+import com.ruoyi.inventory.domain.dto.TakeStockDTO;
 import com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +27,9 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
     @Autowired
     private TbAssetInventoryMapper tbAssetInventoryMapper;
 
+    @Autowired
+    private TbAssetInformationMapper informationMapper;
+
     /**
      * 查询资产盘点记录
      * 
@@ -57,6 +66,72 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
         return tbAssetInventoryMapper.insertTbAssetInventory(tbAssetInventory);
     }
 
+    @Override
+    public int addByTakeStock(TakeStockDTO dto){
+        //解析实体
+        List<TagInfo> list = dto.getAssetList();
+        String location = dto.getInventoryLocation();
+        String orderNumber = dto.getOrderNumber();
+        //获取所在位置内的资产
+        TbAssetInformation information = new TbAssetInformation();
+        information.setLocationNumber(location);
+        List<TbAssetInformation> informations = informationMapper.selectTbAssetInformationList(information);
+        //对比盘点
+        List<TbAssetInformation> intersection = new ArrayList<>(informations);
+        intersection.retainAll(list);
+        if (intersection.size()<informations.size()){
+            //盘亏
+            if (!orderNumber.isEmpty()){
+                TbAssetInventory inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
+                inventory.setInventoryStatus(2L);
+                inventory.setInventoryResult(1L);
+                return updateTbAssetInventory(inventory);
+            }else {
+                TbAssetInventory inventory = new TbAssetInventory();
+                inventory.setInventoryStatus(2L);
+                inventory.setInventoryResult(1L);
+                inventory.setInventoryLocation(location);
+                inventory.setInventoryDate(new Date());
+                inventory.setName("线下自测");
+                return insertTbAssetInventory(inventory);
+            }
+        }else if (list.size()>intersection.size()){
+            //盘盈
+            if (!orderNumber.isEmpty()){
+                TbAssetInventory inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
+                inventory.setInventoryStatus(2L);
+                inventory.setInventoryResult(2L);
+                return updateTbAssetInventory(inventory);
+            }else {
+                TbAssetInventory inventory = new TbAssetInventory();
+                inventory.setInventoryStatus(2L);
+                inventory.setInventoryResult(2L);
+                inventory.setInventoryLocation(location);
+                inventory.setInventoryDate(new Date());
+                inventory.setName("线下自测");
+                return insertTbAssetInventory(inventory);
+            }
+        }else if (intersection.size()==informations.size()){
+            //正常
+            if (!orderNumber.isEmpty()){
+                TbAssetInventory inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
+                inventory.setInventoryStatus(2L);
+                inventory.setInventoryResult(3L);
+                return updateTbAssetInventory(inventory);
+            }else {
+                TbAssetInventory inventory = new TbAssetInventory();
+                inventory.setInventoryStatus(2L);
+                inventory.setInventoryResult(3L);
+                inventory.setInventoryLocation(location);
+                inventory.setInventoryDate(new Date());
+                inventory.setName("线下自测");
+                return insertTbAssetInventory(inventory);
+            }
+        }else {
+            return 0;
+        }
+    }
+
     /**
      * 修改资产盘点记录
      * 

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

@@ -43,6 +43,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTbAssetInventoryVo"/>
         where id = #{id}
     </select>
+
+    <select id="selectTbAssetInventoryByNumber" parameterType="String" resultMap="TbAssetInventoryResult">
+        <include refid="selectTbAssetInventoryVo"/>
+        where order_number = #{orderNumber}
+    </select>
         
     <insert id="insertTbAssetInventory" parameterType="TbAssetInventory" useGeneratedKeys="true" keyProperty="id">
         insert into tb_asset_inventory

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage").permitAll()
+                .antMatchers("/login", "/register", "/captchaImage","/inventory/inventory/takeStock").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**", "/asset/location/tree", "/asset/location/treeSelect").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()