调整上传的接口

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentListDto.java

@@ -19,16 +19,15 @@ public class EquipmentListDto {
         private BigDecimal fixPrice;
         private String num;
         private String state;
-        private String price;
-        private String accountNumber;
-        private String hasCount;
         private List<PriceInfo> priceInfo;
         @Data
         public  static   class PriceInfo
         {
                 private BigDecimal price;
+                private String stockNum;
                 private String num;
                 private Integer accountNumber;
                 private BigDecimal stockPrice;
+                private String hasCount;
         }
 }

jyzb-biz/src/main/java/com/junmp/jyzb/entity/BussinessDetail.java

@@ -36,6 +36,11 @@ public class BussinessDetail implements Serializable {
     /**
      * 工作流id
      */
+    @TableField(value = "group_id")
+    private String groupId;
+    /**
+     * 工作流id
+     */
     @TableField(value = "type_id")
     private String typeId;
 

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/BussinessInventoryMapper.java

@@ -2,6 +2,7 @@ package com.junmp.jyzb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.junmp.jyzb.entity.BusForm;
+import com.junmp.jyzb.entity.BussinessDetail;
 import com.junmp.jyzb.entity.BussinessInventory;
 import com.junmp.jyzb.entity.CabinetBox;
 import org.apache.ibatis.annotations.Mapper;
@@ -12,6 +13,7 @@ import java.util.Map;
 @Mapper
 public interface BussinessInventoryMapper extends BaseMapper<BussinessInventory> {
 
+    List<BussinessDetail> GetBussinessInventoryMap(String id);
 }
 
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java

@@ -62,6 +62,9 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
     @Resource
     private IFlowInstanceService FlowInstanceService;
     @Resource
+    private BussinessInventoryMapper bussinessInventoryMapper;
+
+    @Resource
     private TaskService taskService;
     @Resource
     private InventorySummaryService inventorySummaryService;
@@ -462,17 +465,41 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
     @Override
     public BussinessInventoryDto GetDetailById(BussinessInventoryReq req) {
         BussinessInventory inventory= this.getById(req.getOrderId());
-        List<BussinessDetail> details = bussinessInventoryDetailService.list(
+        List<BussinessDetail> detailsMain= bussinessInventoryMapper.GetBussinessInventoryMap(req.getOrderId());
+        List<BussinessDetail> detailsChildren = bussinessInventoryDetailService.list(
                     new LambdaQueryWrapper<BussinessDetail>().eq(BussinessDetail::getInventoryId, req.getOrderId())
             );
 
     List<EquipmentListDto> eqDtoList=new ArrayList<>();
         BussinessInventoryDto BIDTO=new BussinessInventoryDto();
         BeanPlusUtil.copyProperties(inventory,BIDTO);
-        for (BussinessDetail detail : details) {
+        for (BussinessDetail detail : detailsMain) {
             EquipmentListDto eqDto = new EquipmentListDto();
             BeanPlusUtil.copyProperties(detail, eqDto);
-            eqDto.setAccountNumber(detail.getAccountNum());
+            List<BussinessDetail> matchingDetails = new ArrayList<>();
+            // 找出所有group_id匹配的detailChild并加入到matchingDetails列表中
+            List<BussinessDetail> filteredDetails = detailsChildren.stream()
+                    .filter(detailChild -> detailChild.getGroupId().equals(detail.getGroupId())) // 检查group_id是否相等
+                    .collect(Collectors.toList()); // 收集所有匹配的项
+
+            // 将所有筛选出的子项添加到matchingDetails
+            matchingDetails.addAll(filteredDetails);
+            List<EquipmentListDto.PriceInfo> priceInfos=new ArrayList<>();
+            for (BussinessDetail filterDetail :matchingDetails) {
+                EquipmentListDto.PriceInfo priceInfo=new EquipmentListDto.PriceInfo();
+                priceInfo.setPrice(filterDetail.getPrice());
+                priceInfo.setHasCount(String.valueOf(filterDetail.getHasCount()));
+                priceInfo.setAccountNumber(Integer.valueOf(filterDetail.getAccountNum()));
+                priceInfo.setStockPrice(filterDetail.getStockPrice());
+                priceInfo.setStockNum(String.valueOf(filterDetail.getStockNumber()));
+                priceInfos.add(priceInfo);
+            }
+            eqDto.setPriceInfo(priceInfos);
+//            priceInfo.add(matchingDetails.forEach(p->p.);)
+
+
+//            eqDto.setAccountNumber(detail.getAccountNum());
+
             eqDtoList.add(eqDto);
         }
         BIDTO.setState(inventory.getResult());
@@ -514,11 +541,13 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
         BeanPlusUtil.copyProperties(req,BI);
         List<BussinessDetail> Bussinessdetails=new ArrayList<>();
         for (EquipmentListDto detail : req.getEquipmentList()) {
+            String detailUUID=UUID.randomUUID().toString();
             for (EquipmentListDto.PriceInfo priceEq :detail.getPriceInfo())
             {
                 BussinessDetail eqDto = new BussinessDetail();
                 BeanPlusUtil.copyProperties(detail, eqDto);
-                eqDto.setNum(Integer.valueOf(priceEq.getNum()));
+                eqDto.setGroupId(detailUUID);
+                eqDto.setNum(Integer.valueOf(detail.getNum()));
                 eqDto.setFixNumber(Integer.valueOf(priceEq.getNum()));
                 eqDto.setPrice(priceEq.getPrice());
                 eqDto.setFixPrice(priceEq.getStockPrice());

jyzb-biz/src/main/resources/mapper/BussinessInventoryMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.junmp.jyzb.mapper.BussinessInventoryMapper">
+
+  <select id="GetBussinessInventoryMap"
+          resultType="com.junmp.jyzb.entity.BussinessDetail"
+          parameterType="java.lang.String">
+    SELECT
+      MAX( inventory_id ) AS inventory_id,
+      group_id,
+      MAX( type_id ) AS type_id,
+      MAX( type_name ) AS type_name,
+      MAX( size_id ) AS size_id,
+      MAX( size_name ) AS size_name,
+      MAX( has_count ) AS has_count,
+      MAX( state ) AS state,
+      MAX( fix_number ) AS fix_number,
+      MAX( stock_number ) AS stock_number
+    FROM
+      bussiness_inventory_detail
+    WHERE
+      inventory_id = #{warehouseId}
+    GROUP BY
+      group_id
+
+  </select>
+</mapper>
\ No newline at end of file