From 3a59034076378b9c3e8e928ea433219f3fffaebe Mon Sep 17 00:00:00 2001
From: lsh <s>
Date: 星期四, 16 五月 2024 16:56:15 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/enums/RgvStatusType.java                   |    3 ++-
 src/main/java/com/zy/system/controller/LicenseCreatorController.java |    6 +++---
 src/main/java/com/zy/system/entity/license/LicenseCheckListener.java |    6 +++---
 src/main/java/com/zy/common/web/AuthController.java                  |   10 +++++-----
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java          |    9 +++++----
 src/main/resources/license.lic                                       |    0 
 src/main/resources/application.yml                                   |    2 +-
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 52ef0df..6726fec 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -296,8 +296,9 @@
                 if (rgvComplete){
                     rgvThread.setPakMk(true);
                 }
-                WrkMastSta wrkMastSta = wrkMastStaMapper.selectById(rgvProtocol.getTaskNo1());
-                if (!Cools.isEmpty(wrkMastSta)){
+                List<WrkMastSta> wrkMastStas = wrkMastStaMapper.selectList(new EntityWrapper<WrkMastSta>().eq("wrk_no", rgvProtocol.getTaskNo1()));
+                if (!Cools.isEmpty(wrkMastStas) || wrkMastStas.size()<=0){
+                    WrkMastSta wrkMastSta = wrkMastStas.get(0);
                     wrkMastSta.setWrkSts(3);
                     wrkMastStaMapper.updateById(wrkMastSta);
                 }
@@ -486,7 +487,7 @@
                 return;
             }
             // 鍙湁褰揜GV绌洪棽銆佽嚜鍔�,宸ヤ綅涓�鏃犵墿//rgv鍙敤
-            if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
+            if (rgvProtocol.getStatusType1() == RgvStatusType.IDLE
                     && rgvProtocol.getModeType() == RgvModeType.AUTO
                     && rgvProtocol.getLoaded1()==0
                     && rgvProtocol.getTaskNo1() == 0
@@ -494,7 +495,7 @@
             ) {
                 List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectList(new EntityWrapper<WrkMastSta>());
                 for (WrkMastSta wrkMastSta : wrkMastStaList){
-                    if (wrkMastSta.getType()!=0 || wrkMastSta.getWrkType()!=3){//1:婊$増   3锛氬彇鏀�
+                    if (wrkMastSta.getType()!=1 || wrkMastSta.getWrkType()!=3 || wrkMastSta.getWrkSts()!=0){//1:婊$増   3锛氬彇鏀�
                         continue;
                     }
                     boolean sign = rgvTakeFullAll(1, wrkMastSta); //鍛戒护涓嬪彂
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 9199bb5..fff96c3 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -54,11 +54,11 @@
     @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
     public R loginAction(String mobile, String password){
         //楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
-//        LicenseVerify licenseVerify = new LicenseVerify();
-//        boolean verify = licenseVerify.verify();
-//        if (!verify) {//璁稿彲璇佸凡澶辨晥
-//            return R.parse(CodeRes.SYSTEM_20001);
-//        }
+        LicenseVerify licenseVerify = new LicenseVerify();
+        boolean verify = licenseVerify.verify();
+        if (!verify) {//璁稿彲璇佸凡澶辨晥
+            return R.parse(CodeRes.SYSTEM_20001);
+        }
         if (mobile.equals("super") && password.equals(Cools.md5(superPwd))) {
             Map<String, Object> res = new HashMap<>();
             res.put("username", mobile);
diff --git a/src/main/java/com/zy/core/enums/RgvStatusType.java b/src/main/java/com/zy/core/enums/RgvStatusType.java
index 2e91757..4b481c5 100644
--- a/src/main/java/com/zy/core/enums/RgvStatusType.java
+++ b/src/main/java/com/zy/core/enums/RgvStatusType.java
@@ -14,7 +14,8 @@
     WAITING(90, "浠诲姟瀹屾垚绛夊緟WCS纭"),
     FETCHWAITING(91, "鍙栬揣浠诲姟瀹屾垚绛夊緟WCS纭"),
 
-    error(99,"鎶ヨ")
+    error(99,"鎶ヨ"),
+    error100(100,"鍏朵粬100")
     ;
 
 
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index 3d21663..1552807 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -61,9 +61,9 @@
      */
     @RequestMapping(value = "/getLicenseDays")
     public R getLicenseDays() {
-        if (true){
-            return R.ok().add(0);
-        }
+//        if (true){
+//            return R.ok().add(0);
+//        }
         LicenseVerify licenseVerify = new LicenseVerify();
         LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
         if (verifyInfo == null) {
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index 071ef11..126b337 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -79,12 +79,12 @@
 
                 LicenseVerify licenseVerify = new LicenseVerify();
                 //瀹夎璇佷功
-//                LicenseContent install = licenseVerify.install(param);
+                LicenseContent install = licenseVerify.install(param);
 
                 logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
 
-//                return install != null;
-                return true;
+                return install != null;
+//                return true;
             } catch (Exception e) {
                 return false;
             }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ecacb3e..eb980dd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -37,7 +37,7 @@
 
 #License鐩稿叧閰嶇疆
 license:
-  subject: ssdwcs
+  subject: ssdasrs
   publicAlias: publicCert
   storePass: public_zhongyang_123456789
   licensePath: license.lic
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index aaf53cc..b251114 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ

--
Gitblit v1.9.1