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

# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAreaService.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomer;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author mingliang.li
+ */
+public interface IMesAreaService extends IBaseMesService<MesArea> {
+
+
+}

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesBom;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author mingliang.li
+ */
+public interface IMesBomService extends IBaseMesService<MesBom> {
+
+
+}

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerCarModelDetailService.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesBom;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModelDetail;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author mingliang.li
+ */
+public interface IMesCustomerCarModelDetailService extends IBaseMesService<MesCustomerCarModelDetail> {
+
+
+}

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerCarModelService.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModel;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author mingliang.li
+ */
+public interface IMesCustomerCarModelService extends IBaseMesService<MesCustomerCarModel> {
+
+
+}

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerOriganizeService.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomer;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author mingliang.li
+ */
+public interface IMesCustomerOriganizeService extends IBaseMesService<MesCustomerOriganze> {
+
+
+}

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerPartService.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author mingliang.li
+ */
+public interface IMesCustomerPartService extends IBaseMesService<MesCustomerPart> {
+
+
+}

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCustomerService.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomer;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author mingliang.li
+ */
+public interface IMesCustomerService extends IBaseMesService<MesCustomer> {
+
+
+}

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrDetailService.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail;
+import cn.estsh.impp.framework.boot.util.ResultBean;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author mingliang.li
+ */
+public interface IMesPartPtrDetailService extends IBaseMesService<MesPartPtrDetail>{
+
+
+}

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartPtrService.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartPull;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 
@@ -8,7 +10,6 @@ import cn.estsh.impp.framework.boot.util.ResultBean;
  * @CreateDate 2024/04/16
  * @Author mingliang.li
  */
-public interface IMesPartPtrService {
+public interface IMesPartPtrService  extends IBaseMesService<MesPartPtr>{
 
-    ResultBean getDetailById(int id);
 }

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartService.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesBom;
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author mingliang.li
+ */
+public interface IMesPartService extends IBaseMesService<MesPart> {
+
+
+}

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellService.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author mingliang.li
+ */
+public interface IMesWorkCellService extends IBaseMesService<MesWorkCell> {
+
+
+}

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCenterService.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author mingliang.li
+ */
+public interface IMesWorkCenterService extends IBaseMesService<MesWorkCenter> {
+
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java

@@ -204,7 +204,7 @@ public abstract class BaseMesController<T extends BaseBean> extends BaseControll
             validateInsert(bean);
             //新增初始化
             bean.setOrganizeCode(AuthUtilExt.getOrganizeCode());
-            ConvertBean.serviceModelInitialize(bean, AuthUtilExt.getUserName());
+            ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName());
             T t = (T) getBaseService().insert(bean);
             afterInsert(t);
             return ResultBean.success("操作成功")

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesAreaService;
 import cn.estsh.i3plus.pojo.mes.bean.MesArea;
 import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import lombok.extern.slf4j.Slf4j;
@@ -7,6 +8,6 @@ import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesAreaService extends BaseMesService<MesArea> {
+public class MesAreaService extends BaseMesService<MesArea> implements IMesAreaService {
 
 }

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

@@ -1,12 +1,20 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesBomService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesBom;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomer;
 import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesBomService extends BaseMesService<MesBom> {
+public class MesBomService extends BaseMesService<MesBom> implements IMesBomService {
 
+    protected void setPackQueryBean(MesBom bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getBomVersion(), "bomVersion", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
+    }
 }

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

@@ -1,12 +1,51 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerCarModelDetailService;
+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.MesCustomerCarModel;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModelDetail;
+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;
 
 @Service
 @Slf4j
-public class MesCustomerCarModelDetailService extends BaseMesService<MesCustomerCarModelDetail>{
+public class MesCustomerCarModelDetailService extends BaseMesService<MesCustomerCarModelDetail> implements IMesCustomerCarModelDetailService {
+    protected void onInsertBean(MesCustomerCarModelDetail item) {
+        // 数据校验
 
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", 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.getCustomerPartNo())
+                    .build();
+        }
+
+    }
+
+    protected void onUpdateBean(MesCustomerCarModelDetail item) {
+        // 数据校验
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", 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.getCustomerPartNo())
+                    .build();
+        }
+    }
 }

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

@@ -1,11 +1,62 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerCarModelDetailService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerCarModelService;
+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.MesBom;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomer;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModel;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad;
+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;
 
 @Service
 @Slf4j
-public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarModel>{
+public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarModel> implements IMesCustomerCarModelService {
+    protected void setPackQueryBean(MesCustomerCarModel bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCarModelCode(), "carModelCode", packBean);
+    }
 
+    protected void onInsertBean(MesCustomerCarModel item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCarModelCode(), "车型不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCarModelCode(), "carModelCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", 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.getOrganizeCode(),item.getCustomerCode())
+                    .build();
+        }
+
+    }
+
+    protected void onUpdateBean(MesCustomerCarModel item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCarModelCode(), "车型不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCarModelCode(), "carModelCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", 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.getOrganizeCode(),item.getCustomerCode())
+                    .build();
+        }
+    }
 }

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

@@ -1,12 +1,60 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerMessagePointService;
+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.MesCustomer;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerMessagePoint;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad;
+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;
 
 @Service
 @Slf4j
 public class MesCustomerMessagePointService extends BaseMesService<MesCustomerMessagePoint> implements IMesCustomerMessagePointService {
+    protected void onInsertBean(MesCustomerMessagePoint item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getMessageNo(), "信息点代码不能为空");
 
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getMessageNo(), "messageNo", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getOrganizeCode(), "organizeCode", 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.getMessageNo())
+                    .build();
+        }
+
+    }
+
+    protected void onUpdateBean(MesCustomerMessagePoint item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getMessageNo(), "信息点代码不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getMessageNo(), "messageNo", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getOrganizeCode(), "organizeCode", 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.getMessageNo())
+                    .build();
+        }
+    }
+
+    protected void setPackQueryBean(MesCustomerMessagePoint bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean);
+    }
 }

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

@@ -1,7 +1,16 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerOriganizeService;
+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.MesCustomer;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModel;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad;
+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;
 
@@ -12,6 +21,52 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @Slf4j
-public class MesCustomerOriganizeService extends BaseMesService<MesCustomerOriganze> {
+public class MesCustomerOriganizeService extends BaseMesService<MesCustomerOriganze> implements IMesCustomerOriganizeService {
 
+
+    protected void onInsertBean(MesCustomerOriganze item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustomerOrganizeCode(), "customerOrganizeCode", 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.getOrganizeCode(),item.getCustomerCode())
+                    .build();
+        }
+
+    }
+
+    protected void onUpdateBean(MesCustomerOriganze item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustomerOrganizeCode(), "customerOrganizeCode", 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.getOrganizeCode(),item.getCustomerCode())
+                    .build();
+        }
+    }
+
+
+    protected void setPackQueryBean(MesCustomerOriganze bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCustomerOrganizeName(), "customerOrganizeName", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean);
+
+    }
 }

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

@@ -1,9 +1,19 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerPartService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomer;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description:
  * @CreateDate: 2023/10/11 15:38
@@ -11,6 +21,13 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service
-public class MesCustomerPartService extends BaseMesService<MesCustomerPart> {
+public class MesCustomerPartService extends BaseMesService<MesCustomerPart> implements IMesCustomerPartService {
+
+    protected void setPackQueryBean(MesCustomerPart bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerPartNo(), "customerPartNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCustomerCode(), "customerCode", packBean);
+
+    }
 
 }

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

@@ -1,6 +1,15 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerRoadService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerService;
+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.MesCustomer;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad;
+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;
 
@@ -11,6 +20,47 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @Slf4j
-public class MesCustomerService extends BaseMesService<MesCustomer> {
+public class MesCustomerService extends BaseMesService<MesCustomer> implements IMesCustomerService {
+
+
+
+    protected void onInsertBean(MesCustomer item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", 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.getCustomerCode())
+                    .build();
+        }
+
+    }
+
+    protected void onUpdateBean(MesCustomerRoad item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", 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.getCustomerCode(), item.getRoadCode())
+                    .build();
+        }
+    }
+
+    protected void setPackQueryBean(MesCustomer bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCustomerName(), "customerName", packBean);
+    }
 
 }

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

@@ -1,5 +1,9 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesPartPtrDetailService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail;
 import lombok.extern.slf4j.Slf4j;
@@ -7,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesPartPtrDetailService extends BaseMesService<MesPartPtrDetail> {
+public class MesPartPtrDetailService extends BaseMesService<MesPartPtrDetail> implements IMesPartPtrDetailService {
+
 
 }

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

@@ -1,12 +1,19 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesPartPtrService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesPartService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesArea;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesPartPtrService extends BaseMesService<MesPartPtr> {
-
+public class MesPartPtrService extends BaseMesService<MesPartPtr> implements IMesPartPtrService {
+    protected void setPackQueryBean(MesPartPtr bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
+    }
 }

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

@@ -1,11 +1,20 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesPartService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesPartService extends BaseMesService<MesPart> {
+public class MesPartService extends BaseMesService<MesPart> implements IMesPartService {
 
+    protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikeEqualPack(bean.getPartName(), "partName", packBean);
+
+    }
 }

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

@@ -1,11 +1,22 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesShiftService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import cn.estsh.i3plus.pojo.mes.bean.MesShift;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesShiftService extends BaseMesService<MesShift> {
+public class MesShiftService extends BaseMesService<MesShift> implements IMesShiftService {
 
+    protected void setPackQueryBean(MesShift bean, DdlPackBean packBean) {
+
+        DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getShiftCode(), "shiftCode", packBean);
+        DdlPreparedPack.getStringLikeEqualPack(bean.getShiftName(), "shiftName", packBean);
+
+    }
 }

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

@@ -1,11 +1,12 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellService;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesWorkCellService extends BaseMesService<MesWorkCell>  {
+public class MesWorkCellService extends BaseMesService<MesWorkCell>  implements IMesWorkCellService {
 
 }

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

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