当班浇筑炉次查询修改，操作工热装、起垛班次信息调整

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/controller/BilletHotsendBaseController.java

@@ -148,7 +148,8 @@ public class BilletHotsendBaseController extends JeecgController<BilletHotsend,
             return Result.error("未选择目的地,热装操作失败!");
         }
         billetHotsendDetailsVo.setStorageBill(storageBill);
-
+        String shift = hotChargeVo.getShift();
+        String shiftGroup = hotChargeVo.getShiftGroup();
         // 根据hotChargeVo中的铸机号、storageBill.getTypeConfigId()查询钢坯配置类型信息
         BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendBaseService.getBilletHotsendTypeConfigByCcmNoAndTypeConfigId(storageBill.getTypeConfigId());
 
@@ -156,12 +157,6 @@ public class BilletHotsendBaseController extends JeecgController<BilletHotsend,
         billetHotsendDetailsVo.setBelongTable(billetHotsendTypeConfig.getBelongTable());
         billetHotsendDetailsVo.setBilletHotsendTypeConfigId(billetHotsendTypeConfig.getId());
 
-        String classShiftGroup = String.format("class:shift:group:%s", hotChargeVo.getCcmNo()); // 班组
-        String classShift = String.format("class:shift:%s", hotChargeVo.getCcmNo()); // 班别
-        String shift = !oConvertUtils.getString(redisTemplate.opsForValue().get(classShift)).isEmpty() ? oConvertUtils.getString(redisTemplate.opsForValue().get(classShift)) : "";
-        String shiftGroup = !oConvertUtils.getString(redisTemplate.opsForValue().get(classShiftGroup)).isEmpty() ? oConvertUtils.getString(redisTemplate.opsForValue().get(classShiftGroup)) : "";
-
-
         BilletHotsend billetHotsend = new BilletHotsend();
         billetHotsend.setCcmNo(hotChargeVo.getCcmNo());
         billetHotsend.setHeatNo(hotChargeVo.getHeatNo());

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/entity/HotChargeVo.java

@@ -6,5 +6,9 @@ import lombok.Data;
 public class HotChargeVo {
     private String ccmNo;
     private String heatNo;
+    /**班组*/
+    private String shiftGroup;
+    /**班别*/
+    private String shift;
     private String storageId;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/controller/StackingAndLoadingVehiclesController.java

@@ -197,17 +197,11 @@ public class StackingAndLoadingVehiclesController extends JeecgController<Stacki
 		 loadingParams.setBelongTable("stacking_and_loading_vehicles");
 		 loadingParams.setBilletHotsendTypeConfigId(stackingAddParams.getBilletHotsendTypeConfigId());
 
-
-		 String classShiftGroup = String.format("class:shift:group:%s", stackingAddParams.getCcmNo()); // 班组
-		 String classShift = String.format("class:shift:%s",stackingAddParams.getCcmNo()); // 班别
-		 String shift = !oConvertUtils.getString(redisTemplate.opsForValue().get(classShift)).isEmpty() ? oConvertUtils.getString(redisTemplate.opsForValue().get(classShift)) : "";
-		 String shiftGroup = !oConvertUtils.getString(redisTemplate.opsForValue().get(classShiftGroup)).isEmpty() ? oConvertUtils.getString(redisTemplate.opsForValue().get(classShiftGroup)) : "";
-
 		 LambdaQueryWrapper<BilletBasicInfo> queryWrapper2 = new LambdaQueryWrapper<>();
 		 queryWrapper2.eq(BilletBasicInfo::getCcmNo, stackingAddParams.getCcmNo())
 				 .eq(BilletBasicInfo::getHeatNo, stackingAddParams.getHeatNo())
-				 .eq(BilletBasicInfo::getShift, shift)
-				 .eq(BilletBasicInfo::getShiftGroup, shiftGroup)
+				 .eq(BilletBasicInfo::getShift, stackingAddParams.getShift())
+				 .eq(BilletBasicInfo::getShiftGroup, stackingAddParams.getShiftGroup())
 				 .isNull(BilletBasicInfo::getBelongTable)
 				 .isNotNull(BilletBasicInfo::getAssemblyNumber)
 				 .orderByAsc(BilletBasicInfo::getCreateTime);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/vo/StackingAddParams.java

@@ -8,6 +8,10 @@ import java.util.List;
 public class StackingAddParams {
     private String ccmNo;
     private String heatNo;
+    /**班组*/
+    private String shiftGroup;
+    /**班别*/
+    private String shift;
     private String billetHotsendTypeConfigId;
     private List<String> stackingAndLoadingVehiclesIds;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillController.java

@@ -1908,14 +1908,23 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 					.orderByDesc(BilletHotsend::getCreateTime)
 					.last("limit 2");
 			billetHotsendListLast = billetHotsendBaseService.list(queryWrapperLast);
+			if(oConvertUtils.listIsNotEmpty(billetHotsendListLast)){
+				for(BilletHotsend x : billetHotsendListLast){
+					int sum = x.getRollcluboneNum() + x.getRollclubtwoNum() + x.getRollclubthreeNum()
+							+ x.getRollheightNum() + x.getRolloutshippNum() + x.getStackNum() + x.getWasteNum();
+					if(x.getAmountTotal() > sum && (x.getAmountTotal() - sum) % 4 == 0){
+						billetHotsendList.add(x);
+					}
+				}
+				// 按创建时间倒序排序
+				billetHotsendList.sort(Comparator.comparing(BilletHotsend::getCreateTime).reversed());
+			}
 		}
-		if(oConvertUtils.listIsNotEmpty(billetHotsendListLast)){
-			billetHotsendList.addAll(billetHotsendListLast);
-			// 按创建时间倒序排序
-			billetHotsendList.sort(Comparator.comparing(BilletHotsend::getCreateTime).reversed());
-		}
+
 		billetHotsendList.forEach(x -> {
 			HeatsActualsInfo heatsActualsInfo = new HeatsActualsInfo();
+			heatsActualsInfo.setShiftGroup(x.getShiftGroup());
+			heatsActualsInfo.setShift(x.getShift());
 			heatsActualsInfo.setHeatNo(x.getHeatNo());
 			heatsActualsInfo.setBrandNum(x.getBrandNum());
 			// 根据铸机号、炉号查询钢坯实绩信息BilletBasicInfo

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

@@ -1,5 +1,8 @@
 package org.jeecg.modules.billet.storageBill.entity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
 
 @Data
 public class HeatsActualsInfo {
@@ -38,4 +41,8 @@ public class HeatsActualsInfo {
 
     private Boolean operateStatus;
 
+    /**班组*/
+    private String shiftGroup;
+    /**班别*/
+    private String shift;
 }

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

@@ -6022,7 +6022,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     .orElse(null);
 
             if (shiftRecord == null) {
-                log.warn("未找到交班记录，跳过: {}", bill.getId());
                 continue;
             }