From fc0f37c183c6e2f289a125e42a2e71562c0b9395 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Mon, 8 Aug 2022 14:07:10 +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

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

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index 9acafaa..34dc4e0 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -60,10 +60,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
@@ -908,7 +905,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/sale/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java
index 4a53e3c..e3dcb86 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java
@@ -33,5 +33,5 @@ public interface BussinessLocalTypeDao {
      *
      * @param action
      */
-    boolean selectPreInByOrderType(String action);
+    Boolean selectPreInByOrderType(String action);
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
index af3381d..adde15f 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
@@ -635,7 +635,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;
     }
 
 }
diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties
index e7a43e4..47695ab 100644
--- a/api-admin/src/main/resources/application-dev.properties
+++ b/api-admin/src/main/resources/application-dev.properties
@@ -1,7 +1,7 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9906
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph2?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 #spring.datasource.password=123456