自动化热装 调整逻辑

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

@@ -281,6 +281,22 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			queryWrapper2.eq(StorageBill::getCcmNo, ccmNo);
 		}
 		StorageBill isStorageBill = storageBillService.getOne(queryWrapper2);
+		if (oConvertUtils.isEmpty(isStorageBill)) {
+			//  验证空的装运单 循环三次处理
+			for (int i = 0; i < 6; i++) {
+				// 延迟10秒
+				try {
+					Thread.sleep(10000);
+				} catch (InterruptedException e) {
+					log.info("延迟查询装运单异常:{}", e.getMessage());
+					e.printStackTrace();
+				}
+				isStorageBill = storageBillService.getOne(queryWrapper2);
+				if (!oConvertUtils.isEmpty(isStorageBill)){
+					break;
+				}
+			}
+		}
 		// 取钢坯号的第九位字符
 		ccmNo = Optional.ofNullable(billetNos)
 				.filter(s -> !s.isEmpty())
@@ -347,7 +363,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				.isNull(BilletBasicInfo::getBelongTable)
 				.isNull(BilletBasicInfo::getBhtcId);
 		List<BilletBasicInfo> billetBasicInfoLists = billetBasicInfoService.list(queryWrapper1);
-		log.info("111自动化热装钢坯实绩: {}", billetNosparts);
 		if (oConvertUtils.listIsEmpty(billetBasicInfoLists)){
 			// 循环三次处理
 			for (int i = 0; i < 6; i++) {
@@ -355,6 +370,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				try {
 					Thread.sleep(10000);
 				} catch (InterruptedException e) {
+					log.info("延迟查询钢坯实绩异常:{}", e.getMessage());
 					e.printStackTrace();
 				}
 				billetBasicInfoLists = billetBasicInfoService.list(queryWrapper1);
@@ -363,7 +379,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				}
 			}
 		}
-		log.info("222自动化热装钢坯实绩: {}", billetNosparts);
 		if (oConvertUtils.listIsEmpty(billetBasicInfoLists)){
 			log.info("{}{}", "钢坯基础信息不存在，C端自动化热装<保存>失败!", jsonObject);
 			BilletAutoException billetAutoException = createBilletAutoException(ccmNo, billetNos, shiftGroupHandle(ccmNo), shiftHandle(ccmNo), null);
@@ -387,27 +402,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				return;
 			}
 		}
-		log.info("333自动化热装吊运单更新: {}", billetNosparts);
-		// 查询更新后的装运单信息
-		StorageBill storageBill = storageBillService.getById(isStorageBill.getId());
-		if (oConvertUtils.isEmpty(storageBill)) {
-			//  验证空的装运单 循环三次处理
-			for (int i = 0; i < 6; i++) {
-				// 延迟10秒
-				try {
-					Thread.sleep(10000);
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-				storageBill = storageBillService.getById(isStorageBill.getId());
-				if (!oConvertUtils.isEmpty(storageBill)){
-					break;
-				}
-			}
-		}
-		log.info("444自动化热装装运单查询: {}", JSON.toJSON(storageBill));
 		// 钢坯装运单
-		if (oConvertUtils.isEmpty(storageBill)) {
+		if (oConvertUtils.isEmpty(isStorageBill)) {
 			log.info("未查询钢坯装运单信息，车位号为：{}，C端自动化热装<保存>失败！", positionNum);
 			BilletAutoException billetAutoException = new BilletAutoException();
 			billetAutoException.setId(String.valueOf(IdWorker.getId()));
@@ -421,9 +417,9 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			billetAutoExceptionService.save(billetAutoException);
 			return;
 		}
-		billetHotsendDetailsVo.setStorageBill(storageBill);
+		billetHotsendDetailsVo.setStorageBill(isStorageBill);
 		// 轧钢外运保存时，先判断装运单中的目的地ID是否为1024，如果为1024、明细暂存临时表billet_auto_tmp
-		if ("1024".equals(storageBill.getTypeConfigId())){
+		if ("1024".equals(isStorageBill.getTypeConfigId())){
 			log.info("{}{}", "C端自动化热装未知目的地，坯号集:", JSON.toJSON(billetNosparts));
 			billetHotsendDetailsVo.setBelongTable("billet_auto_tmp");
 			billetHotsendDetailsVo.setBilletHotsendTypeConfigId("1024");