车位 特殊处理

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

@@ -292,7 +292,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		// 更具装运单确认铸机号
 		if (oConvertUtils.isNotEmpty(isStorageBill) && oConvertUtils.isNotEmpty(isStorageBill.getCcmNo())) {
 			ccmNo = isStorageBill.getCcmNo();
+			String shiftGroup = shiftGroupHandle(ccmNo);
+			String shift = shiftHandle(ccmNo);
 		}else {
+			// 取钢坯号的第九位字符
 			ccmNo = Optional.ofNullable(billetNos)
 					.filter(s -> !s.isEmpty())
 					.map(s -> s.split(","))
@@ -304,11 +307,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			// 更新铸机号，到装运单
 			isStorageBill.setCcmNo(ccmNo);
 			storageBillService.updateById(isStorageBill);
+			String shiftGroup = shiftGroupHandle(ccmNo);
+			String shift = shiftHandle(ccmNo);
 		}
 
-		String shiftGroup = shiftGroupHandle(ccmNo);
-		String shift = shiftHandle(ccmNo);
-
 		if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)){
 			log.info("{}{}", "班组班别获取为空，C端自动化热装<保存>失败！", jsonObject);
 			return;