From 3c78de6bc67c9db89f47507112c9a97d908f62f3 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 16 Dec 2022 10:06:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E4=B8=8E?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E6=A0=A1=E9=AA=8C=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/admin/controller/inout/utils/CheckOrderUtils.java   | 6 ++++++
 api-admin/src/main/resources/application-dev.properties     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java
index c048671e..ee7d45b4 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java
@@ -279,6 +279,8 @@ public class CheckOrderUtils {
                 return null;
         } else if (StrUtil.isEmpty(vailOrderEntity.getBatchNo()) && StrUtil.isEmpty(myErpOrder.getBatchNo())) {
             return null;
+        } else if (StrUtil.isEmpty(myErpOrder.getBatchNo())) {
+            return null;
         } else {
             return myErpOrder.getCoName() + "批次号不匹配！";
         }
@@ -291,6 +293,8 @@ public class CheckOrderUtils {
                 return null;
         } else if (StrUtil.isEmpty(vailOrderEntity.getProductDate()) && StrUtil.isEmpty(myErpOrder.getProductDate())) {
             return null;
+        } else if (StrUtil.isEmpty(myErpOrder.getProductDate())) {
+            return null;
         } else {
             return myErpOrder.getCoName() + "生产日期不匹配！";
         }
@@ -304,6 +308,8 @@ public class CheckOrderUtils {
                 return null;
         } else if (StrUtil.isEmpty(vailOrderEntity.getExpireDate()) && StrUtil.isEmpty(myErpOrder.getExpireDate())) {
             return null;
+        } else if (StrUtil.isEmpty(myErpOrder.getExpireDate())) {
+            return null;
         } else {
             return myErpOrder.getCoName() + "失效日期不匹配！";
         }
diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties
index 8a813a25..54195b61 100644
--- a/api-admin/src/main/resources/application-dev.properties
+++ b/api-admin/src/main/resources/application-dev.properties
@@ -1,4 +1,4 @@
-server.port=9992
+server.port=9989
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3364/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root