40574 客户工厂-信息点维护-信息点校验

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();
         }
     }