B端操作提示信息优化

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/impl/BilletHotsendBaseServiceImpl.java

@@ -156,7 +156,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		// 根据billetHotsendTypeConfigId 查询基础垛位信息
 		List<RollClubCommon> rollClubCommonList = billetHotsendDetailsVo.getRollClubCommonList();
 		if (oConvertUtils.listIsEmpty(rollClubCommonList)) {
-			result.put("fail", "棒线钢坯信息不存在，保存失败！");
+			result.put("fail", "未选择钢坯实绩，棒线保存失败！");
 			return result;
 		}
 		BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getById(billetHotsendDetailsVo.getBilletHotsendTypeConfigId());
@@ -183,7 +183,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				.in(BilletBasicInfo::getBilletNo, billetNos);
 		List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapperls);
 		if (oConvertUtils.listIsEmpty(billetBasicInfoList)) {
-			result.put("fail", "钢坯基础信息不存在，棒线保存失败！");
+			result.put("fail", "未查询到钢坯实绩，棒线保存失败！");
 			return result;
 		}
 		billetBasicInfoList.forEach(x -> {
@@ -215,7 +215,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		queryWrapperSB.eq(StorageBill::getId, billetHotsendDetailsVo.getStorageBill().getId());
 		StorageBill storageBillInfo = storageBillService.getOne(queryWrapperSB);
 		if (oConvertUtils.isEmpty(storageBillInfo)) {
-			result.put("fail", "钢坯装运单不存在，棒线保存操作失败！");
+			result.put("fail", "未查询到装运单，棒线保存操作失败！");
 			return result;
 		}
 
@@ -279,7 +279,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		JSONObject result = new JSONObject();
 		List<RollClubCommon> rollClubCommonList = billetHotsendDetailsVo.getRollClubCommonList();
 		if (oConvertUtils.listIsEmpty(rollClubCommonList)) {
-			result.put("fail", "棒线钢坯信息不存在，发车失败！");
+			result.put("fail", "未选择钢坯实绩，发车操作失败！");
 			return result;
 		}
 		// 根据billetHotsendTypeConfigId 查询基础垛位信息
@@ -962,9 +962,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				.eq(BilletHotsend::getHeatNo, billetHotsend.getHeatNo())
 				.eq(BilletHotsend::getShift, billetHotsend.getShift())
 				.eq(BilletHotsend::getShiftGroup, billetHotsend.getShiftGroup());
+		log.info("{}{}" , ">>>>>B端棒线操作炉次传递单信息:", JSON.toJSON(billetHotsend));
 		BilletHotsend check = baseMapper.selectOne(queryWrapper);
 		if (oConvertUtils.isEmpty(check)){
-			result.put("fail", "钢坯热送信息不存在，棒线操作失败！");
+			result.put("fail", "未查询到炉次传递单，棒线操作失败！");
 			return result;
 		}
 		if ("roll_club_one".equals(billetHotsendDetailsVo.getBelongTable()) && "0".equals(billetHotsendTypeConfig.getBelongType().toString())){

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -144,7 +144,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 .in(BilletBasicInfo::getBilletNo, billetNosList);
         List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapperBB);
         if (oConvertUtils.listIsEmpty(billetBasicInfoList)) {
-            result.put("fail", "钢坯基础信息为空，垛位装车保存失败");
+            result.put("fail", "未查询到钢坯实绩，垛位装车失败！");
             return result;
         }
         List<RollClubCommon> rollClubCommonList = new ArrayList<>();
@@ -157,7 +157,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
 
         StorageBill storageBill = loadingParams.getStorageBill();
         if (storageBill != null && "1024".equals(storageBill.getTypeConfigId())){
-            result.put("fail", "请先确认目的地，垛位装车失败！");
+            result.put("fail", "未确认装运单目的地，垛位装车失败！");
             return result;
         }
 
@@ -180,7 +180,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             BilletHotsend idExistBh = billetHotsendBaseService.getOne(queryWrapper);
             if (oConvertUtils.isEmpty(idExistBh)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                result.put("fail", "钢坯热送单为空，垛位装车保存失败");
+                result.put("fail", "未查询到炉次传递单，垛位装车失败！");
                 return result;
             }
             billetHotsend.setId(idExistBh.getId());
@@ -208,7 +208,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         StorageBill storageBillInfo = storageBillService.getById(storageBill.getId());
         if (oConvertUtils.isEmpty(storageBillInfo)){
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            result.put("fail", "钢坯装运单信息为空，堆垛保存操作失败！");
+            result.put("fail", "未查询到装运单，垛位装车失败！");
             return result;
         }
         // 取最新的第一条钢坯信息
@@ -315,7 +315,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             queryWrapper.in(BilletBasicInfo::getBilletNo, Arrays.asList(parts));
             List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapper);
             if (oConvertUtils.listIsEmpty(billetBasicInfoList)) {
-                log.info("{}{}", "未查询到钢坯基础信息，堆垛操作失败！:", Arrays.asList(parts));
+                log.info("{}{}", "未查询到钢坯实绩，堆垛保存操作失败！:", Arrays.asList(parts));
                 return;
             }
             List<String> heatNos = billetBasicInfoList.stream().map(BilletBasicInfo::getHeatNo).distinct().collect(Collectors.toList());
@@ -609,7 +609,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 .in(BilletBasicInfo::getBilletNo, billetNosList);
         List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapperBB);
         if (oConvertUtils.listIsEmpty(billetBasicInfoList)) {
-            result.put("fail", "钢坯基础信息不存在，堆垛发车保存失败！");
+            result.put("fail", "未查询到钢坯实绩，垛位发车失败！");
             return result;
         }
         List<RollClubCommon> rollClubCommonList = new ArrayList<>();
@@ -622,7 +622,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
 
         StorageBill storageBill = loadingParams.getStorageBill();
         if (storageBill != null && "1024".equals(storageBill.getTypeConfigId())){
-            result.put("fail", "请先确认目的地，垛位发车失败！");
+            result.put("fail", "未确认装运单目的地，垛位发车失败！");
             return result;
         }
 
@@ -643,7 +643,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             BilletHotsend idExistBh = billetHotsendBaseService.getOne(queryWrapper);
             if (oConvertUtils.isEmpty(idExistBh)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                result.put("fail", "钢坯热送单为空，垛位发车失败");
+                result.put("fail", "未查询到炉次传递单，垛位发车失败！");
                 return result;
             }
             billetHotsend.setId(idExistBh.getId());
@@ -709,7 +709,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         StorageBill storageBillInfo = storageBillService.getById(storageBill.getId());
         if (oConvertUtils.isEmpty(storageBillInfo)){
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            result.put("fail", "钢坯装运单信息为空，堆垛发车操作失败！");
+            result.put("fail", "钢坯装运单为空，堆垛发车操作失败！");
             return result;
         }
 
@@ -858,7 +858,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             queryWrapper.in(BilletBasicInfo::getBilletNo, Arrays.asList(parts));
             List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapper);
             if (oConvertUtils.listIsEmpty(billetBasicInfoList)) {
-                log.info("{}{}", "堆垛起剁日志保存失败，钢坯基础信息不存在！", x.getBilletNos());
+                log.info("{}{}", "钢坯实绩不存在！起垛日志保存失败，", x.getBilletNos());
                 return;
             }
             BilletBasicInfo billetBasicInfo = billetBasicInfoList.stream().findFirst().orElse(null);
@@ -916,7 +916,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             BilletHotsend idExistBh = billetHotsendBaseService.getOne(queryWrapper);
             if (oConvertUtils.isEmpty(idExistBh)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                result.put("fail", "钢坯热送单为空，新增堆垛保存失败");
+                result.put("fail", "未查询到炉次传递单，起垛保存失败！");
                 return result;
             }
             billetHotsend.setId(idExistBh.getId());
@@ -945,7 +945,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             x.setBhtcId(loadingParams.getBilletHotsendTypeConfigId());
         });
         billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
-        result.put("success", "保存堆垛操作成功");
+        result.put("success", "起垛保存操作成功！");
         return result;
     }
 
@@ -971,7 +971,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(new LambdaQueryWrapper<BilletBasicInfo>().in(BilletBasicInfo::getBilletNo, allBilletNos));
             if (oConvertUtils.listIsEmpty(billetBasicInfoList)){
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return "钢坯实绩查询为空，垛位叛废失败！";
+                return "未查询到炉次传递单，垛位叛废失败！";
             }
             for (BilletBasicInfo billetBasicInfo : billetBasicInfoList) {
                 billetBasicInfo.setBelongTable("billet_hotsend_abandons");