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

# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesWorkOrderBtoExcelServiceImpl.java

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReason;
 
 /**
  * @Description :设备停机原因
@@ -9,5 +10,5 @@ import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason;
  * @CreateDate 2024/5/17 14:06
  * @Modify:
  **/
-public interface IMesBasDowntimeReasonService extends IBaseMesService<MesBasDowntimeReason> {
+public interface IMesBasDowntimeReasonService extends IBaseMesService<MesDowntimeReason> {
 }

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType;
+import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReasonType;
 
 /**
  * @Description :设备停机类型
@@ -9,5 +9,5 @@ import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType;
  * @CreateDate 2024/5/17 14:06
  * @Modify:
  **/
-public interface IMesBasDowntimeReasonTypeService extends IBaseMesService<MesBasDowntimeReasonType> {
+public interface IMesBasDowntimeReasonTypeService extends IBaseMesService<MesDowntimeReasonType> {
 }

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

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

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

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

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason;
+import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReason;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -13,6 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @Modify:
  **/
 @RestController
-@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBasDowntimeReason")
-public class MesBasDowntimeReasonController extends BaseMesController<MesBasDowntimeReason>{
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesDowntimeReason")
+public class MesBasDowntimeReasonController extends BaseMesController<MesDowntimeReason>{
 }

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType;
+import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReasonType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -13,6 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @Modify:
  **/
 @RestController
-@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBasDowntimeReasonType")
-public class MesBasDowntimeReasonTypeController extends BaseMesController<MesBasDowntimeReasonType>{
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesDowntimeReasonType")
+public class MesBasDowntimeReasonTypeController extends BaseMesController<MesDowntimeReasonType>{
 }

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesCenterShiftGroup;
+import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 产线与班组的对应关系
+ */
+@Api("产线与班组的对应关系")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCenterShiftGroup")
+public class MesCenterShiftGroupController extends BaseMesController<MesCenterShiftGroup>{
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 零件管理
+ */
+@Api("物料信息")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesShiftGroup")
+public class MesShiftGroupController extends BaseMesController<MesShiftGroup>{
+}

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

@@ -3,7 +3,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService;
 import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.pojo.mes.unit.MesExtEnumUtil;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;

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

@@ -3,7 +3,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 import cn.estsh.i3plus.ext.mes.api.base.IMesBasDowntimeReasonService;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason;
+import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReason;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -17,12 +17,12 @@ import org.springframework.stereotype.Service;
  **/
 @Service
 @Slf4j
-public class MesBasDowntimeReasonServiceImpl extends BaseMesService<MesBasDowntimeReason> implements IMesBasDowntimeReasonService {
+public class MesBasDowntimeReasonServiceImpl extends BaseMesService<MesDowntimeReason> implements IMesBasDowntimeReasonService {
 
-    protected void setPackQueryBean(MesBasDowntimeReason bean, DdlPackBean packBean) {
+    protected void setPackQueryBean(MesDowntimeReason bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getReasonCode(), "reasonCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getReasonName(), "reasonName", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getReasonType(), "reasonType", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getReasonTypeCode(), "reasonTypeCode", packBean);
     }
 
 }

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

@@ -3,7 +3,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 import cn.estsh.i3plus.ext.mes.api.base.IMesBasDowntimeReasonTypeService;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType;
+import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReasonType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -17,11 +17,11 @@ import org.springframework.stereotype.Service;
  **/
 @Service
 @Slf4j
-public class MesBasDowntimeReasonTypeServiceImpl extends BaseMesService<MesBasDowntimeReasonType> implements IMesBasDowntimeReasonTypeService {
+public class MesBasDowntimeReasonTypeServiceImpl extends BaseMesService<MesDowntimeReasonType> implements IMesBasDowntimeReasonTypeService {
 
-    protected void setPackQueryBean(MesBasDowntimeReasonType bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getTypeCode(), "typeCode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getTypeName(), "typeName", packBean);
+    protected void setPackQueryBean(MesDowntimeReasonType bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getReasonTypeCode(), "reasonTypeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getReasonTypeName(), "reasonTypeName", packBean);
     }
 
 }

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

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesCenterShiftGroupService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesShiftGroupService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesCenterShiftGroup;
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesCenterShiftGroupService extends BaseMesService<MesCenterShiftGroup> implements IMesCenterShiftGroupService {
+
+    protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean);
+
+    }
+
+}

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

@@ -5,7 +5,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesCraftRouteService;
 import cn.estsh.i3plus.ext.mes.api.base.IMesCraftService;
 import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException;
-import cn.estsh.i3plus.pojo.mes.unit.MesExtEnumUtil;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;

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

@@ -27,7 +27,7 @@ public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarMod
     @Autowired
     private MesCustomerCarModelDetailRepository mesCustomerCarModelDetailRDao;
     protected void setPackQueryBean(MesCustomerCarModel bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustOrganizeCode(), "custOrganizeCode", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getCarModelCode(), "carModelCode", packBean);
     }
 

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

@@ -1,14 +1,16 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
-import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerCarModelService;
 import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerPartService;
-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.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.*;
+import cn.estsh.i3plus.pojo.mes.bean.MesCarSeriesLoosePart;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModelDetail;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
 import cn.estsh.i3plus.pojo.mes.repository.MesCustomerCarModelDetailRepository;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,18 +40,63 @@ public class MesCustomerPartService extends BaseMesService<MesCustomerPart> impl
 
     }
 
+    protected void onInsertBean(MesCustomerPart item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
+        ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
+        ValidatorBean.checkNotNull(item.getCustomerPartNo(), "客户零件号不能为空");
+
+        DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", cellBinPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", cellBinPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", cellBinPackBean);
+        boolean flg = baseRDao.isExitByHql(cellBinPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】客户零件号【%s】零件号【%s】客户代码已经存在，请检查数据", item.getCustomerPartNo(), item.getPartNo(), item.getCustomerCode())
+                    .build();
+        }
+
+    }
+
+    protected void onUpdateBean(MesCarSeriesLoosePart item) {
+
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
+        ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
+        ValidatorBean.checkNotNull(item.getCustomerPartNo(), "客户零件号不能为空");
+
+        DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", cellBinPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", cellBinPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", cellBinPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", cellBinPackBean);
+        boolean flg = baseRDao.isExitByHql(cellBinPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】客户零件号【%s】零件号【%s】客户代码已经存在，请检查数据", item.getCustomerPartNo(), item.getPartNo(), item.getCustomerCode())
+                    .build();
+        }
+
+    }
+
+
     @Override
     public List<MesCustomerPart> findMesCustomerPart(MesCustomerCarModelDetail mesPartProdGroupDetail) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroupDetail.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getPartNo(),"partNo",ddlPackBean);
-        DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getCarModelCode(),"carModelCode",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getPartNo(), "partNo", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getCarModelCode(), "carModelCode", ddlPackBean);
         List<MesCustomerCarModelDetail> mesCustomerCarModelDetails = mesCustomerCarModelDetailRDao.findByHqlWhere(ddlPackBean);
-        if(CollectionUtils.isEmpty(mesCustomerCarModelDetails)){
+        if (CollectionUtils.isEmpty(mesCustomerCarModelDetails)) {
             return new ArrayList<>();
         }
-        List<String>  customerPartNoList = mesCustomerCarModelDetails.stream().map(MesCustomerCarModelDetail::getCustomerPartNo).collect(Collectors.toList());
+        List<String> customerPartNoList = mesCustomerCarModelDetails.stream().map(MesCustomerCarModelDetail::getCustomerPartNo).collect(Collectors.toList());
         ddlPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroupDetail.getOrganizeCode());
-        DdlPreparedPack.getInPackList(customerPartNoList,"customerPartNo",ddlPackBean);
+        DdlPreparedPack.getInPackList(customerPartNoList, "customerPartNo", ddlPackBean);
         return baseRDao.findByHqlWhere(ddlPackBean);
     }
 

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

@@ -1,10 +1,13 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesDefectService;
+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.MesDefect;
-import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroupDetail;
+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;
 
@@ -18,4 +21,41 @@ public class MesDefectService extends BaseMesService<MesDefect> implements IMesD
         DdlPreparedPack.getNumEqualPack(bean.getCategory(), "category", packBean);
     }
 
+    protected void onInsertBean(MesDefect item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getDefectCode(), "缺陷类型代码不能为空");
+        ValidatorBean.checkNotNull(item.getDefectName(), "缺陷类型名称不能为空");
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getDefectCode(), "defectCode", packBean);
+        boolean flg = baseRDao.isExitByHql(packBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】缺陷类型代码已经存在，请检查数据", item.getDefectCode())
+                    .build();
+        }
+    }
+
+
+    protected void onUpdateBean(MesDefect item) {
+
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getDefectCode(), "缺陷类型代码不能为空");
+        ValidatorBean.checkNotNull(item.getDefectName(), "缺陷类型名称不能为空");
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getDefectCode(), "defectCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", packBean);
+        boolean flg = baseRDao.isExitByHql(packBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】缺陷类型代码已经存在，请检查数据", item.getDefectCode())
+                    .build();
+        }
+    }
+
 }

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesEnumExtService;
-import cn.estsh.i3plus.pojo.mes.unit.MesExtEnumUtil;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.i3plus.mes.apiservice.util.EnumUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesEquipmentProdParamCfgService;
-import cn.estsh.i3plus.pojo.mes.unit.MesExtEnumUtil;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentProdParamCfg;

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingVehiclesOrderService;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.pojo.mes.unit.MesExtEnumUtil;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;

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

@@ -14,7 +14,7 @@ public class MesPartService extends BaseMesService<MesPart> implements IMesPartS
 
     protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringLikeEqualPack(bean.getPartName(), "partName", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean);
 
     }
 

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

@@ -1,6 +1,9 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesPartTransferService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesErpWorkCenter;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartTransfer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -9,4 +12,8 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesPartTransferService extends BaseMesService<MesPartTransfer> implements IMesPartTransferService {
 
+    protected void setPackQueryBean(MesPartTransfer bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getCustomerCode(), "customerCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getMessageNo(), "messageNo", packBean);
+    }
 }

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

@@ -1,10 +1,13 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesPartTypeService;
+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.MesPartShippingGroupDetail;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartType;
+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;
 
@@ -15,4 +18,42 @@ public class MesPartTypeService extends BaseMesService<MesPartType> implements I
         DdlPreparedPack.getStringLikerPack(bean.getPartTypeCode(), "partTypeCode", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartTypeName(), "partTypeName", packBean);
     }
+
+
+    protected void onInsertBean(MesPartType item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getPartTypeCode(), "零件类型代码不能为空");
+        ValidatorBean.checkNotNull(item.getPartTypeName(), "零件类型名称不能为空");
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPartTypeCode(), "partTypeCode", packBean);
+        boolean flg = baseRDao.isExitByHql(packBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】零件类型代码已经存在，请检查数据", item.getPartTypeCode())
+                    .build();
+        }
+    }
+
+
+    protected void onUpdateBean(MesPartType item) {
+
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getPartTypeCode(), "零件类型代码不能为空");
+        ValidatorBean.checkNotNull(item.getPartTypeName(), "零件类型名称不能为空");
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPartTypeCode(), "partTypeCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", packBean);
+        boolean flg = baseRDao.isExitByHql(packBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】零件类型代码已经存在，请检查数据", item.getPartTypeCode())
+                    .build();
+        }
+    }
 }

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

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesPartService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesShiftGroupService;
+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.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesShiftGroupService extends BaseMesService<MesShiftGroup> implements IMesShiftGroupService {
+
+    protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean);
+
+    }
+
+}

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

@@ -1,10 +1,13 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesShiftService;
+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.MesPart;
 import cn.estsh.i3plus.pojo.mes.bean.MesShift;
+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;
 
@@ -17,7 +20,57 @@ public class MesShiftService extends BaseMesService<MesShift> implements IMesShi
         DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getShiftCode(), "shiftCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringLikeEqualPack(bean.getShiftName(), "shiftName", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getShiftName(), "shiftName", packBean);
 
     }
+
+    protected void onInsertBean(MesShift item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getAreaCode(), "区域不能为空");
+        ValidatorBean.checkNotNull(item.getShiftCode(), "班次代码不能为空");
+        ValidatorBean.checkNotNull(item.getShiftName(), "班次名称不能为空");
+        ValidatorBean.checkNotNull(item.getStartTime(), "开始时间不能为空");
+        ValidatorBean.checkNotNull(item.getEndTime(), "结束时间不能为空");
+        ValidatorBean.checkNotNull(item.getWorkerQty(), "作业人数不能为空");
+
+        DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getAreaCode(), "areaCode", cellBinPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getShiftCode(), "shiftCode", cellBinPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", cellBinPackBean);
+        boolean flg = baseRDao.isExitByHql(cellBinPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】区域【%s】产线【%s】班次代码已经存在，请检查数据", item.getAreaCode(), item.getWorkCenterCode(), item.getShiftCode())
+                    .build();
+        }
+    }
+
+
+    protected void onUpdateBean(MesShift item) {
+
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getAreaCode(), "区域不能为空");
+        ValidatorBean.checkNotNull(item.getShiftCode(), "班次代码不能为空");
+        ValidatorBean.checkNotNull(item.getShiftName(), "班次名称不能为空");
+        ValidatorBean.checkNotNull(item.getStartTime(), "开始时间不能为空");
+        ValidatorBean.checkNotNull(item.getEndTime(), "结束时间不能为空");
+        ValidatorBean.checkNotNull(item.getWorkerQty(), "作业人数不能为空");
+
+        DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getAreaCode(), "areaCode", cellBinPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getShiftCode(), "shiftCode", cellBinPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", cellBinPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", cellBinPackBean);
+        boolean flg = baseRDao.isExitByHql(cellBinPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】区域【%s】产线【%s】班次代码已经存在，请检查数据", item.getAreaCode(), item.getWorkCenterCode(), item.getShiftCode())
+                    .build();
+        }
+    }
+
 }

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService;
 import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService;
-import cn.estsh.i3plus.pojo.mes.unit.MesExtEnumUtil;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;

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

@@ -22,7 +22,7 @@ import cn.estsh.i3plus.pojo.mes.repository.MesBomRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesProductVersionRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesShiftRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesWorkCenterRepository;
-import cn.estsh.i3plus.pojo.mes.unit.MesExtEnumUtil;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderResultService.java

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 @Service
 @Slf4j
@@ -14,6 +15,10 @@ public class MesSpotCheckOrderResultService extends BaseMesService<MesSpotCheckO
 
     protected void setPackQueryBean(MesSpotCheckOrderResult bean, DdlPackBean packBean) {
         DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
-//        DdlPreparedPack.getStringLikerPack(bean.getErpWorkCenterName(), "erpWorkCenterName", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getTaskItemName(), "taskItemName", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getIsTolerance(), "isTolerance", packBean);
+        if (!StringUtils.isEmpty(bean.getSpotCheckTimeStart()) || !StringUtils.isEmpty(bean.getSpotCheckTimeEnd())) {
+            DdlPreparedPack.timeBuilder(bean.getSpotCheckTimeStart(), bean.getSpotCheckTimeEnd(), "spotCheckTime", packBean, false);
+        }
     }
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java

@@ -18,7 +18,7 @@ import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentSpotCheckDetailRepository
 import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentSpotCheckPartRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesSpotCheckOrderPartRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesSpotCheckOrderResultRepository;
-import cn.estsh.i3plus.pojo.mes.unit.MesExtEnumUtil;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
@@ -284,7 +284,7 @@ public class MesSpotCheckOrderService extends BaseMesService<MesSpotCheckOrder>
             MesSpotCheckOrder bean = baseRDao.getById(id);
             if (StringUtils.isEmpty(bean)) continue;
 
-            if (bean.getStatus() != MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.CREATE.getValue()) {
+            if (bean.getStatus() == MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.COMPLETE.getValue()) {
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                         .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())