From d15b0f016c957c955393f576dec5f72bba93f300 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 25 Mar 2024 14:01:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=8B=E6=8C=81=E4=B8=80=E4=BA=8C?=
 =?UTF-8?q?=E6=9C=9F=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StIvtIostorinvOutServiceImpl.java    |  4 +--
 .../util/impl/InBoxManageServiceImpl.java     |  2 +-
 .../util/impl/OutBoxManageServiceImpl.java    |  2 +-
 .../impl/OutVehicleManageServiceImpl.java     |  2 +-
 .../service/menu/impl/SysMenuServiceImpl.java | 35 ++++++++++++-------
 .../service/impl/ProductScrapServiceImpl.java |  1 +
 6 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index 0ca4dbb4c..1a5b45147 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -263,7 +263,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void manualDiv(JSONObject whereJson) {
         StIvtIostorinv mstDao = this.getById(whereJson.getJSONObject("row").getString("iostorinv_id"));
 
@@ -361,7 +361,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void cancelDiv(JSONObject whereJson) {
         // 任务表
         WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
index 09f641238..114442cb8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
@@ -62,7 +62,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
     private final IschBaseTaskService ischBaseTaskService;
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void inBox(JSONObject whereJson) {
         /*
          * 1.找木箱区的一个仓位
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
index 3234ab2a7..d799d59b1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
@@ -62,7 +62,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
     private IschBaseTaskService ischBaseTaskService;
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void outBox(JSONObject whereJson) {
         /*
          * 1.找到符合条件的空木箱
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java
index 35d24b051..2300279ac 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java
@@ -53,7 +53,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
     private IschBaseTaskService ischBaseTaskService;
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void outVehicle(JSONObject whereJson) {
         /*
          *  1.找到相同托盘类型的最多的巷道
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 5f7236173..d3590e2cd 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
@@ -461,9 +461,14 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         return null;
     }
 
+    /**
+     * 需要区分一期二期
+     * @param param
+     * @return
+     */
     @Override
     public Map<String, Object> queryAuthority(Map<String, String> param) {
-        String accountId = "1";
+        String accountId = SecurityUtils.getCurrentUserId();
         JSONObject returnjo = new JSONObject();
         if (StrUtil.isEmpty(accountId)) {
             returnjo.put("code", "0");
@@ -475,19 +480,23 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         if(ObjectUtil.isEmpty(pa)){
             throw new BadRequestException("当前用户无菜单权限！");
         }
-        JSONObject result = pa.getJSONObject(0);
-        //查询二级
-        JSONArray SecondResults = baseMapper.queryPdaAuthority(accountId, "1", null);
-        //查询三级
-        JSONArray roleTree = new JSONArray();
-        for (int i = 0; i < SecondResults.size(); i++) {
-            JSONObject row = SecondResults.getJSONObject(i);
-            String menu_id = row.getString("menu_id");
-            JSONArray ThirdResults = baseMapper.queryPdaAuthority(accountId, "2", menu_id);
-            row.put("sonTree", ThirdResults);
-            roleTree.add(row);
+        JSONObject result = new JSONObject();
+        for (int i = 0; i < pa.size(); i++) {
+            JSONObject res = pa.getJSONObject(i);
+            //查询二级
+            JSONArray secondResults = baseMapper.queryPdaAuthority(accountId, "1", res.getString("menu_id"));
+            //查询三级
+            JSONArray roleTree = new JSONArray();
+            for (int j = 0; j < secondResults.size(); j++) {
+                JSONObject row = secondResults.getJSONObject(j);
+                String menu_id = row.getString("menu_id");
+                JSONArray ThirdResults = baseMapper.queryPdaAuthority(accountId, "2", menu_id);
+                row.put("sonTree", ThirdResults);
+                roleTree.add(row);
+            }
+            res.put("sonTree", roleTree);
+            result.put("rf_menu" + i, res);
         }
-         result.put("sonTree", roleTree);
 
         returnjo.put("code", "1");
         returnjo.put("desc", "查询成功！");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
index 41f6bb5c1..e76da3093 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
@@ -443,6 +443,7 @@ public class ProductScrapServiceImpl implements ProductScrapService {
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("ext_code", result.getString("RTDAT"));
+        // 单据状态改变 10(生成) -> 20（审核）
         jsonObject.put("bill_status", "20");
         mst.update(jsonObject, "scrap_id = '" + whereJson.getString("scrap_id") + "'");