等离子基础数据 可回用包装类型、可回用包装、可回用包装零件

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.MesRecyclablePackagePart;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : PZJ
+ * @CreateDate : 2024/9/14 13:40
+ * @Modify:
+ **/
+public interface IMesRecyclablePackagePartService extends IBaseMesService<MesRecyclablePackagePart>{
+
+
+
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.MesRecyclablePackage;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : PZJ
+ * @CreateDate : 2024/9/14 10:02
+ * @Modify:
+ **/
+public interface IMesRecyclablePackageService extends IBaseMesService<MesRecyclablePackage>{
+
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.MesRecyclablePackageType;
+
+/**
+ * @Description : 回收物包装类型
+ * @Reference :
+ * @Author : PZJ
+ * @CreateDate : 2024/9/13 17:36
+ * @Modify:
+ **/
+public interface IMesRecyclablePackageTypeService extends IBaseMesService<MesRecyclablePackageType>{
+
+}

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

@@ -0,0 +1,20 @@
+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.recyclablepackage.MesRecyclablePackage;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description : 回收包装
+ * @Reference :
+ * @Author : PZJ
+ * @CreateDate : 2024/9/14 10:00
+ * @Modify:
+ **/
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesRecyclablePackage")
+public class MesRecyclablePackageController extends BaseMesController<MesRecyclablePackage> {
+
+
+}

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

@@ -0,0 +1,19 @@
+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.recyclablepackage.MesRecyclablePackagePart;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description : 回收包装零件
+ * @Reference :
+ * @Author : PZJ
+ * @CreateDate : 2024/9/14 10:57
+ * @Modify:
+ **/
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesRecyclablePackagePart")
+public class MesRecyclablePackagePartController extends BaseMesController<MesRecyclablePackagePart>{
+
+}

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

@@ -0,0 +1,19 @@
+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.recyclablepackage.MesRecyclablePackageType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description : 回收包装类型
+ * @Reference :
+ * @Author : PZJ
+ * @CreateDate : 2024/9/13 17:14
+ * @Modify:
+ **/
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesRecyclablePackageType")
+public class MesRecyclablePackageTypeController extends BaseMesController<MesRecyclablePackageType> {
+
+}

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

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesRecyclablePackagePartService;
+import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.MesRecyclablePackagePart;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : PZJ
+ * @CreateDate : 2024/9/14 13:45
+ * @Modify:
+ **/
+@Slf4j
+@Service
+public class MesRecyclablePackagePartServiceImpl extends BaseMesService<MesRecyclablePackagePart> implements IMesRecyclablePackagePartService {
+
+
+    @Override
+    protected void onInsertBean(MesRecyclablePackagePart item) {
+        ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
+        ValidatorBean.checkNotNull(item.getPackageTypeCode(), "包类型不能为空");
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", seriesPackBean);
+        if (baseRDao.isExitByHql(seriesPackBean)) {
+            MesException.throwMesBusiException("零件号【%s】已存在", item.getPartNo());
+        }
+    }
+
+    @Override
+    protected void setPackQueryBean(MesRecyclablePackagePart bean, DdlPackBean packBean) {
+        String packageTypeCode = bean.getPackageTypeCode();
+        if (!StringUtils.isEmpty(packageTypeCode)) {
+            DdlPreparedPack.getStringLikerPack(packageTypeCode, "packageTypeCode", packBean);
+        }
+        String partNo = bean.getPartNo();
+        if (!StringUtils.isEmpty(partNo)) {
+            DdlPreparedPack.getStringLikerPack(partNo, "partNo", packBean);
+        }
+    }
+
+    @Override
+    protected void onUpdateBean(MesRecyclablePackagePart item) {
+        ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
+        ValidatorBean.checkNotNull(item.getPackageTypeCode(), "包类型不能为空");
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", seriesPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(),"id",seriesPackBean);
+        if (baseRDao.isExitByHql(seriesPackBean)) {
+            MesException.throwMesBusiException("零件号【%s】已存在", item.getPartNo());
+        }
+    }
+
+}

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

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesRecyclablePackageService;
+import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.MesRecyclablePackage;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : PZJ
+ * @CreateDate : 2024/9/14 10:03
+ * @Modify:
+ **/
+@Slf4j
+@Service
+public class MesRecyclablePackageServiceImpl extends BaseMesService<MesRecyclablePackage> implements IMesRecyclablePackageService {
+
+    @Override
+    protected void onInsertBean(MesRecyclablePackage item) {
+        ValidatorBean.checkNotNull(item.getPackageTypeCode(), "包类型不能为空");
+        ValidatorBean.checkNotNull(item.getPackageSn(), "包条码不能为空");
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPackageSn(), "packageSn", ddlPackBean);
+        if (baseRDao.isExitByHql(ddlPackBean)) {
+            MesException.throwMesBusiException("回收包装条码【%s】已存在", item.getPackageSn());
+        }
+    }
+
+    @Override
+    protected void onUpdateBean(MesRecyclablePackage item) {
+        ValidatorBean.checkNotNull(item.getId(), "id不能为空");
+        ValidatorBean.checkNotNull(item.getPackageTypeCode(), "包类型不能为空");
+        ValidatorBean.checkNotNull(item.getPackageSn(), "包条码不能为空");
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPackageSn(), "packageSn", ddlPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", ddlPackBean);
+        if (baseRDao.isExitByHql(ddlPackBean)) {
+            MesException.throwMesBusiException("回收包装条码【%s】已存在", item.getPackageSn());
+        }
+    }
+
+    @Override
+    protected void setPackQueryBean(MesRecyclablePackage bean, DdlPackBean packBean) {
+        String packageTypeCode = bean.getPackageTypeCode();
+        if (!StringUtils.isEmpty(packageTypeCode)) {
+            DdlPreparedPack.getStringLikerPack(packageTypeCode, "packageTypeCode", packBean);
+        }
+        String packageSn = bean.getPackageSn();
+        if (!StringUtils.isEmpty(packageSn)) {
+            DdlPreparedPack.getStringLikerPack(packageSn, "packageSn", packBean);
+        }
+    }
+
+
+}

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

@@ -0,0 +1,70 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesRecyclablePackageTypeService;
+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.recyclablepackage.MesRecyclablePackageType;
+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;
+import org.springframework.util.StringUtils;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : PZJ
+ * @CreateDate : 2024/9/13 17:38
+ * @Modify:
+ **/
+@Slf4j
+@Service
+public class MesRecyclablePackageTypeServiceImpl extends BaseMesService<MesRecyclablePackageType> implements IMesRecyclablePackageTypeService {
+
+
+
+    @Override
+    protected void onInsertBean(MesRecyclablePackageType item) {
+        ValidatorBean.checkNotNull(item.getPackageTypeCode(), "包类型不能为空");
+        ValidatorBean.checkNotNull(item.getPackageTypeName(), "包描述不能为空");
+        ValidatorBean.checkNotNull(item.getRuleType(),"规则类型不能为空");
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPackageTypeCode(), "packageTypeCode", ddlPackBean);
+        if (baseRDao.isExitByHql(ddlPackBean)) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode( ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                    .setErrorDetail("回收包装类型已存在{}", item.getPackageTypeCode())
+                    .build();
+        }
+    }
+
+    @Override
+    protected void setPackQueryBean(MesRecyclablePackageType bean, DdlPackBean packBean) {
+        String packageTypeCode = bean.getPackageTypeCode();
+        if (!StringUtils.isEmpty(packageTypeCode)) {
+            DdlPreparedPack.getStringLikerPack(packageTypeCode, "packageTypeCode", packBean);
+        }
+    }
+
+    @Override
+    protected void onUpdateBean(MesRecyclablePackageType item) {
+        ValidatorBean.checkNotNull(item.getId(), "id不能为空");
+        ValidatorBean.checkNotNull(item.getPackageTypeCode(), "包类型不能为空");
+        ValidatorBean.checkNotNull(item.getPackageTypeName(), "包描述不能为空");
+        ValidatorBean.checkNotNull(item.getRuleType(),"规则类型不能为空");
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPackageTypeCode(), "packageTypeCode", ddlPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", ddlPackBean);
+        if (baseRDao.isExitByHql(ddlPackBean)) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode( ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                    .setErrorDetail("回收包装类型已存在{}", item.getPackageTypeCode())
+                    .build();
+        }
+    }
+
+}