update

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

@@ -527,14 +527,14 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				.eq(BilletHotsendChangeShift::getShiftGroup, cacheShintGroup)
 				.orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1");
 		BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapperCS, false);
-		log.info("{}{}", "自动化轧钢外运，当班信息:", JSON.toJSON(billetHotsendChangeShift));
+		log.info("{}{}", "自动化BilletHotsendChangeShift当班信息:", JSON.toJSON(billetHotsendChangeShift));
 		if (oConvertUtils.isNotEmpty(billetHotsendChangeShift)) {
 			if ("hotSend".equals(type)){
 				billetHotsendChangeShift.setHotsendAmount(billetHotsendChangeShift.getHotsendAmount() + sum);
-				log.info(">>>>>自动化轧钢外运，统计当前班次《热送》总支数:{} 班组：{} 班次：{}", billetHotsendChangeShift.getHotsendAmount(), cacheShintGroup, cacheShint);
+				log.info(">>>>>自动化统计当前班次《热送》总支数:{} 班组：{} 班次：{}", billetHotsendChangeShift.getHotsendAmount(), cacheShintGroup, cacheShint);
 			}else if ("hotCharge".equals(type)){
 				billetHotsendChangeShift.setHotfeignAmount(billetHotsendChangeShift.getHotfeignAmount() + sum);
-				log.info(">>>>>自动化轧钢外运，统计当前班次《热装》总支数:{} 班组：{} 班次：{}", billetHotsendChangeShift.getHotfeignAmount(), cacheShintGroup, cacheShint);
+				log.info(">>>>>自动化统计当前班次《热装》总支数:{} 班组：{} 班次：{}", billetHotsendChangeShift.getHotfeignAmount(), cacheShintGroup, cacheShint);
 			}
 			billetHotsendChangeShiftService.updateById(billetHotsendChangeShift);
 		}
@@ -563,7 +563,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			BilletAutoException billetAutoException = createBilletAutoException(billetHotsend.getCcmNo(), String.join(",", billetNos), billetHotsend.getShiftGroup(), billetHotsend.getShift(), billetHotsendTypeConfig);
 			billetAutoException.setMassage("钢坯热送信息不存在，自动化棒线操作失败!");
 			billetAutoExceptionService.save(billetAutoException);
-			result.put("fail", "钢坯热送信息不存在，自动化棒线操作失败！");
+			result.put("fail", "钢坯热送传递单不存在，自动化棒线操作失败！");
 			return result;
 		}
 		if ("roll_club_one".equals(billetHotsendDetailsVo.getBelongTable()) && "0".equals(billetHotsendTypeConfig.getBelongType().toString())){
@@ -1095,11 +1095,11 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			billetHotsend.setShiftGroup(parts[1]);// 班组
 			billetHotsend.setShift(parts[2]);// 班别
 			List<RollClubCommon> groupRollClubCommonList = entry.getValue();
-			log.info("{}{}", "自动化5号机棒一、6号机高线热送单信息:", JSON.toJSON(billetHotsend));
+			log.info("{}{}", billetHotsend.getCcmNo() + "#自动化热送高线或直轧棒一传递单信息:", JSON.toJSON(billetHotsend));
 			JSONObject jsonObject = commonBilletHotsenAndDetailsHandle(billetHotsend, billetHotsendDetailsVo, billetHotsendTypeConfig, null, groupRollClubCommonList);
 			if (jsonObject.containsKey("fail")){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-				log.info("{}{}", "自动化直轧和高线钢坯操作失败，事务回滚！", jsonObject);
+				log.info("{}{}", billetHotsend.getCcmNo() + "自动化热送高线或直轧棒一钢坯操作失败事务回滚！", jsonObject);
 				return jsonObject;
 			}
 			List<String> billetNos = groupRollClubCommonList.stream().map(RollClubCommon::getBilletNo).collect(Collectors.toList());