From 1d91554175b08b97566d99888cb3e71086ea4ea3 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Thu, 8 Jun 2023 15:20:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=BF=83=E4=BB=93?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E5=8A=9E=E5=85=AC=E7=94=A8=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=E7=AB=AF?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DepositoryRecordController.java              | 6 +++++-
 .../service/impl/DepositoryRecordServiceImpl.java           | 3 +++
 .../templates/pages/application/form-step-look_back.html    | 2 +-
 .../templates/pages/application/form-step-look_back.html    | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
index 4e218836..1d9e83d1 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
@@ -1685,7 +1685,8 @@ public class DepositoryRecordController {
                 }
             });
 
-        } else if ("out".equals(type)) {
+        }
+        else if ("out".equals(type)) {
             // 获取部门负责人
             List<UserByPort> departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken);
             StringBuilder departmentHeadId = new StringBuilder();
@@ -1976,6 +1977,7 @@ public class DepositoryRecordController {
                 Integer integer = ObjectFormatUtil.toInteger(o);
                 sumQuantity += integer;
             }
+
             // 获取部门负责人
             List<UserByPort> departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken);
             StringBuilder departmentHeadId = new StringBuilder();
@@ -1997,6 +1999,8 @@ public class DepositoryRecordController {
             mainRecord.put("adminorgId", userToken.getMaindeparment());
             mainRecord.put("createUid", userToken.getId());
             mainRecord.put("flagForAgency", 2);
+            mainRecord.put("depositoryId",depositoryIds.get(0));
+
             // 插入主表
             depositoryRecordService.insertApplicationOutRecord(mainRecord, userToken, userkey, usertoken);
             id = ObjectFormatUtil.toInteger(mainRecord.get("id"));
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index 5b3c6e9b..315c4cb4 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -3019,6 +3019,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
                 // 如果是开放仓库
                 flagForHasOtherDepository = false;
+
+
+
             } else {
                 // 如果不是
                 for (ApplicationOutRecordMin min : minByParent
diff --git a/src/main/resources/templates/pages/application/form-step-look_back.html b/src/main/resources/templates/pages/application/form-step-look_back.html
index 50b7dadc..e2ea2f91 100644
--- a/src/main/resources/templates/pages/application/form-step-look_back.html
+++ b/src/main/resources/templates/pages/application/form-step-look_back.html
@@ -207,7 +207,7 @@
             $("#departmentheadMessageT").show();
         }
 
-        if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "") {
+        if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") {
             // 如果部门负责人已经审批过
             $("#depositoryManagerNameT").show();
         } else if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster !== "") {
diff --git a/target/classes/templates/pages/application/form-step-look_back.html b/target/classes/templates/pages/application/form-step-look_back.html
index 50b7dadc..e2ea2f91 100644
--- a/target/classes/templates/pages/application/form-step-look_back.html
+++ b/target/classes/templates/pages/application/form-step-look_back.html
@@ -207,7 +207,7 @@
             $("#departmentheadMessageT").show();
         }
 
-        if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "") {
+        if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") {
             // 如果部门负责人已经审批过
             $("#depositoryManagerNameT").show();
         } else if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster !== "") {