修改出库审批添加

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -2929,7 +2929,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 s = "PangFuZhen,";
                 qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1, userKey, token);
             });
-        } else {
+        }
+        else {
             String result = "";
             // 开启线程更改其他用户卡片模板样式
             String simpleTime = DateUtil.getSimpleTime(new Date());
@@ -3045,7 +3046,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         SendQyWxMessageThreadPool.execute(() -> {
                             JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token);
                         });
-                    } else {
+                    }
+                    else {
                         // 如果是通过仓库
 
 

src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java

@@ -1552,13 +1552,17 @@ public class QyWxOperationService {
             Integer depositoryId = recordMin.getDepositoryId();
             Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId);
 
+            if (Integer.compare(depositoryById.getParentId(), 0) != 0) {
+                // 如果不是
+                List<Depository> depositoryAll = depositoryMapper.findDepositoryAll();
+                depositoryById = findParentDepository(depositoryById, depositoryAll);
+            }
 
             if (!depositoryById.getDname().contains("前置仓")) {
                 // 如果不是前置仓下的仓库
                 flag = false;
             }
 
-
             if (!depositoryIdList.contains(depositoryId)) {
                 // 如果当前仓库列表中不存在该仓库id
                 depositoryIdList.add(depositoryId);
@@ -1660,14 +1664,6 @@ public class QyWxOperationService {
             detail_list_control_info_value_dname.put("text", depositoryById.getDname());
             detail_list_control_info_depositoryName.put("value", detail_list_control_info_value_dname);
 
-
-            if (Integer.compare(depositoryById.getParentId(), 0) != 0) {
-                // 如果不是
-                List<Depository> depositoryAll = depositoryMapper.findDepositoryAll();
-                depositoryById = findParentDepository(depositoryById, depositoryAll);
-            }
-
-
             // 物料规格型号
             Map<String, Object> detail_list_control_info_version = new HashMap<>();
             detail_list_control_info_version.put("control", "Text");
@@ -1768,7 +1764,8 @@ public class QyWxOperationService {
 
 
 
-        } else {
+        }
+        else {
             // 如果不是中心仓下的仓库
             if (Integer.compare(2, flagForOpenDepository) == 0) {
                 // 如果该仓库是通过开放仓库获取到的

src/main/resources/application-test.yml

@@ -59,7 +59,6 @@ spring:
     static-path-pattern: /static/**
   redis:
     port: 6379
-#    host: 36.133.126.182
     host: 127.0.0.1
     database: 5
     jedis:
@@ -74,7 +73,6 @@ spring:
 redisPool:
   port: 6379
   host: 127.0.0.1
-#  host: 36.133.126.182
   dbs: 5,14,15
   password: