问题清单问题修复

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesYfReportDaoImpl.java

@@ -36,7 +36,7 @@ public class MesYfReportDaoImpl implements IMesYfReportDao {
         dataQuerySql.append("select new ")
                 .append(MesDeviceDataQueryReportResultModel.class.getName())
                 .append("(organizeCode, workCenterCode, workCellCode, workOrderNo, serialNumber, ")
-                .append("logType, message, errorType, equipmentCode, equipmentName, createDatetime, createUser, " +
+                .append("logType, message, equipmentCode, equipmentName, createDatetime, createUser, " +
                         "modifyDatetime, modifyUser) ");
         countQuerySql.append("select count(1) ");
         commonQuerySql.append("from MesWorkCellScanMonitorLog " +

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

@@ -1,13 +0,0 @@
-package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
-
-import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService;
-import cn.estsh.i3plus.pojo.mes.bean.MesPartTypePicture;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-public class MesPartTypePictureService extends BaseMesService<MesPartTypePicture> implements IBaseMesService<MesPartTypePicture> {
-
-
-}

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesPartTypePictureService;
+import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartTypePicture;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesPartTypePictureServiceImpl extends BaseMesService<MesPartTypePicture> implements IMesPartTypePictureService {
+
+    @Override
+    protected void setPackQueryBean(MesPartTypePicture bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getPartTypeCode(), "partTypeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartTypeName(), "partTypeName", packBean);
+    }
+
+    @Override
+    protected void onInsertBean(MesPartTypePicture item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getPartTypeCode(), "零件类型代码不能为空");
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPartTypeCode(), "partTypeCode", packBean);
+        if (baseRDao.isExitByHql(packBean)) {
+            MesException.throwMesBusiException("【%s】零件类型代码已经存在，请检查数据", item.getPartTypeCode());
+        }
+    }
+
+    @Override
+    protected void onUpdateBean(MesPartTypePicture item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getPartTypeCode(), "零件类型代码不能为空");
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPartTypeCode(), "partTypeCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", packBean);
+        if (baseRDao.isExitByHql(packBean)) {
+            MesException.throwMesBusiException("【%s】零件类型代码已经存在，请检查数据", item.getPartTypeCode());
+        }
+    }
+
+}

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesDeviceDataQueryReportResultModel.java

@@ -47,10 +47,6 @@ public class MesDeviceDataQueryReportResultModel {
     @AnnoOutputColumn(name = "日志内容")
     private String message;
 
-    @ApiParam(value = "错误类型")
-    @AnnoOutputColumn(name = "错误类型")
-    private String errorType;
-
     @ApiParam(value = "设备编号")
     @AnnoOutputColumn(name = "设备编号")
     private String equipmentCode;
@@ -77,7 +73,7 @@ public class MesDeviceDataQueryReportResultModel {
 
     public MesDeviceDataQueryReportResultModel(String organizeCode, String workCenterCode, String workCellCode,
                                                String workOrderNo, String serialNumber, Integer logType,
-                                               String message, String errorType, String equipmentCode,
+                                               String message, String equipmentCode,
                                                String equipmentName, String createDatetime, String createUser,
                                                String modifyDatetime, String modifyUser) {
         this.organizeCode = organizeCode;
@@ -87,7 +83,6 @@ public class MesDeviceDataQueryReportResultModel {
         this.serialNumber = serialNumber;
         this.logType = logType;
         this.message = message;
-        this.errorType = errorType;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
         this.createDatetime = createDatetime;