diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupDetailServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupDetailServiceImpl.java
index c72530c..1c9f0fc 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupDetailServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupDetailServiceImpl.java
@@ -1,9 +1,13 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingGroupDetailService;
+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.MesLoadingGroupDetail;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -23,4 +27,43 @@ public class MesLoadingGroupDetailServiceImpl extends BaseMesService<MesLoadingG
         DdlPreparedPack.getStringEqualPack(bean.getLoadingGroupNo(), "loadingGroupNo", packBean);
     }
 
+
+    @Override
+    protected void onInsertBean(MesLoadingGroupDetail item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getShippingGroupCode(), "发运组代码不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getLoadingGroupNo(), "loadingGroupNo", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getShippingGroupCode(), "shippingGroupCode", 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.getShippingGroupCode())
+                    .build();
+        }
+    }
+
+    @Override
+    protected void onUpdateBean(MesLoadingGroupDetail item) {
+
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getShippingGroupCode(), "发运组代码不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getLoadingGroupNo(), "loadingGroupNo", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getShippingGroupCode(), "shippingGroupCode", 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.getShippingGroupCode())
+                    .build();
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupServiceImpl.java
index a4a733d..3515f63 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupServiceImpl.java
@@ -1,9 +1,13 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingGroupService;
+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.MesLoadingGroup;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -26,4 +30,45 @@ public class MesLoadingGroupServiceImpl extends BaseMesService<MesLoadingGroup>
         DdlPreparedPack.getStringEqualPack(bean.getCustOrganizeCode(), "custOrganizeCode", packBean);
     }
 
+    @Override
+    protected void onInsertBean(MesLoadingGroup item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
+        ValidatorBean.checkNotNull(item.getCustOrganizeCode(), "客户工厂代码不能为空");
+        ValidatorBean.checkNotNull(item.getLoadingGroupNo(), "装车组代码不能为空");
+        ValidatorBean.checkNotNull(item.getLoadingGroupName(), "装车组名称不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getLoadingGroupNo(), "loadingGroupNo", 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.getLoadingGroupNo())
+                    .build();
+        }
+    }
+
+    @Override
+    protected void onUpdateBean(MesLoadingGroup item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
+        ValidatorBean.checkNotNull(item.getCustOrganizeCode(), "客户工厂代码不能为空");
+        ValidatorBean.checkNotNull(item.getLoadingGroupNo(), "装车组代码不能为空");
+        ValidatorBean.checkNotNull(item.getLoadingGroupName(), "装车组名称不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getLoadingGroupNo(), "loadingGroupNo", 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.getLoadingGroupNo())
+                    .build();
+        }
+    }
+
 }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java
index 59861de..3de66e4 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java
@@ -167,56 +167,6 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
     }
 
 
-//    @Override
-//    public MesLoadingList update(MesLoadingList bean) {
-//        //更新前构造并校验数据
-//        onUpdateBean(bean);
-//
-//        MesShippingOrderManagement shippingOrderManagement = bean.getShippingOrderNoList().get(0);
-//        DdlPackBean partShipGroupPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
-//        DdlPreparedPack.getStringEqualPack(shippingOrderManagement.getShippingCode(), "shippingGroupNo", partShipGroupPackBean);
-//        MesPartShippingGroup partShippingGroup = partShippingGroupRepository.getByProperty(partShipGroupPackBean);
-//
-//        if (StringUtils.isEmpty(partShippingGroup)) {
-//            throw ImppExceptionBuilder.newInstance()
-//                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
-//                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-//                    .setErrorDetail("【%s】零件发运组数据为空，请检查数据", shippingOrderManagement.getShippingCode())
-//                    .build();
-//        }
-//
-//        if (StringUtils.isEmpty(partShippingGroup.getIsLoading()) || partShippingGroup.getIsLoading() == 0) {
-//            throw ImppExceptionBuilder.newInstance()
-//                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
-//                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-//                    .setErrorDetail("【%s】零件发运组是否有装车不能为空，请检查数据", shippingOrderManagement.getShippingCode())
-//                    .build();
-//        }
-//        if (partShippingGroup.getIsLoading() == MesCommonConstant.FALSE_INTEGER) {
-//            throw ImppExceptionBuilder.newInstance()
-//                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
-//                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-//                    .setErrorDetail("【%s】零件发运组是否有装车配置为否，则不需要生成装车单，请检查数据", shippingOrderManagement.getShippingCode())
-//                    .build();
-//        }
-//
-//        if (StringUtils.isEmpty(partShippingGroup.getIsFirstInstall()) || partShippingGroup.getIsFirstInstall() == 0) {
-//            throw ImppExceptionBuilder.newInstance()
-//                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
-//                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-//                    .setErrorDetail("【%s】零件发运组是否先装车不能为空，请检查数据", shippingOrderManagement.getShippingCode())
-//                    .build();
-//        }
-//        if (StringUtils.isEmpty(partShippingGroup.getIsEnableMemory()) || partShippingGroup.getIsEnableMemory() == 0) {
-//            throw ImppExceptionBuilder.newInstance()
-//                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
-//                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-//                    .setErrorDetail("【%s】零件发运组是否启用记忆不能为空，请检查数据", shippingOrderManagement.getShippingCode())
-//                    .build();
-//        }
-//
-//    }
-
     protected void onInsertBean(MesLoadingList item) {
 
         List<String> shippingOrderNoList = new ArrayList<>();