update111

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/entity/StorageBillStatistics.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.billet.storageBill.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecg.modules.billet.rollHeight.entity.DestinationStatisticsDetails;
 
@@ -13,6 +14,11 @@ public class StorageBillStatistics {
     // 装运总重
     private Double storageTotalWeight;
 
+    @ApiModelProperty(value = "班组")
+    private String shiftGroup;
+
+    @ApiModelProperty(value = "班别")
+    private String shift;
 
     // 棒二装运总数
     private Integer rollClubTwoSum;

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -2374,6 +2374,8 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             shiftGroup = billetHotsendChangeShift.getShiftGroup();
             shift = billetHotsendChangeShift.getShift();
         }
+        storageBillStatistics.setShift(ShiftGroupEnum.fromCode(shift).name());
+        storageBillStatistics.setShiftGroup(ShiftGroupEnum.fromCode(shiftGroup).name());
 
         // 根据铸机号、班组、班别，amountTotal不等于0 ，查询当班装运单信息
         LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
@@ -2404,14 +2406,12 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             return storageBillStatistics;
         }
 
-
         List<DestinationStatisticsDetails> rollClubTwoStatisticsList = new ArrayList<>();
 
         List<DestinationStatisticsDetails> rollClubThreeStatisticsList = new ArrayList<>();
 
         List<DestinationStatisticsDetails> rollOutShippStatisticsList = new ArrayList<>();
 
-
         List<RollClubTwoDetails> rollClubTwoDetailsListAll = new ArrayList<>();
         List<RollClubThreeDetails> rollClubThreeDetailsListAll = new ArrayList<>();
         List<RollOutShippDetails> rollOutShippDetailsListAll = new ArrayList<>();