From 56f2b20056caf3717f1637bbead261f437f7219e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Tue, 7 May 2024 14:47:17 +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

---
 .../serviceimpl/base/MesLoadingVehiclesOrderService.java          | 2 +-
 .../cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java  | 8 ++++++++
 .../java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java    | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java
index 76ccbd3..0d2b8e0 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java
@@ -88,7 +88,7 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
         ValidatorBean.checkNotNull(item.getWeatherCondition(), "天气不能为空");
         ValidatorBean.checkNotNull(item.getShippingOrderNoList(), "发运单不能为空");
         item.getShippingOrderNoList().forEach(k -> {
-            if (k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() || k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()) {
+            if (k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() && k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()) {
                 shippingOrderNoList.add(k.getShippingOrderNo());
             }
         });
diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java
index a0b0209..f8cfcca 100644
--- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java
+++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java
@@ -6,5 +6,13 @@ public class MesCommonConstant {
     //yanfeng
     public static final String MES_YANFEN = "/mes/ext";
 
+    public static final String TRUE_STRING = "2";
+
+    public static final String FALSE_STRING = "1";
+
+    public static final Integer TRUE_INTEGER = 2;
+
+    public static final Integer FALSE_INTEGER = 1;
+
 
 }
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 92fbd6a..3dd8008 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
@@ -222,7 +222,7 @@ public class MesExtEnumUtil {
     )
     public static enum SHIPPING_ORDER_DETAIL_SHIPPING_STATUS {
         PUBLISHED(10, "Published"),
-        SORT_SHIPPING(20, "Shippinged");
+        SHIPPINGED(20, "Shippinged");
 
         private int value;
         private String description;