修改盘点接口

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

@@ -97,6 +97,11 @@ public class TbAssetInventoryController extends BaseController
         return toAjax(tbAssetInventoryService.insertTbAssetInventory(tbAssetInventory));
     }
 
+    /**
+     * 手持机盘点
+     * @param dto
+     * @return
+     */
     @PostMapping("/takeStock")
     public AjaxResult addByTakeStock(@RequestBody TakeStockDTO dto){
         return toAjax(tbAssetInventoryService.addByTakeStock(dto));

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

@@ -22,5 +22,5 @@ public class TagInfo {
     private Integer ltu31;
     private String moisture;
     private int ctesius;
-    private boolean isShowTid ;
+    private boolean isShowTid;
 }

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

@@ -29,6 +29,10 @@ public class TbAssetInventoryDTO {
     @Excel(name = "盘点部门")
     private String deptName;
 
+    /** 盘点部门 */
+    @Excel(name = "盘点部门")
+    private String inventoryDepartment;
+
     /** 盘点人 */
     @Excel(name = "盘点人")
     private String inventoryBy;
@@ -42,6 +46,8 @@ public class TbAssetInventoryDTO {
     @Excel(name = "盘点位置")
     private String inventoryLocation;
 
+    private String locationName;
+
     /** 盘点状态，0:盘点编制，1：盘点执行，2：盘点完毕，3：盘点暂停 */
     @Excel(name = "盘点状态，0:盘点编制，1：盘点执行，2：盘点完毕，3：盘点暂停")
     private Long inventoryStatus;

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

@@ -5,10 +5,13 @@ import java.util.Date;
 import java.util.List;
 
 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.inventory.domain.TagInfo;
 import com.ruoyi.inventory.domain.dto.TakeStockDTO;
 import com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO;
+import com.ruoyi.utils.IDUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.inventory.mapper.TbAssetInventoryMapper;
@@ -30,6 +33,9 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
     @Autowired
     private TbAssetInformationMapper informationMapper;
 
+    @Autowired
+    private TbLocationMapper locationMapper;
+
     /**
      * 查询资产盘点记录
      * 
@@ -63,33 +69,53 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
     @Override
     public int insertTbAssetInventory(TbAssetInventory tbAssetInventory)
     {
+        tbAssetInventory.setOrderNumber(IDUtil.getUUID1());
+        Long id = Long.parseLong(tbAssetInventory.getInventoryLocation());
+        TbLocation location = locationMapper.selectTbLocationById(id);
+        tbAssetInventory.setInventoryLocation(location.getNumber());
         return tbAssetInventoryMapper.insertTbAssetInventory(tbAssetInventory);
     }
 
+    //手持机盘点
     @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());
+        }
         //获取所在位置内的资产
         TbAssetInformation information = new TbAssetInformation();
         information.setLocationNumber(location);
         List<TbAssetInformation> informations = informationMapper.selectTbAssetInformationList(information);
+        //提取rfid
+        ArrayList<String> rfidList = new ArrayList<>();
+        for (TbAssetInformation info : informations){
+            rfidList.add(info.getNumber());
+        }
         //对比盘点
-        List<TbAssetInformation> intersection = new ArrayList<>(informations);
-        intersection.retainAll(list);
+        List<String> intersection = new ArrayList<>(rfidList);
+        intersection.retainAll(epcList);
         if (intersection.size()<informations.size()){
             //盘亏
             if (!orderNumber.isEmpty()){
                 TbAssetInventory inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
-                inventory.setInventoryStatus(2L);
-                inventory.setInventoryResult(1L);
-                return updateTbAssetInventory(inventory);
+                if (inventory.getRecordStatus() == 1L) {
+                    inventory.setInventoryStatus(2L);
+                    inventory.setInventoryResult(2L);
+                    return updateTbAssetInventory(inventory);
+                }else {
+                    return 0;
+                }
             }else {
                 TbAssetInventory inventory = new TbAssetInventory();
                 inventory.setInventoryStatus(2L);
-                inventory.setInventoryResult(1L);
+                inventory.setInventoryResult(2L);
+                inventory.setRecordStatus(1L);
                 inventory.setInventoryLocation(location);
                 inventory.setInventoryDate(new Date());
                 inventory.setName("线下自测");
@@ -99,13 +125,18 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
             //盘盈
             if (!orderNumber.isEmpty()){
                 TbAssetInventory inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
-                inventory.setInventoryStatus(2L);
-                inventory.setInventoryResult(2L);
-                return updateTbAssetInventory(inventory);
+                if (inventory.getRecordStatus() == 1L) {
+                    inventory.setInventoryStatus(2L);
+                    inventory.setInventoryResult(1L);
+                    return updateTbAssetInventory(inventory);
+                }else {
+                    return 0;
+                }
             }else {
                 TbAssetInventory inventory = new TbAssetInventory();
                 inventory.setInventoryStatus(2L);
-                inventory.setInventoryResult(2L);
+                inventory.setInventoryResult(1L);
+                inventory.setRecordStatus(1L);
                 inventory.setInventoryLocation(location);
                 inventory.setInventoryDate(new Date());
                 inventory.setName("线下自测");
@@ -115,13 +146,18 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
             //正常
             if (!orderNumber.isEmpty()){
                 TbAssetInventory inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
-                inventory.setInventoryStatus(2L);
-                inventory.setInventoryResult(3L);
-                return updateTbAssetInventory(inventory);
+                if (inventory.getRecordStatus() == 1L) {
+                    inventory.setInventoryStatus(2L);
+                    inventory.setInventoryResult(3L);
+                    return updateTbAssetInventory(inventory);
+                }else {
+                    return 0;
+                }
             }else {
                 TbAssetInventory inventory = new TbAssetInventory();
                 inventory.setInventoryStatus(2L);
                 inventory.setInventoryResult(3L);
+                inventory.setRecordStatus(1L);
                 inventory.setInventoryLocation(location);
                 inventory.setInventoryDate(new Date());
                 inventory.setName("线下自测");

ruoyi-admin/src/main/java/com/ruoyi/utils/IDUtil.java

@@ -0,0 +1,17 @@
+package com.ruoyi.utils;
+
+import com.ruoyi.common.utils.uuid.UUID;
+
+public class IDUtil {
+    public static String getUUID1() {
+        return UUID.randomUUID().toString().replace("-", "").substring(0,8);
+    }
+
+    public static String getUUID2() {
+        return UUID.randomUUID().toString().replace("-", "") + UUID.randomUUID().toString().replace("-", "");
+    }
+
+    public static String getUUID3() {
+        return UUID.randomUUID().toString().replace("-", "") + UUID.randomUUID().toString().replace("-", "") + UUID.randomUUID().toString().replace("-", "");
+    }
+}

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

@@ -114,27 +114,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTbAssetInventoryDTOList" parameterType="com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO" resultType="com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO">
         select
-            a.id,
-            a.order_number orderNumber,
-            a.name,
-            b.dept_name deptName,
-            a.inventory_by inventoryBy,
-            a.inventory_date inventoryDate,
-            a.inventory_location inventoryLocation,
-            a.inventory_status inventoryStatus,
-            a.inventory_result inventoryResult,
-            a.record_status recordResult,
-            a.record_status recordStatus,
-            a.remark,
-            a.created_time createdTime,
-            a.updated_time updatedTime
+        a.id,
+        a.order_number orderNumber,
+        a.name,
+        b.dept_name deptName,
+        a.inventory_department inventoryDepartment,
+        a.inventory_by inventoryBy,
+        a.inventory_date inventoryDate,
+        a.inventory_location inventoryLocation,
+        a.inventory_status inventoryStatus,
+        a.inventory_result inventoryResult,
+        a.record_status recordStatus,
+        a.remark,
+        a.created_time createdTime,
+        a.updated_time updatedTime,
+        c.name locationName
         from
-            tb_asset_inventory a
+        tb_asset_inventory a
         left join
-            sys_dept b
+        sys_dept b
         on
-            a.inventory_department = b.dept_id
-        where
-            a.inventory_by = #{inventoryBy}
+        a.inventory_department = b.dept_id
+        left join
+        tb_location c
+        on
+        a.inventory_location = c.number
+        <where>
+            <if test="orderNumber != null  and orderNumber != ''"> and a.order_number = #{orderNumber}</if>
+            <if test="name != null  and name != ''"> and name like a.concat('%', #{name}, '%')</if>
+            <if test="inventoryDepartment != null  and inventoryDepartment != ''"> and a.inventory_department = #{inventoryDepartment}</if>
+            <if test="inventoryBy != null  and inventoryBy != ''"> and a.inventory_by = #{inventoryBy}</if>
+            <if test="inventoryDate != null "> and a.inventory_date = #{inventoryDate}</if>
+            <if test="inventoryLocation != null  and inventoryLocation != ''"> and a.inventory_location = #{inventoryLocation}</if>
+            <if test="inventoryStatus != null "> and a.inventory_status = #{inventoryStatus}</if>
+            <if test="inventoryResult != null "> and a.inventory_result = #{inventoryResult}</if>
+            <if test="recordStatus != null "> and a.record_status = #{recordStatus}</if>
+        </where>
     </select>
 </mapper>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/StrTreeSelect.java

@@ -0,0 +1,66 @@
+package com.ruoyi.common.core.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class StrTreeSelect implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 节点ID */
+    private String id;
+
+    private Long index;
+
+    /** 节点名称 */
+    private String label;
+
+    /** 子节点 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<StrTreeSelect> children;
+
+    public StrTreeSelect()
+    {
+
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public Long getIndex() {
+        return index;
+    }
+
+    public void setIndex(Long index) {
+        this.index = index;
+    }
+
+    public String getLabel()
+    {
+        return label;
+    }
+
+    public void setLabel(String label)
+    {
+        this.label = label;
+    }
+
+    public List<StrTreeSelect> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<StrTreeSelect> children)
+    {
+        this.children = children;
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/Folder2ZipUtils.java

@@ -28,7 +28,7 @@ public class Folder2ZipUtils {
             String time = format.format(new Date());
             String downloadFileName = time + "_my.zip";
             // 转换为中文否则可能乱码
-            downloadFileName = URLEncoder.encode(downloadFileName, StandardCharsets.UTF_8);
+            downloadFileName = URLEncoder.encode(downloadFileName, "utf-8");
 
             // 将zip以流的形式输出到前台 指明response的返回对象是文件流
             response.setHeader("content-type", "application/octet-stream");

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="inventoryLocation" />
+      <el-table-column label="盘点位置" align="center" prop="locationName" />
       <el-table-column label="备注" align="center" prop="remark" />
     </el-table>
 

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

@@ -132,10 +132,10 @@
       <el-table-column label="资产盘点记录编号" align="center" prop="id" />
       <el-table-column label="单据编号" align="center" prop="orderNumber" />
       <el-table-column label="任务名称" align="center" prop="name" />
-      <el-table-column label="盘点部门" align="center" prop="inventoryDepartment" >
-        <template slot-scope="scope">
+      <el-table-column label="盘点部门" align="center" prop="deptName" >
+        <!-- <template slot-scope="scope">
           <span>{{ scope.row.inventoryDepartment != null ? companyName(scope.row.inventoryDepartment) : ""}}</span>
-        </template>
+        </template> -->
       </el-table-column>
       <el-table-column label="盘点人" align="center" prop="inventoryBy" />
       <el-table-column label="盘点日期" align="center" prop="inventoryDate" width="180">
@@ -143,7 +143,7 @@
           <span>{{ parseTime(scope.row.inventoryDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="盘点位置" align="center" prop="inventoryLocation" />
+      <el-table-column label="盘点位置" align="center" prop="locationName" />
       <el-table-column label="盘点状态 " align="center" prop="inventoryStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.inventory_status" :value="scope.row.inventoryStatus"/>
@@ -196,9 +196,9 @@
     <!-- 添加或修改资产盘点记录对话框 -->
     <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="orderNumber">
+        <!-- <el-form-item label="单据编号" prop="orderNumber">
           <el-input v-model="form.orderNumber" placeholder="请输入单据编号" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="任务名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入任务名称" />
         </el-form-item>
@@ -257,7 +257,7 @@
 
 <script>
 import { deptTreeSelect } from '@/api/system/user.js'
-import { listInventory, getInventory, delInventory, addInventory, updateInventory } from "@/api/inventory/inventory";
+import { listInventory, getInventory, delInventory, addInventory, updateInventory, listInventoryDTO } from "@/api/inventory/inventory";
 import { treeSelect } from "@/api/asset/location";
 import { listDept } from "@/api/system/dept";
 import UserSearch from '@/components/SysUserSearch/index.vue'
@@ -357,7 +357,7 @@ export default {
       listDept().then((response) => {
         this.arr = response.data
       });
-      listInventory(this.queryParams).then(response => {
+      listInventoryDTO(this.queryParams).then(response => {
         this.inventoryList = response.rows;
         this.total = response.total;
         this.loading = false;