From 628f3bccee76729af8945f774b52f791931398c2 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Mon, 8 Aug 2022 14:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=A0=E9=99=A4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=89=B9=E6=AC=A1=E5=8F=B7=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99=E4=B8=8D=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/admin/controller/inout/WareHouseController.java    | 7 ++-----
 .../glxp/api/admin/dao/basic/BussinessLocalTypeDao.java    | 2 +-
 .../api/admin/service/inout/impl/OrderServiceImpl.java     | 5 ++++-
 api-admin/src/main/resources/application.properties        | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
index 75540bce..5a357dc3 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
@@ -63,10 +63,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
@@ -893,7 +890,7 @@ public class WareHouseController {
             if (!StrUtil.emptyIfNull(originUdiEntity.getUdi()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) {
                 continue;
             }
-            if (!StrUtil.emptyIfNull(originUdiEntity.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()))) {
+            if (!StrUtil.emptyIfNull(originUdiEntity.getBatchNo()).toUpperCase(Locale.ROOT).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()).toUpperCase(Locale.ROOT))) {
                 continue;
             }
             if (!StrUtil.emptyIfNull(originUdiEntity.getProduceDate()).equals(StrUtil.emptyIfNull(udiEntity.getProduceDate()))) {
diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java
index 31d029f4..861e7546 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java
@@ -44,5 +44,5 @@ public interface BussinessLocalTypeDao {
      *
      * @param action
      */
-    boolean selectPreInByOrderType(String action);
+    Boolean selectPreInByOrderType(String action);
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
index 5c05ae22..1ae2732c 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
@@ -671,7 +671,10 @@ public class OrderServiceImpl implements OrderService {
      * @return
      */
     private boolean isPreInOrder(OrderEntity orderEntity) {
-        return bussinessLocalTypeDao.selectPreInByOrderType(orderEntity.getAction());
+        Boolean isTrue = bussinessLocalTypeDao.selectPreInByOrderType(orderEntity.getAction());
+        if (isTrue == null)
+            return false;
+        return isTrue;
     }
 
     @Override
diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties
index e487e916..0f5d7b4c 100644
--- a/api-admin/src/main/resources/application.properties
+++ b/api-admin/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.profiles.active=dev
+spring.profiles.active=pro
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver