棒一 起始 结束 处理

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/controller/RollClubOneController.java

@@ -190,7 +190,7 @@ public class RollClubOneController {
 
 		// 手动分页
 		int pageNo = queryDTO.getPageNo() != null ? queryDTO.getPageNo() : 1;
-		int pageSize = queryDTO.getPageSize() != null ? queryDTO.getPageSize() : 10;
+		int pageSize = queryDTO.getPageSize() != null ? queryDTO.getPageSize() : 30;
 		int total = rollClubOneVOS.size();
 		int fromIndex = (pageNo - 1) * pageSize;
 		int toIndex = Math.min(fromIndex + pageSize, total);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/service/impl/RollClubOneServiceImpl.java

@@ -307,19 +307,15 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
                 for (Map.Entry<String, List<BilletHotsend>> entry : hotsendGroupMap.entrySet()) {
                     String heatNo = entry.getKey();
                     List<BilletHotsend> hotsends = entry.getValue();
-
                     if (CollectionUtils.isEmpty(hotsends)) {
                         continue;
                     }
-
                     // 先定义 rollOne，初始值为 null
                     RollClubOneHeatVO.RollOneHeatNo rollOne = null;
-
                     RollClubOneHeatVO vo = heatNoVOMap.get(heatNo);
                     if (vo != null) {
                         rollOne = vo.getRollClubOneDetails();
                     }
-
                     // 初始化累计值
                     int totalAmount = 0;
                     BigDecimal totalWeight = BigDecimal.ZERO;
@@ -330,11 +326,8 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
                     if (rollOne != null && rollOne.getTotalWeight() != null) {
                         totalWeight = totalWeight.add(rollOne.getTotalWeight());
                     }
-
-
                     RollClubOneVO.HeatNoDetail detail = new RollClubOneVO.HeatNoDetail();
                     detail.setHeatNo(heatNo);
-
                     // 按 createTime 降序，选最新记录
                     hotsends.sort(Comparator.comparing(BilletHotsend::getCreateTime, Comparator.nullsLast(Date::compareTo)).reversed());
                     BilletHotsend latest = hotsends.get(0);
@@ -362,7 +355,6 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
 
                     detail.setShift(latest.getShift());
                     detail.setShiftGroup(latest.getShiftGroup());
-
                     heatNoDetailMap.put(heatNo, detail);
                 }
             } else {
@@ -428,7 +420,7 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
             RollClubOneHeatVO.RollOneHeatNo rollOneHeatNo = new RollClubOneHeatVO.RollOneHeatNo();
             List<RollClubOneHeatVO.SizeDetail> sizeDetailsList = new ArrayList<>();
             List<RollClubOneHeatVO.RollSendDetail> rollSendDetailList = new ArrayList<>();
-
+            
             String detailJson = record.getRollClubOneDetails();
 
             if (StringUtils.isNotBlank(detailJson)) {
@@ -450,7 +442,6 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
                             lengthCountMap.merge(length, count, Integer::sum);
                         }
                     }
-
                     // 构造 SizeDetail 和 RollSendDetail
                     for (Map.Entry<String, Integer> entry : lengthCountMap.entrySet()) {
                         String length = entry.getKey();
@@ -480,11 +471,12 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
 
                         BigDecimal totalWeight = unitWeight.multiply(BigDecimal.valueOf(count));
 
-                        // sizeDetail
+                        // sizeDetail // 定尺明细
                         RollClubOneHeatVO.SizeDetail sizeDetail = new RollClubOneHeatVO.SizeDetail();
                         sizeDetail.setSize(Integer.valueOf(length));
                         sizeDetail.setSizeAmount(count);
                         sizeDetail.setSizeWeight(totalWeight);
+                        // 起始根 or 结束根处理
                         sizeDetailsList.add(sizeDetail);
 
                         // rollSendDetail

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/vo/RollClubOneHeatVO.java

@@ -65,5 +65,11 @@ public class RollClubOneHeatVO {
         @ApiModelProperty(value = "当前定尺总重量")
         private BigDecimal sizeWeight;
 
+        @ApiModelProperty(value = "当前定尺起始根")
+        private BigDecimal startAmount;
+
+        @ApiModelProperty(value = "当前定尺结束根")
+        private BigDecimal endAmount;
+
     }
 }