From 634748d87913a4e56ec80dffb9e3361a6e96676a Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 12 一月 2024 21:42:39 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/system/controller/LicenseCreatorController.java |    3 +++
 src/main/java/com/zy/system/entity/license/LicenseCheckListener.java |    4 ++--
 src/main/webapp/views/locMast/locMast_detail.html                    |   13 +++++++++++++
 src/main/java/com/zy/common/web/AuthController.java                  |   10 +++++-----
 src/main/java/com/zy/asrs/controller/LocMastController.java          |   12 ++++++++++++
 src/main/webapp/views/index.html                                     |    2 +-
 src/main/webapp/static/js/locMast/locMast.js                         |    1 +
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java          |    2 +-
 8 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 070ad5f..392ad72 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -109,6 +109,18 @@
 	@RequestMapping(value = "/locMast/update/auth")
 	@ManagerAuth(memo = "搴撲綅淇敼")
     public R update(LocMast locMast){
+        LocMast locMast1 = locMastService.selectById(locMast.getLocNo());
+        if (locMast.getLocType1()==0){
+            locMast.setLocType1(locMast1.getLocType1());
+        }
+        if (!locMast1.getLocType1().equals(locMast.getLocType1())){
+            if (locMast.getRow1()!=2){
+                return R.error("褰撳墠鎿嶄綔宸茶闃绘锛屽彧鍏佽绗簩鎺掑簱浣嶄慨鏀瑰簱浣嶇被鍨嬶紒锛侊紒");
+            }
+            if (locMast1.getLocType1()==1){
+                return R.error("褰撳墠鎿嶄綔宸茶闃绘锛屾祴璇曞簱浣嶇姝慨鏀瑰簱浣嶇被鍨嬶紒锛侊紒");
+            }
+        }
         if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
             return R.error();
         }
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 3157c1e..e673700 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -604,7 +604,7 @@
             matNew.setMatnr(param.getPackNo());
             matNew.setMaktx(param.getPackName());
             matNew.setManuDate(param.getRequestTime());
-            matNew.setDeadWarn(360);//6灏忔椂  360鍒嗛挓
+            matNew.setDeadWarn(1440);//6灏忔椂  360鍒嗛挓  24灏忔椂  1440鍒嗛挓
             matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
             matNew.setCreateTime(now);
             matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index c8bca4a..48cf254 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -51,11 +51,11 @@
     @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
     public R loginAction(String username, 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 (username.equals("super") && password.equals(Cools.md5(superPwd))) {
             Map<String, Object> res = new HashMap<>();
             res.put("username", username);
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index b8862a7..da5701a 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -69,6 +69,9 @@
      */
     @RequestMapping(value = "/getLicenseDays")
     public R getLicenseDays() {
+        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 1659df2..ca44056 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -79,11 +79,11 @@
 
                 LicenseVerify licenseVerify = new LicenseVerify();
                 //瀹夎璇佷功
-                LicenseContent install = licenseVerify.install(param);
+//                LicenseContent install = licenseVerify.install(param);
 
                 logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
 
-                return install != null;
+                return true;
             } catch (Exception e) {
                 return false;
             }
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index c596ee2..5e365cc 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -493,6 +493,7 @@
             pltType: $('#pltType').val(),
             ctnType: $('#ctnType').val(),
             locSts: $('#locSts').val(),
+            locType1: $('#loc_type1').val(),
             sheetNo: $('#sheetNo').val(),
             crnNo: $('#crnNo').val(),
             row1: $('#row1').val(),
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index d6a9479..beeeaa7 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -45,7 +45,7 @@
       <!--        <a ew-event="note" title="渚跨"><i class="layui-icon layui-icon-note"></i></a>-->
       <!--      </li>-->
       <li class="layui-nav-item" lay-unselect id="licenseShow" style="display: none;user-select: none;">
-        <div style="color: red;">璁稿彲璇佹湁鏁堟湡锛�<span id="licenseDays">29</span>澶�</div>
+<!--        <div style="color: red;">璁稿彲璇佹湁鏁堟湡锛�<span id="licenseDays">29</span>澶�</div>-->
       </li>
       <li class="layui-nav-item layui-hide-xs" lay-unselect>
         <a ew-event="fullScreen" title="鍏ㄥ睆"><i class="layui-icon layui-icon-screen-full"></i></a>
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index 44446f0..b820ecf 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -99,6 +99,19 @@
             </div>
         </div>
         <div class="layui-inline"  style="width:80%;">
+            <label class="layui-form-label"><span class="not-null">*</span>搴撲綅绫诲瀷锛�</label>
+            <div class="layui-input-inline">
+                <select id="loc_type1" class="layui-input" type="text">
+                    <!--                    <option style="display: none"></option>-->
+                    <option value="0">涓嶄慨鏀�</option>
+<!--                    <option value="1">寰呮祴</option>-->
+                    <option value="2">闈欑疆搴撲綅</option>
+                    <option value="3">娴嬭瘯鍓嶆殏瀛樺簱浣�</option>
+                    <option value="4">NG搴撲綅</option>
+                </select>
+            </div>
+        </div>
+        <div class="layui-inline"  style="width:80%;">
             <label class="layui-form-label"><span class="not-null">*</span>鍐荤粨鐘舵�侊細</label>
             <div class="layui-input-inline">
                 <select id="freeze" class="layui-input" type="text">

--
Gitblit v1.9.1