From 9db8f63631d0baefa2822beb3fab4e6a35d17183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Fri, 26 Apr 2024 15:05:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ebean=20repository?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/base/IMesCarSeriesLoosePartService.java    | 13 +++++
 .../base/MesCarSeriesLoosePartController.java      | 12 +++++
 .../base/MesCarSeriesLoosePartService.java         | 59 ++++++++++++++++++++++
 .../base/MesShippingOrderManagementService.java    | 14 ++---
 .../i3plus/ext/mes/pojo/util/MesExtEnumUtil.java   | 42 ++++++++++++++-
 5 files changed, 132 insertions(+), 8 deletions(-)
 create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCarSeriesLoosePartService.java
 create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCarSeriesLoosePartController.java
 create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java

diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCarSeriesLoosePartService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCarSeriesLoosePartService.java
new file mode 100644
index 0000000..20091cb
--- /dev/null
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCarSeriesLoosePartService.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCarSeriesLoosePart;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author mingliang.li
+ */
+public interface IMesCarSeriesLoosePartService extends IBaseMesService<MesCarSeriesLoosePart> {
+
+
+}
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCarSeriesLoosePartController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCarSeriesLoosePartController.java
new file mode 100644
index 0000000..92f0bb7
--- /dev/null
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCarSeriesLoosePartController.java
@@ -0,0 +1,12 @@
+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.MesCarSeriesLoosePart;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCarSeriesLoosePart")
+
+public class MesCarSeriesLoosePartController extends BaseMesController<MesCarSeriesLoosePart> {
+}
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java
new file mode 100644
index 0000000..a34945e
--- /dev/null
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java
@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesCarSeriesLoosePartService;
+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.MesCarSeriesLoosePart;
+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 MesCarSeriesLoosePartService extends BaseMesService<MesCarSeriesLoosePart> implements IMesCarSeriesLoosePartService {
+
+    protected void onInsertBean(MesCarSeriesLoosePart item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
+        ValidatorBean.checkNotNull(item.getPartName(), "零件名称不能为空");
+        ValidatorBean.checkNotNull(item.getLoosePartType(), "散件类型不能为空");
+
+        DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", partPackBean);
+        boolean flg = baseRDao.isExitByHql(partPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】零件号已经存在，请检查数据", item.getPartNo())
+                    .build();
+        }
+
+
+    }
+
+    protected void onUpdateBean(MesCarSeriesLoosePart item) {
+
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
+        ValidatorBean.checkNotNull(item.getPartName(), "零件名称不能为空");
+        ValidatorBean.checkNotNull(item.getLoosePartType(), "散件类型不能为空");
+
+        DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", partPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", partPackBean);
+        boolean flg = baseRDao.isExitByHql(partPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】零件号已经存在，请检查数据", item.getPartNo())
+                    .build();
+        }
+
+    }
+
+}
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
index 3877af5..f8b676a 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
@@ -48,7 +48,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         //插入前构造并校验数据
         onInsertBean(bean);
 
-        //查询物料发运组数据
+        //查询物料发运组明细数据
         DdlPackBean shipGroupPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", shipGroupPackBean);
         List<MesPartShippingGroupDetail> groupDetailList = shippingGroupDetailService.findAll(shipGroupPackBean);
@@ -69,8 +69,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
 
             detail.setShippingOrderNo(finalBean.getShippingOrderNo());
             detail.setOrganizeCode(k.getOrganizeCode());
-            ConvertBean.serviceModelInitialize(detail, "LML");
-//            ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
+//            ConvertBean.serviceModelInitialize(detail, "LML");
+            ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
             BeanUtils.copyProperties(k, detail, "id");
             detailInsertList.add(detail);
         });
@@ -121,8 +121,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
                 MesShippingOrderManagementDetail detail = new MesShippingOrderManagementDetail();
 
                 detail.setOrganizeCode(k.getOrganizeCode());
-                ConvertBean.serviceModelInitialize(detail, "LML");
-//                ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
+//                ConvertBean.serviceModelInitialize(detail, "LML");
+                ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
                 BeanUtils.copyProperties(k, detail, "id");
                 detailInsertList.add(detail);
             });
@@ -133,8 +133,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         }
 
         onModifyBean();
-        ConvertBean.serviceModelUpdate(bean, "LML");
-//        ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName());
+//        ConvertBean.serviceModelUpdate(bean, "LML");
+        ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName());
         baseRDao.update(bean);
         return originBean;
     }
diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java
index cd686ed..e236225 100644
--- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java
+++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java
@@ -1648,9 +1648,9 @@ public class MesExtEnumUtil {
             shape = JsonFormat.Shape.OBJECT
     )
     public static enum MES_CUSTOMER_ROAD_TYPE {
+
         CUSTOMER_ROAD_TYPE(10, "客户道口"),
         SHIPPING_ROAD_TYPE(20, "发运道口");
-
         private int value;
         private String description;
 
@@ -1680,4 +1680,44 @@ public class MesExtEnumUtil {
         }
     }
 
+    /**
+     * 车系散件-类型
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum MES_CAR_SERIES_LOOSE_PART_TYPE {
+
+        ASSEMBLY_PART(10, "装配件"),
+        STANDARD_PART(20, "标配件");
+
+        private int value;
+        private String description;
+
+        private MES_CAR_SERIES_LOOSE_PART_TYPE(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;
+        }
+    }
+
 }