diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
index b69b3c2c..0745f4a1 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -2375,6 +2375,7 @@ public class PageController {
if (id != null) {
// 获取出库主单
ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(id);
+
// 获取当前仓库是否为开放仓库
mv.addObject("depositoryManagerText", "负责人");
diff --git a/src/main/resources/templates/pages/application/application-review.html b/src/main/resources/templates/pages/application/application-review.html
index 401d3cc2..72bfb454 100644
--- a/src/main/resources/templates/pages/application/application-review.html
+++ b/src/main/resources/templates/pages/application/application-review.html
@@ -35,6 +35,10 @@
123456 |
123456 |
+
+ | 出库业务类型 |
+ 备注 |
+
| 物料名称 |
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 e2ea2f91..ca295d9d 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
@@ -35,6 +35,10 @@
| 申请编号 |
123456 |
+
+ | 出库业务类型 |
+ 备注 |
+
| 物料名称 |
@@ -93,6 +97,7 @@
申请备注 |
+
| 负责人 |
部门负责人 |
diff --git a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java
index c31d4046..3336eab0 100644
--- a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java
+++ b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java
@@ -62,7 +62,11 @@ public class SomeTest {
// 定义已完成审批的节点数
- int approval_count = 0;
+ int approval_complete_count = 0;
+
+
+ // 定义当前审批流程的节点总数
+ int approval_count = spRecord_list.size();
// 获取审批申请状态变化类型:1-提单;2-同意;3-驳回;4-转审;5-催办;6-撤销;8-通过后撤销;10-添加备注
String spStatus = approvalInfo.getStatuChangeEvent();
@@ -97,7 +101,7 @@ public class SomeTest {
// 设置当前审批的状态
ad_SpStatus = ad.getSpStatus();
// 已审批节点数+1
- approval_count++;
+ approval_complete_count++;
break;
}
}
@@ -177,9 +181,10 @@ public class SomeTest {
}
- if (!flagForLabel) {
- // 如果第二个节点不是标签节点
- if (approval_count > 1) {
+ if (!flagForLabel && approval_count < 3) {
+ // 如果第二个节点不是标签节点且总节点数小于3个
+
+ if (approval_complete_count > 1) {
// 如果完成审批的节点数大于1
flagForDepository = 3;
@@ -192,7 +197,7 @@ public class SomeTest {
} else {
// 如果第二个节点是标签节点
- if (approval_count > 2) {
+ if (approval_complete_count > 2) {
// 如果完成审批的节点数大于2
flagForDepository = 3;
// 如果已经完成该审批记录,则进行删除
@@ -244,7 +249,7 @@ public class SomeTest {
ApprovalInfo approvalInfo = new ApprovalInfo();
approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF");
- approvalInfo.setSpNo("202306090040");
+ approvalInfo.setSpNo("202306120006");
// 模拟第一个节点(部门负责人)
@@ -254,7 +259,7 @@ public class SomeTest {
List approvalInfo_Details1 = new ArrayList<>();
ApprovalInfo_Details ad1 = new ApprovalInfo_Details();
ad1.setSpStatus("2");
- ad1.setSpTime("1686300314000");
+ ad1.setSpTime("1686530528000");
ApprovalInfo_Details_Approver approver1 = new ApprovalInfo_Details_Approver();
approver1.setUserId("PangFuZhen");
ad1.setApprover(approver1);
@@ -276,11 +281,11 @@ public class SomeTest {
// 模拟第三个节点(综合办负责人)(仓储负责人)
ApprovalInfo_SpRecord asr3 = new ApprovalInfo_SpRecord();
- asr3.setSpStatus("1");
+ asr3.setSpStatus("2");
List approvalInfo_Details3 = new ArrayList<>();
ApprovalInfo_Details ad3 = new ApprovalInfo_Details();
- ad3.setSpStatus("1");
- ad3.setSpTime("0");
+ ad3.setSpStatus("2");
+ ad3.setSpTime("1686530628000");
ApprovalInfo_Details_Approver approver3 = new ApprovalInfo_Details_Approver();
approver3.setUserId("KaiXinGuo");
ad3.setApprover(approver3);
diff --git a/target/classes/templates/pages/application/application-review.html b/target/classes/templates/pages/application/application-review.html
index 401d3cc2..72bfb454 100644
--- a/target/classes/templates/pages/application/application-review.html
+++ b/target/classes/templates/pages/application/application-review.html
@@ -35,6 +35,10 @@
123456 |
123456 |
+
+ | 出库业务类型 |
+ 备注 |
+
| 物料名称 |
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 e2ea2f91..ca295d9d 100644
--- a/target/classes/templates/pages/application/form-step-look_back.html
+++ b/target/classes/templates/pages/application/form-step-look_back.html
@@ -35,6 +35,10 @@
| 申请编号 |
123456 |
+
+ | 出库业务类型 |
+ 备注 |
+
| 物料名称 |
@@ -93,6 +97,7 @@
申请备注 |
+
| 负责人 |
部门负责人 |