Merge remote-tracking branch 'origin/dev' into dev

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

@@ -21,6 +21,8 @@ public class MesEquipmentChannelService extends BaseMesService<MesEquipmentChann
     @Override
     protected void setPackQueryBean(MesEquipmentChannel bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(),"equipmentCode",packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getChannel(),"channel",packBean);
+
     }
 
 
@@ -44,30 +46,35 @@ public class MesEquipmentChannelService extends BaseMesService<MesEquipmentChann
 
 
     protected void onInsertBean(MesEquipmentChannel item) {
-    /*    // 数据校验
+        // 数据校验
         ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
+        ValidatorBean.checkNotNull(item.getChannel(), "设备通道不能为空");
 
 
         DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", seriesPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getChannel(), "channel", seriesPackBean);
+
         boolean flg = baseRDao.isExitByHql(seriesPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】设备代码已经存在，请检查数据", item.getEquipmentCode())
+                    .setErrorDetail("【%s】设备代码和【%s】通道已经存在，请检查数据", item.getEquipmentCode(), item.getChannel())
                     .build();
-        }*/
+        }
 
     }
 
     protected void onUpdateBean(MesEquipmentChannel item) {
-     /*   // 数据校验
+        // 数据校验
         ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
+        ValidatorBean.checkNotNull(item.getChannel(), "设备通道不能为空");
 
 
         DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", seriesPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getChannel(), "channel", seriesPackBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", seriesPackBean);
 
         boolean flg = baseRDao.isExitByHql(seriesPackBean);
@@ -75,8 +82,8 @@ public class MesEquipmentChannelService extends BaseMesService<MesEquipmentChann
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】设备代码已经存在，请检查数据", item.getEquipmentCode())
+                    .setErrorDetail("【%s】设备代码和【%s】通道已经存在，请检查数据", item.getEquipmentCode(), item.getChannel())
                     .build();
-        }*/
+        }
     }
 }

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesPartTransferDetailService extends BaseMesService<MesPartTransferDetail> implements IMesPartTransferDetailService {
     protected void setPackQueryBean(MesPartTransferDetail bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getFeatureNo(),"featureNo",packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getPid(),"pid",packBean);
     }
 
 }