From c137e15e0ae1af5adb5522e286fb66f0dad13cd8 Mon Sep 17 00:00:00 2001
From: jun <junsheng.li@estsh.com>
Date: Tue, 7 May 2024 19:43:11 +0800
Subject: [PATCH] =?UTF-8?q?40574=20=E5=AE=A2=E6=88=B7=E5=B7=A5=E5=8E=82-?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=82=B9=E7=BB=B4=E6=8A=A4-=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=82=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/base/MesCustomerMessagePointService.java      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerMessagePointService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerMessagePointService.java
index ba245b6..8ee791f 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerMessagePointService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerMessagePointService.java
@@ -5,10 +5,7 @@ import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesCustomer;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerMessagePoint;
-import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze;
-import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
@@ -23,14 +20,14 @@ public class MesCustomerMessagePointService extends BaseMesService<MesCustomerMe
 
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getMessageNo(), "messageNo", roadPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getOrganizeCode(), "organizeCode", roadPackBean);
+        DdlPreparedPack.getNumEqualPack(item.getMessageOrder(), "messageOrder", roadPackBean);
 
         boolean flg = baseRDao.isExitByHql(roadPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("信息点代码【%s】已经存在，请检查数据", item.getMessageNo())
+                    .setErrorDetail("信息点代码【%s】顺序号【%s】已经存在，请检查数据", item.getMessageNo(),item.getMessageOrder())
                     .build();
         }
 
@@ -42,14 +39,14 @@ public class MesCustomerMessagePointService extends BaseMesService<MesCustomerMe
 
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getMessageNo(), "messageNo", roadPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getOrganizeCode(), "organizeCode", roadPackBean);
+        DdlPreparedPack.getNumEqualPack(item.getMessageOrder(), "messageOrder", roadPackBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean);
         boolean flg = baseRDao.isExitByHql(roadPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("信息点代码【%s】已经存在，请检查数据", item.getMessageNo())
+                    .setErrorDetail("信息点代码【%s】顺序号【%s】已经存在，请检查数据", item.getMessageNo(),item.getMessageOrder())
                     .build();
         }
     }