2号车位热装逻辑调整

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

@@ -242,20 +242,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		saveBilletRodLineCommom(billetHotsendDetailsVo);
 		log.info("C端自动化操作结果，{}新增成功:{}", operationMsg, billetNos);
 	}
-	public static void main(String[] args) {
-		String billetNos = "255061616805,255061615705,255061615606,255061575804";
-
-		String ninthCharStr = 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(""); // 默认返回空字符串或其他默认值
-
-		System.out.println("第一个坯号的第9位字符是：" + ninthCharStr);
-	}
 	/**
 	 * 5、6号机  轧钢外运
 	 * 去上若  车牌为陕E开头
@@ -303,18 +289,20 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				.filter(num -> num.length() >= 9)
 				.map(num -> String.valueOf(num.charAt(8)))
 				.orElse("");
-		log.info("2号车位热装铸机号:{}", ccmNo);
-		String shiftGroup = shiftGroupHandle(ccmNo);
-		String shift = shiftHandle(ccmNo);
-		log.info("2号车位缓存中的班组、班别:{}", shiftGroup + ":" + shift);
+
 		// 更具装运单确认铸机号
-		if (oConvertUtils.isNotEmpty(isStorageBill) && oConvertUtils.isNotEmpty(isStorageBill.getCcmNo())) {
+		if (oConvertUtils.isNotEmpty(isStorageBill) && oConvertUtils.isEmpty(isStorageBill.getCcmNo())) {
 			// 更新铸机号，到装运单
 			isStorageBill.setCcmNo(ccmNo);
 			storageBillService.updateById(isStorageBill);
 		}
+
+		log.info("C端自动化热装铸机号:{}", ccmNo);
+		String shiftGroup = shiftGroupHandle(ccmNo);
+		String shift = shiftHandle(ccmNo);
+		log.info("C端自动化缓存中的班组、班别:{}", shiftGroup + ":" + shift);
 		if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)){
-			log.info("{}{}", "班组班别获取为空，C端自动化热装<保存>失败！", jsonObject);
+			log.info("{}{}", "班组班别获取为空，C端自动化热装<保存>失败！", JSON.toJSON(isStorageBill));
 			return;
 		}