新增盘点数据后增加到盘点明细中

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

@@ -2,6 +2,7 @@ package com.ruoyi.asset.mapper;
 
 import java.util.List;
 import com.ruoyi.asset.domain.TbAssetInformation;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 /**
@@ -69,4 +70,6 @@ public interface TbAssetInformationMapper
     public int deleteTbAssetInformationByIds(Long[] ids);
 
     public boolean updateProperty(TbAssetInformation information);
+
+    List<String> selectNumberByLocations(@Param("locations") List<String> locations);
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.asset.mapper;
 
 import java.util.List;
 import com.ruoyi.asset.domain.TbLocation;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 所属位置Mapper接口
@@ -30,6 +31,13 @@ public interface TbLocationMapper
     public List<TbLocation> selectTbLocationList(TbLocation tbLocation);
 
     /**
+     * 根据编码查子编码及自身
+     * @param location
+     * @return
+     */
+    List<String> selectNumberByFather( String location);
+
+    /**
      * 新增所属位置
      * 
      * @param tbLocation 所属位置

ruoyi-admin/src/main/java/com/ruoyi/asset/service/ITbLocationService.java

@@ -35,6 +35,8 @@ public interface ITbLocationService
 
     public List<TreeSelect> selectTreeSelect(Long id);
 
+
+
     /**
      * 新增所属位置
      * 

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

@@ -115,6 +115,7 @@ public class TbLocationServiceImpl implements ITbLocationService
         return treeSelects;
     }
 
+
     private List<TreeSelect> buildChildrenSelect(TreeSelect treeSelect) {
         TbLocation sunLocation = new TbLocation();
         sunLocation.setParentId(treeSelect.getId());

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

@@ -1,16 +1,15 @@
 package com.ruoyi.inventory.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
-import com.ruoyi.asset.domain.TbAssetInformation;
-import com.ruoyi.asset.domain.TbLocation;
+import cn.hutool.json.JSONUtil;
 import com.ruoyi.asset.mapper.TbAssetInformationMapper;
 import com.ruoyi.asset.mapper.TbLocationMapper;
 import com.ruoyi.inventory.domain.TagInfo;
+import com.ruoyi.inventory.domain.TbInventoryDetail;
 import com.ruoyi.inventory.domain.dto.TakeStockDTO;
 import com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO;
+import com.ruoyi.inventory.mapper.TbInventoryDetailMapper;
 import com.ruoyi.utils.IDUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,6 +33,9 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
     private TbAssetInformationMapper informationMapper;
 
     @Autowired
+    private TbInventoryDetailMapper tbInventoryDetailMapper;
+
+    @Autowired
     private TbLocationMapper locationMapper;
 
     /**
@@ -70,9 +72,6 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
     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);
     }
 
@@ -88,80 +87,33 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
         for (TagInfo tagInfo : list){
             epcList.add(tagInfo.getEpc());
         }
+        //根据位置获取包含自身及子位置,递归
+        List<String> locations = getNumberWithChildren(location);
         //获取所在位置内的资产
-        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<String> rfidList = informationMapper.selectNumberByLocations(locations);
         //对比盘点
         List<String> intersection = new ArrayList<>(rfidList);
         intersection.retainAll(epcList);
-        if (intersection.size()<informations.size()){
+        if (intersection.size()<rfidList.size()){
             //盘亏
             if (!orderNumber.isEmpty()){
-                TbAssetInventory inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
-                if (inventory.getRecordStatus() == 1L) {
-                    inventory.setInventoryStatus(2L);
-                    inventory.setInventoryResult(2L);
-                    return updateTbAssetInventory(inventory);
-                }else {
-                    return 0;
-                }
+                return takeStock(orderNumber, intersection, 2L);
             }else {
-                TbAssetInventory inventory = new TbAssetInventory();
-                inventory.setInventoryStatus(2L);
-                inventory.setInventoryResult(2L);
-                inventory.setRecordStatus(1L);
-                inventory.setInventoryLocation(location);
-                inventory.setInventoryDate(new Date());
-                inventory.setName("线下自测");
-                return insertTbAssetInventory(inventory);
+                return takeStock2(location, 2L);
             }
         }else if (list.size()>intersection.size()){
             //盘盈
             if (!orderNumber.isEmpty()){
-                TbAssetInventory inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
-                if (inventory.getRecordStatus() == 1L) {
-                    inventory.setInventoryStatus(2L);
-                    inventory.setInventoryResult(1L);
-                    return updateTbAssetInventory(inventory);
-                }else {
-                    return 0;
-                }
+                return takeStock(orderNumber, epcList, 1L);
             }else {
-                TbAssetInventory inventory = new TbAssetInventory();
-                inventory.setInventoryStatus(2L);
-                inventory.setInventoryResult(1L);
-                inventory.setRecordStatus(1L);
-                inventory.setInventoryLocation(location);
-                inventory.setInventoryDate(new Date());
-                inventory.setName("线下自测");
-                return insertTbAssetInventory(inventory);
+                return takeStock2(location, 1L);
             }
-        }else if (intersection.size()==informations.size()){
+        }else if (intersection.size()==rfidList.size()){
             //正常
             if (!orderNumber.isEmpty()){
-                TbAssetInventory inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);
-                if (inventory.getRecordStatus() == 1L) {
-                    inventory.setInventoryStatus(2L);
-                    inventory.setInventoryResult(3L);
-                    return updateTbAssetInventory(inventory);
-                }else {
-                    return 0;
-                }
+                return takeStock(orderNumber, epcList, 3L);
             }else {
-                TbAssetInventory inventory = new TbAssetInventory();
-                inventory.setInventoryStatus(2L);
-                inventory.setInventoryResult(3L);
-                inventory.setRecordStatus(1L);
-                inventory.setInventoryLocation(location);
-                inventory.setInventoryDate(new Date());
-                inventory.setName("线下自测");
-                return insertTbAssetInventory(inventory);
+                return takeStock2(location, 3L);
             }
         }else {
             return 0;
@@ -208,4 +160,59 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
     public List<TbAssetInventoryDTO> selectTbAssetInventoryDTOList(TbAssetInventoryDTO dto) {
         return tbAssetInventoryMapper.selectTbAssetInventoryDTOList(dto);
     }
+
+
+    /**
+     * 递归函数
+     */
+    public List<String> getNumberWithChildren(String number) {
+        Set<String> result = new HashSet<>();
+        Set<String> visited = new HashSet<>(); // 用于跟踪已访问过的节点
+
+        processNumberWithChildren(number, result, visited); // 调用辅助方法处理节点及其子节点
+
+        return new ArrayList<>(result);
+    }
+
+    private void processNumberWithChildren(String number, Set<String> result, Set<String> visited) {
+        if (!visited.contains(number)) { // 避免重复处理节点
+            visited.add(number);
+            List<String> children = locationMapper.selectNumberByFather(number); // 调用mapper接口方法查询直接子节点
+
+            // 递归处理每个子节点
+            for (String child : children) {
+                result.add(child);
+                processNumberWithChildren(child, result, visited);
+            }
+        }
+    }
+
+    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);
+            }
+            return updateTbAssetInventory(inventory);
+        }else {
+            return 0;
+        }
+    }
+
+    private int takeStock2(String location, Long result){
+        TbAssetInventory inventory = new TbAssetInventory();
+        inventory.setInventoryStatus(2L);
+        inventory.setInventoryResult(result);
+        inventory.setRecordStatus(1L);
+        inventory.setInventoryLocation(location);
+        inventory.setInventoryDate(new Date());
+        inventory.setName("线下自测");
+        return insertTbAssetInventory(inventory);
+    }
 }

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

@@ -38,6 +38,9 @@ logging:
   level:
     com.ruoyi: debug
     org.springframework: warn
+    org.springframework.jdbc.core: debug
+    org.hibernate.SQL: debug
+    org.hibernate.type.descriptor.sql.BasicBinder: trace
 
 # 用户配置
 user:

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

@@ -107,6 +107,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
+    <select id="selectNumberByLocations" parameterType="String" resultType="String">
+        select a.number from tb_asset_information a
+        where a.location_number in
+        <foreach item="item" collection="locations" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+    
     <select id="selectTbAssetInformationById" parameterType="Long" resultMap="TbAssetInformationResult">
         <include refid="selectTbAssetInformationVo"/>
         where id = #{id}

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

@@ -42,6 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTbLocationVo"/>
         where number = #{number}
     </select>
+
+    <select id="selectNumberByFather" parameterType="String" resultType="String">
+        select a.number, a.id, a.name from tb_location a
+        where a.number = #{number}
+           or a.parent_id = (select b.id from tb_location b where b.number = #{number})
+    </select>
         
     <insert id="insertTbLocation" parameterType="TbLocation" useGeneratedKeys="true" keyProperty="id">
         insert into tb_location

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

@@ -26,7 +26,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -57,7 +57,7 @@
           @click="handleDelete"
           v-hasPermi="['inventory:detail:remove']"
         >删除</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -75,7 +75,20 @@
       <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" />
-      <el-table-column label="盘点元数据" align="center" prop="inventoryMetadata" />
+      <el-table-column label="盘点元数据" align="center" prop="inventoryMetadata" >
+        <template slot-scope="props">
+          <el-button
+                  type="text"
+                  icon="el-icon-search"
+                  @click="
+                    onSelectOriginalAssetInfo(
+                      props.row.inventoryMetadata
+                    )
+                  "
+                  >查看</el-button
+                >
+        </template>
+      </el-table-column>
       <el-table-column label="是否更新数据" align="center" prop="isUpdateData">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isUpdateData"/>
@@ -138,6 +151,18 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+        <!-- 【调整】资产信息 -->
+        <el-dialog
+      title="资产信息"
+      :visible.sync="openAdjustment"
+      width="900px"
+      append-to-body
+    >
+      <AssetInfo
+        :title="'资产原信息'"
+        :assetInfo="adjustmentOriginalAssetInfo"
+      />
+    </el-dialog>
   </div>
 </template>
 
@@ -147,6 +172,9 @@ import { listDetail, getDetail, delDetail, addDetail, updateDetail } from "@/api
 export default {
   name: "Detail",
   dicts: ['sys_yes_no'],
+  components: {
+    AssetInfo: () => import("@/components/asset/assetCard.vue"),
+  },
   data() {
     return {
       // 遮罩层
@@ -155,6 +183,9 @@ export default {
       ids: [],
       // 非单个禁用
       single: true,
+      // 资产原信息
+      openAdjustment: false,
+      adjustmentOriginalAssetInfo: null,
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
@@ -286,7 +317,13 @@ export default {
       this.download('inventory/detail/export', {
         ...this.queryParams
       }, `detail_${new Date().getTime()}.xlsx`)
-    }
+    },
+    onSelectOriginalAssetInfo(info) {
+      const json = JSON.parse(info);
+      this.adjustmentOriginalAssetInfo = json;
+      this.openAdjustment = true;
+      console.log("资产原信息:", json);
+    },
   }
 };
 </script>