二号车位 热装特殊处理

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

@@ -294,32 +294,25 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			queryWrapper2.eq(StorageBill::getCcmNo, ccmNo);
 		}
 		StorageBill isStorageBill = storageBillService.getOne(queryWrapper2);
-		String shiftGroup =  "";
-		String shift = "";
+		// 取钢坯号的第九位字符
+		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("2号车位热装铸机号:{}", ccmNo);
+		String shiftGroup = shiftGroupHandle(ccmNo);
+		String shift = shiftHandle(ccmNo);
+		log.info("2号车位缓存中的班组、班别:{}", shiftGroup + ":" + shift);
 		// 更具装运单确认铸机号
 		if (oConvertUtils.isNotEmpty(isStorageBill) && oConvertUtils.isNotEmpty(isStorageBill.getCcmNo())) {
-			ccmNo = isStorageBill.getCcmNo();
-			shiftGroup = shiftGroupHandle(ccmNo);
-			shift = shiftHandle(ccmNo);
-		}else {
-			// 取钢坯号的第九位字符
-			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("2号车位热装铸机号:{}", ccmNo);
-			shiftGroup = shiftGroupHandle(ccmNo);
-			shift = shiftHandle(ccmNo);
-			log.info("2号车位缓存中的班组、班别:{}", shiftGroup + ":" + shift);
 			// 更新铸机号，到装运单
 			isStorageBill.setCcmNo(ccmNo);
 			storageBillService.updateById(isStorageBill);
 		}
-
 		if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)){
 			log.info("{}{}", "班组班别获取为空，C端自动化热装<保存>失败！", jsonObject);
 			return;