修改盘点BUG

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

+package com.junmp.jyzb.api.bean.dto.TempDto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class InventoryDetailDto implements Serializable {
+    @TableField(value = "inventory_id")
+    private String inventoryId;
+    private String groupId;
+    @TableField(value = "type_id")
+    private String typeId;
+    @TableField(value = "type_name")
+    private String typeName;
+    @TableField(value = "size_id")
+    private String sizeId;
+    @TableField(value = "size_name")
+    private String sizeName;
+    @TableField(value = "has_count")
+    private String hasCount;
+    @TableField(value = "state")
+    private String state;
+    @TableField(value = "fix_number")
+    private String fixNumber;
+    @TableField(value = "stock_number")
+    private String stockNumber;
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/constant/JYZBConstant.java

@@ -34,7 +34,10 @@ public interface JYZBConstant {
      * 温度前缀
      */
     String JYZB_TEMP_PREFIX = "temp:";
-
+    /**
+     * 温度前缀
+     */
+    String JYZB_TEMPERATURE_PREFIX = "temperature:";
 
     /**
      * 设备状态前缀

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

 package com.junmp.jyzb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.api.bean.dto.TempDto.InventoryDetailDto;
 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;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -13,7 +15,7 @@ import java.util.Map;
 @Mapper
 public interface BussinessInventoryMapper extends BaseMapper<BussinessInventory> {
 
-    List<BussinessDetail> GetBussinessInventoryMap(String id);
+    List<InventoryDetailDto> GetBussinessInventoryMap(@Param("orderDetailId")String orderDetailId);
 }
 
 

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

@@ -14,6 +14,7 @@ import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
 import com.junmp.junmpProcess.dto.json.UserInfo;
 import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.jyzb.api.bean.dto.*;
+import com.junmp.jyzb.api.bean.dto.TempDto.InventoryDetailDto;
 import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
@@ -465,7 +466,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
     @Override
     public BussinessInventoryDto GetDetailById(BussinessInventoryReq req) {
         BussinessInventory inventory= this.getById(req.getOrderId());
-        List<BussinessDetail> detailsMain= bussinessInventoryMapper.GetBussinessInventoryMap(req.getOrderId());
+        List<InventoryDetailDto> detailsMain= bussinessInventoryMapper.GetBussinessInventoryMap(req.getOrderId());
         List<BussinessDetail> detailsChildren = bussinessInventoryDetailService.list(
                     new LambdaQueryWrapper<BussinessDetail>().eq(BussinessDetail::getInventoryId, req.getOrderId())
             );
@@ -473,13 +474,13 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
     List<EquipmentListDto> eqDtoList=new ArrayList<>();
         BussinessInventoryDto BIDTO=new BussinessInventoryDto();
         BeanPlusUtil.copyProperties(inventory,BIDTO);
-        for (BussinessDetail detail : detailsMain) {
+        for (InventoryDetailDto detail : detailsMain) {
             EquipmentListDto eqDto = new EquipmentListDto();
             BeanPlusUtil.copyProperties(detail, eqDto);
             List<BussinessDetail> matchingDetails = new ArrayList<>();
             // 找出所有group_id匹配的detailChild并加入到matchingDetails列表中
             List<BussinessDetail> filteredDetails = detailsChildren.stream()
-                    .filter(detailChild -> detailChild.getGroupId().equals(detail.getGroupId())) // 检查group_id是否相等
+                    .filter(detailChild -> detailChild.getGroupId() != null && detailChild.getGroupId().equals(detail.getGroupId()))
                     .collect(Collectors.toList()); // 收集所有匹配的项
 
             // 将所有筛选出的子项添加到matchingDetails

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

@@ -3,11 +3,11 @@
 <mapper namespace="com.junmp.jyzb.mapper.BussinessInventoryMapper">
 
   <select id="GetBussinessInventoryMap"
-          resultType="com.junmp.jyzb.entity.BussinessDetail"
+          resultType="com.junmp.jyzb.api.bean.dto.TempDto.InventoryDetailDto"
           parameterType="java.lang.String">
     SELECT
       MAX( inventory_id ) AS inventory_id,
-      group_id,
+      group_id as groupId,
       MAX( type_id ) AS type_id,
       MAX( type_name ) AS type_name,
       MAX( size_id ) AS size_id,
@@ -19,7 +19,7 @@
     FROM
       bussiness_inventory_detail
     WHERE
-      inventory_id = #{warehouseId}
+      inventory_id = #{orderDetailId}
     GROUP BY
       group_id
 

jyzb-boot/src/main/resources/application.yml

@@ -33,7 +33,7 @@ spring:
       virtual-host: /
   profiles:
     #@spring.active@
-    active: prod
+    active: local
   servlet:
     multipart:
       max-request-size: 500MB