新增bean repository

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

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

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

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

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

@@ -0,0 +1,14 @@
+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.MesCarSeries;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(description = "车系")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCarSeries")
+
+public class MesCarSeriesController extends BaseMesController<MesCarSeries> {
+}

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

@@ -0,0 +1,14 @@
+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.MesCarSeries;
+import cn.estsh.i3plus.pojo.mes.bean.MesCarSeriesDetail;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(description = "车系明细")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCarSeriesDetail")
+public class MesCarSeriesDetailController extends BaseMesController<MesCarSeriesDetail> {
+}

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

@@ -0,0 +1,65 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesCarSeriesDetailService;
+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.MesCarSeriesDetail;
+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 MesCarSeriesDetailService extends BaseMesService<MesCarSeriesDetail> implements IMesCarSeriesDetailService {
+
+
+    protected void onInsertBean(MesCarSeriesDetail item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCarSeriesCode(), "车系代码不能为空");
+        ValidatorBean.checkNotNull(item.getCarModelCode(), "车型代码不能为空");
+        ValidatorBean.checkNotNull(item.getCarModelName(), "车型名称不能为空");
+
+
+//        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+//        DdlPreparedPack.getStringEqualPack(item.getCarSeriesCode(), "carSeriesCode", seriesPackBean);
+//        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", seriesPackBean);
+//        boolean flg = baseRDao.isExitByHql(seriesPackBean);
+//        if (flg) {
+//            throw ImppExceptionBuilder.newInstance()
+//                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+//                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+//                    .setErrorDetail("【%s】车系代码【%s】客户代码已经存在，请检查数据", item.getCarSeriesCode(), item.getCustomerCode())
+//                    .build();
+//        }
+
+    }
+
+    protected void onUpdateBean(MesCarSeriesDetail item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCarSeriesCode(), "车系代码不能为空");
+        ValidatorBean.checkNotNull(item.getCarModelCode(), "车型代码不能为空");
+        ValidatorBean.checkNotNull(item.getCarModelName(), "车型名称不能为空");
+
+//        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+//        DdlPreparedPack.getStringEqualPack(item.getCarSeriesCode(), "carSeriesCode", seriesPackBean);
+//        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", 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】车系代码【%s】客户代码已经存在，请检查数据", item.getCarSeriesCode(), item.getCustomerCode())
+//                    .build();
+//        }
+    }
+
+    protected void setPackQueryBean(MesCarSeriesDetail bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getCarSeriesCode(), "carSeriesCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCarSeriesName(), "carSeriesName", packBean);
+    }
+
+}

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

@@ -0,0 +1,71 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesCarSeriesService;
+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.MesCarSeries;
+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 MesCarSeriesService extends BaseMesService<MesCarSeries> implements IMesCarSeriesService {
+
+
+    protected void onInsertBean(MesCarSeries item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCarSeriesCode(), "车系代码不能为空");
+        ValidatorBean.checkNotNull(item.getCarSeriesName(), "车系名称不能为空");
+        ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
+        ValidatorBean.checkNotNull(item.getCustomerOrganizeCode(), "客户工厂代码不能为空");
+
+
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCarSeriesCode(), "carSeriesCode", seriesPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", seriesPackBean);
+        boolean flg = baseRDao.isExitByHql(seriesPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】车系代码【%s】客户代码已经存在，请检查数据", item.getCarSeriesCode(), item.getCustomerCode())
+                    .build();
+        }
+
+    }
+
+    protected void onUpdateBean(MesCarSeries item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCarSeriesCode(), "车系代码不能为空");
+        ValidatorBean.checkNotNull(item.getCarSeriesName(), "车系名称不能为空");
+        ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
+        ValidatorBean.checkNotNull(item.getCustomerOrganizeCode(), "客户工厂代码不能为空");
+
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCarSeriesCode(), "carSeriesCode", seriesPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", 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】车系代码【%s】客户代码已经存在，请检查数据", item.getCarSeriesCode(), item.getCustomerCode())
+                    .build();
+        }
+    }
+
+    protected void setPackQueryBean(MesCarSeries bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getCarSeriesCode(), "carSeriesCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCarSeriesName(), "carSeriesName", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getYearType(), "yearType", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCustomerCarSeries(), "customerCarSeries", packBean);
+    }
+
+}

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java

@@ -1045,6 +1045,45 @@ public class MesExtEnumUtil {
     }
 
     /**
+     * 零件拉动组明细-数据取值来源
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum PART_PULL_DETAIL_DATA_VALUE_SOURCE {
+        FROM_WORK_ORDER(10, "来源于工单"),
+        FROM_PART_PULL_DETAIL(20, "来源于拉动组明细");
+
+        private int value;
+        private String description;
+
+        private PART_PULL_DETAIL_DATA_VALUE_SOURCE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
+    /**
      * 物料信息-零件类别
      */
     @JsonFormat(