From 1f7ecc91a42a8fa1984aa3b0c7ffe4b05dbee560 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 29 五月 2025 15:32:05 +0800
Subject: [PATCH] 必须填写批号

---
 src/main/java/com/zy/common/config/AdminInterceptor.java      |    4 ++--
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    3 +++
 src/main/resources/application.yml                            |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 5ba2491..bf83a51 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -100,6 +100,9 @@
         if (param.getCombMats().size()>1){
             throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
         }
+        if(Cools.isEmpty(param.getCombMats().get(0).getBatch())){
+            throw new CoolException("鎵瑰彿锛堝敮涓�鐮侊級涓嶈兘涓虹┖===>>" + param.getBarcode());
+        }
 
         int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
         int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 547ba96..320c631 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -119,8 +119,8 @@
             User user = userService.selectById(userLogin.getUserId());
 //            String deToken = Cools.deTokn(token, user.getPassword());
 //            long timestamp = Long.parseLong(deToken.substring(0, 13));
-            // 15鍒嗛挓鍚庤繃鏈�
-            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
+            // 180鍒嗛挓鍚庤繃鏈�
+            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 10800000){
                 Http.response(response, BaseRes.DENIED);
                 return false;
             }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f2f6d21..9d0d342 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
     enabled: false
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://127.0.0.1:50948;databasename=wzjaasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=wzjaasrs
     username: sa
     password: sa@123
   mvc:

--
Gitblit v1.9.1