Merge remote-tracking branch 'origin/dev' into dev

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());
             }
         });

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;
+
 
 }

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;