客户车型信息新增修改唯一值修改，增加客户工厂代码

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java

@@ -38,13 +38,14 @@ public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarMod
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getCarModelCode(), "carModelCode", roadPackBean);
         DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustOrganizeCode(), "custOrganizeCode", roadPackBean);
 
         boolean flg = baseRDao.isExitByHql(roadPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("客户代码【%s】下车型【%s】已经存在，请检查数据", item.getCustCode(),item.getCarModelCode())
+                    .setErrorDetail("客户代码【%s】客户工厂代码【%s】车型【%s】已经存在，请检查数据", item.getCustCode(),item.getCustOrganizeCode(),item.getCarModelCode())
                     .build();
         }
 
@@ -57,13 +58,14 @@ public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarMod
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getCarModelCode(), "carModelCode", roadPackBean);
         DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustOrganizeCode(), "custOrganizeCode", 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】下车型【%s】已经存在，请检查数据", item.getCustCode(),item.getCarModelCode())
+                    .setErrorDetail("客户代码【%s】客户工厂代码【%s】车型【%s】已经存在，请检查数据", item.getCustCode(),item.getCustOrganizeCode(),item.getCarModelCode())
                     .build();
         }
     }