From d9020715639ed4f30e4e6232178ebdf6eb7c2d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Sat, 20 Apr 2024 16:58:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesShippingOrderManagementController.java |  2 +
 ...MesShippingOrderManagementDetailController.java |  2 +
 .../base/MesShippingOrderManagementService.java    | 17 +++++++-
 .../i3plus/ext/mes/pojo/util/MesExtEnumUtil.java   | 50 +++++++++++++++++++---
 4 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java
index 2f16146..3b55d79 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java
@@ -12,4 +12,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesShippingOrderManagement")
 
 public class MesShippingOrderManagementController extends BaseMesController<MesShippingOrderManagement> {
+
+
 }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java
index 64389e1..cb380ac 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java
@@ -3,9 +3,11 @@ 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.MesShippingOrderManagement;
 import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail;
+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 + "/mesShippingOrderManagementDetail")
 
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 a1a6e08..0191f56 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
@@ -43,7 +43,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
 
     @Override
     public MesShippingOrderManagement insert(MesShippingOrderManagement bean) {
-        //插入前构造数据
+        //插入前构造并校验数据
         onInsertBean(bean);
 
         //查询物料发运组数据
@@ -81,7 +81,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
 
     @Override
     public MesShippingOrderManagement update(MesShippingOrderManagement bean) {
-        //更新前构造数据
+        //更新前构造并校验数据
         onUpdateBean(bean);
         MesShippingOrderManagement originBean = baseRDao.getById(bean.getId());
         if (StringUtils.isEmpty(originBean)) {
@@ -168,6 +168,19 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         ValidatorBean.checkNotNull(item.getCustomerOrganizeCode(), "客户工厂代码不能为空");
         ValidatorBean.checkNotNull(item.getShippingGroupNo(), "发运组代码不能为空");
         ValidatorBean.checkNotNull(item.getStatus(), "状态不能为空");
+
+        DdlPackBean shipGroupPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getShippingOrderNo(), "shippingOrderNo", shipGroupPackBean);
+        boolean flg = baseRDao.isExitByHql(shipGroupPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】发运单已经存在，请检查数据", item.getShippingOrderNo())
+                    .build();
+        }
+
+
     }
 
     protected void onUpdateBean(MesShippingOrderManagement item) {
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 785d5a0..705be1a 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
@@ -61,7 +61,8 @@ public class MesExtEnumUtil {
     public static enum ORDER_TYPE_IDENTIFICATION {
         S(10, "S"),
         P(20, "P"),
-        E(30, "E");
+        N(30, "N"),
+        E(40, "E");
 
         private int value;
         private String description;
@@ -93,18 +94,18 @@ public class MesExtEnumUtil {
     }
 
     /**
-     * 工单类型标识
+     * 工单状态
      */
     @JsonFormat(
             shape = JsonFormat.Shape.OBJECT
     )
     public static enum ORDER_STATUS {
-        CREATE(10, "已创建"),
+        CREATE(10, "未处理"),
         RELEASE(20, "已发布"),
         process(30, "在加工"),
-        CLOSE(40, "已关闭"),
+        CLOSE(40, "关闭"),
         COMPLETE(50, "已完成"),
-        CANCEL(60, "已取消"),
+        SHIPPING(60, "已发运"),
         DISMANTLE(70, "已拆解");
 
         private int value;
@@ -1207,6 +1208,45 @@ public class MesExtEnumUtil {
             return this.description;
         }
     }
+    /**
+     * 缺陷类型-类别
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum DEFECT_CATEGORY {
+        POSITION(10, "位置"),
+        TYPE(20, "类型"),
+        RESPONSIBILITY(30, "责任");
+
+        private int value;
+        private String description;
+
+        private DEFECT_CATEGORY(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;
+        }
+    }
 
 
 }