单据删除问题，批次号大小写不匹配问题

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()))) {

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

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

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