热装

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletHotsendBaseServiceImpl.java

@@ -284,7 +284,16 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			log.info("{}{}", "参数为空，C端自动化热装<保存>失败！", jsonObject);
 			return;
 		}
-
+		// 取钢坯号的第九位字符
+		ccmNo = Optional.ofNullable(billetNos)
+				.filter(s -> !s.isEmpty())
+				.map(s -> s.split(","))
+				.filter(arr -> arr.length > 0)
+				.map(arr -> arr[0])
+				.filter(num -> num.length() >= 9)
+				.map(num -> String.valueOf(num.charAt(8)))
+				.orElse("");
+		log.info("C端自动化热装,钢坯中截取的铸机号:{}", ccmNo);
 		String shiftGroup = shiftGroupHandle(ccmNo);
 		String shift = shiftHandle(ccmNo);
 		log.info("C端自动化热装缓存中的班组、班别:{}", shiftGroup + ":" + shift);
@@ -334,16 +343,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			log.info("未查询到钢坯装运单信息，车位号为:{}，C端自动化热装保存失败！", positionNum);
 			return;
 		}
-		// 取钢坯号的第九位字符
-		ccmNo = Optional.ofNullable(billetNos)
-				.filter(s -> !s.isEmpty())
-				.map(s -> s.split(","))
-				.filter(arr -> arr.length > 0)
-				.map(arr -> arr[0])
-				.filter(num -> num.length() >= 9)
-				.map(num -> String.valueOf(num.charAt(8)))
-				.orElse("");
-		log.info("C端自动化热装,钢坯中截取的铸机号:{}", ccmNo);
 
 		// 更新装运单铸机号、班别、班组
 		if ("0".equals(isStorageBill.getCcmNo())) {
@@ -365,8 +364,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		billetHotsends.setShift(shift);
 		billetHotsends.setIsUpd(false);
 		billetHotsendDetailsVo.setBilletHotsend(billetHotsends);
-
-
+		
 		// 根据坯号查询 对应的钢坯基础信息
 		String[] billetNosparts = billetNos.split(",");
 		//4 获取所有的坯号集合
@@ -390,6 +388,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			try {
 				billetLiftingBillUpdate.setHeatNo(getHeatNo(billetBasicInfoLists));
 				double totalWeight = billetBasicInfoLists.stream().mapToDouble(BilletBasicInfo::getBilletWeight).sum();
+				billetLiftingBillUpdate.setShiftGroup(shiftGroup);
+				billetLiftingBillUpdate.setShift(shift);
 				billetLiftingBillUpdate.setBilletWeight(totalWeight);
 				billetLiftingBillUpdate.setAssemblyNumber(getAssemblyNumber(billetBasicInfoLists));
 				billetLiftingBillService.updateById(billetLiftingBillUpdate);
@@ -433,7 +433,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			billetHotsendDetailsVo.setBelongTypeName(billetHotsendTypeConfig.getTypeName());
 			billetHotsendDetailsVo.setBilletHotsendTypeConfigId(billetHotsendTypeConfig.getId());
 		}
-		log.info("555自动化热装数据组装: {}", billetHotsendDetailsVo.getBilletHotsendTypeConfigId());
 		List<RollClubCommon> rollClubCommonLists= new ArrayList<>();
 		AtomicInteger startNum = new AtomicInteger(0);
 		String finalCcmNo = ccmNo;