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

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

@@ -27,8 +27,9 @@ public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarMod
     @Autowired
     private MesCustomerCarModelDetailRepository mesCustomerCarModelDetailRDao;
     protected void setPackQueryBean(MesCustomerCarModel bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getCustOrganizeCode(), "custOrganizeCode", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getCarModelCode(), "carModelCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustOrganizeCode(), "custOrganizeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCustCode(), "custCode", packBean);
     }
 
     protected void onInsertBean(MesCustomerCarModel item) {
@@ -37,14 +38,14 @@ public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarMod
 
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getCarModelCode(), "carModelCode", roadPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", 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())
+                    .setErrorDetail("客户代码【%s】下车型【%s】已经存在，请检查数据", item.getOrganizeCode(),item.getCustCode())
                     .build();
         }
 
@@ -56,14 +57,14 @@ public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarMod
 
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getCarModelCode(), "carModelCode", roadPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", 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())
+                    .setErrorDetail("客户代码【%s】下车型【%s】已经存在，请检查数据", item.getOrganizeCode(),item.getCustCode())
                     .build();
         }
     }

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

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomer;
 import cn.estsh.i3plus.pojo.mes.repository.MesCustomerCarModelRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesCustomerPartRepository;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
@@ -33,6 +34,8 @@ public class MesCustomerService extends BaseMesService<MesCustomer> implements I
         // 数据校验
         ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
 
+        item.setCustSource(MesExtEnumUtil.MES_CUSTOMER_CUST_SOURCE.ARTIFICIAL.getValue());
+
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", roadPackBean);
         boolean flg = baseRDao.isExitByHql(roadPackBean);

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

@@ -18,8 +18,13 @@ public class MesPartProdGroupDetailService extends BaseMesService<MesPartProdGro
 
 
 
-    protected void setPackQueryBean(MesPartProdGroup bean, DdlPackBean packBean) {
+    protected void setPackQueryBean(MesPartProdGroupDetail bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getPartProdGroupCode(), "partProdGroupCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerPartNo(), "customerPartNo", packBean);
+
+
     }
 
 

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

@@ -4,6 +4,7 @@ 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.MesPartProdGroup;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail;
 import lombok.extern.slf4j.Slf4j;
@@ -13,5 +14,7 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesPartPtrDetailService extends BaseMesService<MesPartPtrDetail> implements IMesPartPtrDetailService {
 
-
+    protected void setPackQueryBean(MesPartPtrDetail bean, DdlPackBean packBean) {
+        DdlPreparedPack.getNumEqualPack(bean.getPtrId(), "ptrId", packBean);
+    }
 }

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

@@ -2,9 +2,13 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesPartService;
 import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException;
+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.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -28,4 +32,39 @@ public class MesPartService extends BaseMesService<MesPart> implements IMesPartS
         }
         return mesPart;
     }
+
+    protected void onInsertBean(MesPart item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getPartNo(), "物料号不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", 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.getPartNo())
+                    .build();
+        }
+    }
+
+    protected void onUpdateBean(MesPart item) {
+
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getPartNo(), "物料号不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", 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.getPartNo())
+                    .build();
+        }
+    }
 }

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

@@ -3,10 +3,15 @@ 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.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.MesPartShippingGroup;
 import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
+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;
 
@@ -14,10 +19,46 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesShiftGroupService extends BaseMesService<MesShiftGroup> implements IMesShiftGroupService {
 
-    protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) {
+    protected void setPackQueryBean(MesShiftGroup bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getShiftGroup(), "shiftGroup", packBean);
-        DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getShiftGroupName(), "shiftGroupName", packBean);
+    }
+
+    protected void onInsertBean(MesShiftGroup item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getShiftGroup(), "班组代码不能为空");
+        ValidatorBean.checkNotNull(item.getShiftGroupName(), "班组名称不能为空");
+
+
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getShiftGroup(), "shiftGroup", 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.getShiftGroup())
+                    .build();
+        }
+
+    }
+
+    protected void onUpdateBean(MesShiftGroup item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getShiftGroup(), "发运组代码不能为空");
+        ValidatorBean.checkNotNull(item.getShiftGroupName(), "班组名称不能为空");
 
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getShiftGroup(), "shiftGroup", seriesPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", 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.getShiftGroup())
+                    .build();
+        }
     }
 
 }