From c77ddb256b0554d2e7af719564b083e0846897d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Wed, 8 May 2024 11:52:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=8F=91=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=20=E8=A3=85=E8=BD=A6=E5=8D=95=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java | 6 +++---
 .../serviceimpl/base/MesShippingOrderManagementService.java         | 6 +++---
 2 files changed, 6 insertions(+), 6 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 75cc5b6..c4e2d7d 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
@@ -56,7 +56,7 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
                     .build();
         }
 
-        if (StringUtils.isEmpty(partShippingGroup.getIsLoading())) {
+        if (StringUtils.isEmpty(partShippingGroup.getIsLoading()) || partShippingGroup.getIsLoading() == 0) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
@@ -71,14 +71,14 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
                     .build();
         }
 
-        if (StringUtils.isEmpty(partShippingGroup.getIsFirstInstall())) {
+        if (StringUtils.isEmpty(partShippingGroup.getIsFirstInstall()) || partShippingGroup.getIsFirstInstall() == 0) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
                     .setErrorDetail("【%s】零件发运组是否先装车不能为空，请检查数据", shippingOrderManagement.getShippingGroupNo())
                     .build();
         }
-        if (StringUtils.isEmpty(partShippingGroup.getIsEnableMemory())) {
+        if (StringUtils.isEmpty(partShippingGroup.getIsEnableMemory()) || partShippingGroup.getIsEnableMemory() == 0) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
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 ea75abf..d3679e3 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
@@ -66,21 +66,21 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
                     .build();
         }
 
-        if (StringUtils.isEmpty(partShippingGroup.getIsLoading())) {
+        if (StringUtils.isEmpty(partShippingGroup.getIsLoading()) || partShippingGroup.getIsLoading() == 0) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
                     .setErrorDetail("【%s】零件发运组是否有装车不能为空，请检查数据", bean.getShippingGroupNo())
                     .build();
         }
-        if (StringUtils.isEmpty(partShippingGroup.getIsFirstInstall())) {
+        if (StringUtils.isEmpty(partShippingGroup.getIsFirstInstall()) || partShippingGroup.getIsFirstInstall() == 0) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
                     .setErrorDetail("【%s】零件发运组是否先装车不能为空，请检查数据", bean.getShippingGroupNo())
                     .build();
         }
-        if (StringUtils.isEmpty(partShippingGroup.getIsEnableMemory())) {
+        if (StringUtils.isEmpty(partShippingGroup.getIsEnableMemory()) || partShippingGroup.getIsEnableMemory() == 0) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())