From 853ec9b6bb3ddfa15744a77378c8472578c59d49 Mon Sep 17 00:00:00 2001
From: "logic.fang" <[logic.fang@estsh.com]>
Date: Thu, 20 Jun 2024 19:53:55 +0800
Subject: [PATCH] =?UTF-8?q?41506=20MES-PDA=E7=AB=AF-=E8=A3=85=E8=BD=A6?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E3=80=81=E6=8E=92=E5=BA=8F=E5=8F=91=E8=BF=90?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C-=E9=9C=80=E8=A6=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=8D=A1=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/busi/MesShippingLoadingCheckService.java  | 14 ++++++++++++++
 .../serviceimpl/busi/MesSortShippingCheckService.java     | 15 +++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java
index d015c28..e6fc296 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java
@@ -258,6 +258,20 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
                     MesExtEnumUtil.MES_LOADING_STATUS.CREATE_ASN.getDescription(),
                     MesExtEnumUtil.MES_LOADING_STATUS.LOADING.getDescription()));
         }
+        //增加发运顺序卡控，查询是否存在小于当前装车单对应的seq，且发运状态在（“创建”，“已确认”，“已生成ASN”，“装车中”）的装车单数据
+        List<Integer> loadingListStatusList = new ArrayList<>();
+        loadingListStatusList.add(MesExtEnumUtil.MES_LOADING_STATUS.CREATE.getValue());
+        loadingListStatusList.add(MesExtEnumUtil.MES_LOADING_STATUS.PUBLISH.getValue());
+        loadingListStatusList.add(MesExtEnumUtil.MES_LOADING_STATUS.CREATE_ASN.getValue());
+        loadingListStatusList.add(MesExtEnumUtil.MES_LOADING_STATUS.LOADING.getValue());
+        orderPackBean = DdlPackBean.getDdlPackBean(org);
+        DdlPreparedPack.getStringSmallerNotEqualPack(loadingList.getSeq(), "seq", orderPackBean);
+        DdlPreparedPack.getInPackList(loadingListStatusList, "status", orderPackBean);
+        int count = vehiclesOrderRepository.findByHqlWhereCount(orderPackBean);
+        if (count != 0) {
+            throw new ImppBusiException(String.format("【%s】装车单对应排序【%s】前存在未扫描发运的装车单，请检查数据！",
+                    orderCode, loadingList.getSeq()));
+        }
         return loadingList;
     }
 
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
index c163cac..f70be2d 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
@@ -79,6 +79,21 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                     MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPING.getDescription(), MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getDescription()));
         }
 
+        //校验发运单扫描顺序
+        List<Integer> statusForCheckList = new ArrayList<>();
+        statusForCheckList.add(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue());
+        statusForCheckList.add(MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue());
+        statusForCheckList.add(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPING.getValue());
+        statusForCheckList.add(MesExtEnumUtil.SHIPPING_ORDER_STATUS.PRINTED.getValue());
+        orderManagementPackBean = DdlPackBean.getDdlPackBean(shippingOrderManagement.getOrganizeCode());
+        DdlPreparedPack.getStringSmallerNotEqualPack(orderManagement.getSeq(), "seq", orderManagementPackBean);
+        DdlPreparedPack.getInPackList(statusForCheckList, "status", orderManagementPackBean);
+        int queryCount = shippingOrderManagementRepository.findByHqlWhereCount(orderManagementPackBean);
+        if (queryCount != 0) {
+            throw new ImppBusiException(String.format("【%s】发运单对应排序【%s】前存在未扫描发运的发运单，请检查数据！",
+                    orderManagement.getShippingCode(), orderManagement.getSeq()));
+        }
+
 
         //根据扫描的发运单找到是否装车配置，若是，则根据发运单查询是否生成装车单，若没生成装车单则提示此发运单配置是否装车为是,但没生成装车单，请检查数据！
         if (orderManagement.getIsLoading() == MesCommonConstant.TRUE_INTEGER) {