From a84a6544f9394c14ddd060735007268ae9b5acaf Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 2 Jul 2024 09:27:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=8B=E6=8C=81=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E4=B8=8E=E6=B8=85=E9=99=A4=E6=9A=82=E5=AD=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../b_lms/pda/controller/SlitterPdaController.java |  2 +-
 .../sch/tasks/slitter/service/SlitterService.java  |  2 +-
 .../slitter/service/impl/SlitterServiceImpl.java   | 14 ++++++++++----
 .../service/menu/impl/SysMenuServiceImpl.java      |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
index e2b0970db..ea6d5c7bf 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
@@ -81,7 +81,7 @@ public class SlitterPdaController {
     }
 
     @PostMapping("/toCleanCutCacheInventory")
-    @Log("清理分切缓存到内包间")
+    @Log("清理分切缓存")
     @SaIgnore
     public ResponseEntity<Object> toCleanCutCacheInventory(@RequestBody JSONObject param) {
         return new ResponseEntity<>(slitterDevices.toCleanCutCacheInventory(param), HttpStatus.OK);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
index a662e75e1..2d2f4513d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
@@ -142,7 +142,7 @@ public interface SlitterService {
     JSONArray getCutCacheAgvPoints();
 
     /**
-     * 清理分切缓存到内包间
+     * 清理分切缓
      * @param param /
      * @return /
      */
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index 9f1f907bd..e96daf720 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -1003,10 +1003,16 @@ public class SlitterServiceImpl implements SlitterService {
         }
         try {
             if (openLock) {
-                BstIvtCutpointivt agvCode = bcutpointivtService.getPintByAgvCode(pointCode, false);
-                agvCode.setQzz_no1("");
-                agvCode.setQzz_no2("");
-                agvCode.setPoint_status("1");
+                BstIvtCutpointivt agvCode = bcutpointivtService.getPintByTrussCode(pointCode, false);
+                if (agvCode.getTruss_point_code1().equals(pointCode)) {
+                    agvCode.setQzz_no1("");
+                }
+                if (agvCode.getTruss_point_code2().equals(pointCode)) {
+                    agvCode.setQzz_no2("");
+                }
+                if (ObjectUtil.isEmpty(agvCode.getQzz_no1()) && ObjectUtil.isEmpty(agvCode.getQzz_no2())) {
+                    agvCode.setPoint_status("1");
+                }
                 TaskUtils.updateOptMessageByBCutPoint(agvCode);
                 bcutpointivtService.updateById(agvCode);
             } else {
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
index d3590e2cd..02bab8ea9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
@@ -495,7 +495,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                 roleTree.add(row);
             }
             res.put("sonTree", roleTree);
-            result.put("rf_menu" + i, res);
+            result.put("rf_menu" + ("188".equals(res.getString("menu_id"))?1:0), res);
         }
 
         returnjo.put("code", "1");