From 1cc293d879c852a9d5a2a09d4459a50970721022 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 21 Jul 2022 17:24:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repair/service/impl/DevicerepairplanmstServiceImpl.java | 4 ++-- .../service/impl/DevicemaintenanceplanmstServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java index bf7c457b..c39db67e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java @@ -119,7 +119,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic // 校验 ： 是否有相同设备 相同周期 JSONObject jsonObject = mstTab.query("devicerecord_id = '" + whereJson.getString("devicerecord_id") + "' and maintenancecycle = '" + whereJson.getString("maintenancecycle") + "' and is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonObject)) throw new BadRequestException("此设备已经存在此周期的计划"); + if (ObjectUtil.isNotEmpty(jsonObject)) throw new BadRequestException("该设备当前周期计划已经存在"); // 插入主表 JSONObject jsonMst = new JSONObject(); @@ -191,7 +191,7 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic // 校验 ： 是否有相同设备 相同周期 JSONArray jsonObject = mstTab.query("devicerecord_id = '" + whereJson.getString("devicerecord_id") + "' and maintenancecycle = '" + whereJson.getString("maintenancecycle") + "' and is_delete = '0'").getResultJSONArray(0); - if (jsonObject.size() > 1) throw new BadRequestException("此设备已经存在此周期的计划"); + if (jsonObject.size() > 1) throw new BadRequestException("该设备当前周期计划已经存在"); } @Override diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java index 508c1b7b..b1fe48f2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java @@ -119,7 +119,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla // 校验：相同的设备、周期只能存在一个 JSONObject jsonObject = mstTab.query("devicerecord_id = '" + whereJson.getString("devicerecord_id") + "' and maintenancecycle = '" + whereJson.getString("maintenancecycle") + "' and is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonObject)) throw new BadRequestException("此计划的周期只能存在一个"); + if (ObjectUtil.isNotEmpty(jsonObject)) throw new BadRequestException("该设备当前周期计划已经存在"); // 插入主表 JSONObject jsonMst = new JSONObject(); @@ -194,7 +194,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla } JSONArray jsonObject = mstTab.query("devicerecord_id = '" + whereJson.getString("devicerecord_id") + "' and maintenancecycle = '" + whereJson.getString("maintenancecycle") + "' and is_delete = '0'").getResultJSONArray(0); - if (jsonObject.size() > 1) throw new BadRequestException("此计划的周期只能存在一个"); + if (jsonObject.size() > 1) throw new BadRequestException("该设备当前周期计划已经存在"); } @Override