车位2 特殊处理 铸机号

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

@@ -289,11 +289,13 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			queryWrapper2.eq(StorageBill::getCcmNo, ccmNo);
 		}
 		StorageBill isStorageBill = storageBillService.getOne(queryWrapper2);
+		String shiftGroup =  "";
+		String shift = "";
 		// 更具装运单确认铸机号
 		if (oConvertUtils.isNotEmpty(isStorageBill) && oConvertUtils.isNotEmpty(isStorageBill.getCcmNo())) {
 			ccmNo = isStorageBill.getCcmNo();
-			String shiftGroup = shiftGroupHandle(ccmNo);
-			String shift = shiftHandle(ccmNo);
+			shiftGroup = shiftGroupHandle(ccmNo);
+			shift = shiftHandle(ccmNo);
 		}else {
 			// 取钢坯号的第九位字符
 			ccmNo = Optional.ofNullable(billetNos)
@@ -304,11 +306,11 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 					.filter(num -> num.length() >= 9)
 					.map(num -> String.valueOf(num.charAt(8)))
 					.orElse("");
+			shiftGroup = shiftGroupHandle(ccmNo);
+			shift = shiftHandle(ccmNo);
 			// 更新铸机号，到装运单
 			isStorageBill.setCcmNo(ccmNo);
 			storageBillService.updateById(isStorageBill);
-			String shiftGroup = shiftGroupHandle(ccmNo);
-			String shift = shiftHandle(ccmNo);
 		}
 
 		if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)){