Merge branch 'mes-uat' into mes-test

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

@@ -92,16 +92,14 @@ public class MesProdShiftRecordServiceImpl implements IMesProdShiftRecordService
         //唯一性校验
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", packBean);
-//        DdlPreparedPack.getStringEqualPack(item.getShiftGroup(), "shiftGroup", packBean);
         DdlPreparedPack.getIsNull("endTime", packBean);
 
-        boolean flg = mesProdShiftRecordRDao.isExitByHql(packBean);
+        MesProdShiftRecord prodShiftRecordDb = mesProdShiftRecordRDao.getByProperty(packBean);
-        if (flg) {
+        if (null != prodShiftRecordDb) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("开关班记录产线【%s】班组代码【%s】已经存在，请检查数据",
+                    .setErrorDetail("生产线【%s】已经存在班组【%s】的开班记录，请检查数据", item.getWorkCenterCode(), prodShiftRecordDb.getShiftGroup())
-                            item.getWorkCenterCode(), item.getShiftGroup())
                     .build();
         }
         ConvertBean.serviceModelInitialize(item, item.getUserInfo());