操作工热装和起垛定尺逻辑添加

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

@@ -176,12 +176,15 @@ public class BilletHotsendBaseController extends JeecgController<BilletHotsend,
                 .isNull(BilletBasicInfo::getBelongTable)
                 .isNotNull(BilletBasicInfo::getAssemblyNumber)
                 .orderByAsc(BilletBasicInfo::getCreateTime);
+        if (hotChargeVo.getLength() != null && hotChargeVo.getLength() > 0){
+            queryWrapper2.eq(BilletBasicInfo::getLength, hotChargeVo.getLength());
+        }
         List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapper2);
         if (oConvertUtils.listIsEmpty(billetBasicInfoList)) {
             log.info("{}{}", "钢坯实绩不存在，热装操作失败！", JSON.toJSON(hotChargeVo));
             return Result.error("钢坯实绩不存在，热装操作失败！");
         }
-
+        log.info("{}{}", "推钢室操作工，<热装>操作:", JSON.toJSON(billetBasicInfoList));
         List<RollClubCommon> rollClubCommonList = new ArrayList<>();
 
         // 按assemblyNumber分组，并过滤出数量为4的组

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

@@ -11,4 +11,7 @@ public class HotChargeVo {
     /**班别*/
     private String shift;
     private String storageId;
+    private String storageName;
+    /**定尺*/
+    private Integer length;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/impl/BilletHotsendBaseServiceImpl.java

@@ -169,6 +169,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			result.put("fail", "未选择钢坯实绩，棒线保存失败！");
 			return result;
 		}
+		log.info("{}{}", "B端手动装运单<热装>钢坯实绩:", JSON.toJSON(rollClubCommonList));
 		BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getById(billetHotsendDetailsVo.getBilletHotsendTypeConfigId());
 		BilletHotsend billetHotsend = billetHotsendDetailsVo.getBilletHotsend();
 		StorageBill storageBill = billetHotsendDetailsVo.getStorageBill();
@@ -196,6 +197,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			result.put("fail", "未查询到钢坯实绩，棒线保存失败！");
 			return result;
 		}
+		log.info("{}{}", "B端手动操作，业务处理后的钢坯实绩:", JSON.toJSON(billetBasicInfoList));
 		billetBasicInfoList.forEach(x -> {
 			if ("roll_club_one".equals(billetHotsendDetailsVo.getBelongTable())) {
 				x.setBelongTable("roll_club_one");

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

@@ -206,20 +206,16 @@ public class StackingAndLoadingVehiclesController extends JeecgController<Stacki
 				 .isNull(BilletBasicInfo::getBelongTable)
 				 .isNotNull(BilletBasicInfo::getAssemblyNumber)
 				 .orderByAsc(BilletBasicInfo::getCreateTime);
+		 if (stackingAddParams.getLength() != null && stackingAddParams.getLength() > 0){
+			 queryWrapper2.eq(BilletBasicInfo::getLength, stackingAddParams.getLength());
+		 }
 		 List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapper2);
 		 if (oConvertUtils.listIsEmpty(billetBasicInfoList)){
 			 log.info("{}{}", "钢坯实绩不存在，起垛操作失败！", JSON.toJSON(stackingAddParams));
 			 return Result.error("钢坯实绩不存在，起垛操作失败！");
 		 }
-
+		 log.info("{}{}", "推钢室操作工，<起垛>操作钢坯实绩信息:", JSON.toJSON(billetBasicInfoList));
 		 // 按assemblyNumber分组，并过滤出数量为4的组
-//		 Map<String, List<BilletBasicInfo>> groupByAssemblyNumber = billetBasicInfoList.stream()
-//				 .collect(Collectors.groupingBy(BilletBasicInfo::getAssemblyNumber))
-//				 .entrySet()
-//				 .stream()
-//				 .filter(entry -> entry.getValue().size() == 4)
-//				 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-
 		 // 2025/5/26  按总数数量为4分组、并且每组是同一炉的钢坯
 		 Map<String, List<BilletBasicInfo>> groupByAssemblyNumber  = groupAndFilterByHeatNo(billetBasicInfoList, 4);
 
@@ -275,7 +271,7 @@ public class StackingAndLoadingVehiclesController extends JeecgController<Stacki
 		 loadingParams.setStackingAndLoadingVehiclesList(stackingAndLoadingVehiclesList);
 		 loadingParams.setRollClubCommonList(rollClubCommonList);
 
-		 log.info(">>>>>>>>>>>>B端操作工-新增堆垛参数集:"+ JSON.toJSON(loadingParams));
+		 log.info(">>>>>>>>>>>>B端操作工推钢室-新增堆垛信息:"+ JSON.toJSON(loadingParams));
 
 		 JSONObject jsonObject = stackingAndLoadingVehiclesService.addStackInfo(loadingParams);
 		 if (jsonObject.containsKey("fail")){

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -155,6 +155,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             result.put("fail", "未查询到钢坯实绩，垛位装车失败！");
             return result;
         }
+        log.info("{}{}", "B端手动<垛位装车>钢坯实绩:", JSON.toJSON(billetBasicInfoList));
         List<RollClubCommon> rollClubCommonList = new ArrayList<>();
         billetBasicInfoList.forEach(x -> {
             RollClubCommon rollClubCommon = new RollClubCommon();
@@ -207,7 +208,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             billetHotsend.setUpdateTime(new Date());
             billetHotsendBaseService.updateById(billetHotsend);
         }
-
+        log.info("{}{}", "B端手动<垛位装车>操作钢坯实绩:", JSON.toJSON(billetBasicInfoList));
         //5 查询并批量更新钢坯基础信息 belongTable
         billetBasicInfoList.forEach(x -> {
             x.setBelongTable(loadingParams.getDestinationTable());
@@ -1028,6 +1029,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                         return java.util.stream.Stream.empty();
                     }
                 }).collect(Collectors.toList());
+        log.info("{}{}", "B端手动起垛坯号信息:", billetNosList);
         //5 查询并批量更新钢坯基础信息 belongTable
         LambdaQueryWrapper<BilletBasicInfo> queryWrapperBB = new LambdaQueryWrapper<BilletBasicInfo>()
                 .eq(BilletBasicInfo::getCcmNo, Integer.valueOf(billetHotsend.getCcmNo()))

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

@@ -14,4 +14,6 @@ public class StackingAddParams {
     private String shift;
     private String billetHotsendTypeConfigId;
     private List<String> stackingAndLoadingVehiclesIds;
+    /**定尺*/
+    private Integer length;
 }