From b467cec30234b015061e61ddffe5ef1e4a9de5d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Wed, 22 May 2024 20:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesShippingOrderManagementService.java    | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

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 417b452..b627095 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
@@ -250,6 +250,17 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
                     .build();
         }
 
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getSeq(), "seq", packBean);
+        boolean flg1 = baseRDao.isExitByHql(packBean);
+        if (flg1) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】顺序号已经存在，请检查数据", item.getShippingCode())
+                    .build();
+        }
+
 
     }
 
@@ -262,6 +273,30 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         ValidatorBean.checkNotNull(item.getCustOrganizeCode(), "客户工厂代码不能为空");
         ValidatorBean.checkNotNull(item.getShippingGroupCode(), "发运组代码不能为空");
         ValidatorBean.checkNotNull(item.getStatus(), "状态不能为空");
+
+        DdlPackBean shipGroupPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getShippingCode(), "shippingCode", shipGroupPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", 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.getShippingCode())
+                    .build();
+        }
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getSeq(), "seq", packBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", packBean);
+        boolean flg1 = baseRDao.isExitByHql(packBean);
+        if (flg1) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】顺序号已经存在，请检查数据", item.getShippingCode())
+                    .build();
+        }
     }