Browse Source

修改中心仓下的办公用品库出库申请流程

lwx_dev
erdanergou 3 years ago
parent
commit
ee8dd54a53
  1. 6
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  2. 6
      src/test/java/com/dreamchaser/depository_manage/SomeTest.java

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

@ -2505,8 +2505,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (flagForDepartmentHeadPass || flagForOpenDepository == 2) { if (flagForDepartmentHeadPass || flagForOpenDepository == 2) {
map.put("state", userByPort.getName() + "审核通过"); map.put("state", userByPort.getName() + "审核通过");
map.put("depositoryManagerPass", 4); map.put("depositoryManagerPass", 4);
String departmenthead = recordP.getDepartmenthead(); if ("0".equals(departmentheadTime)) {
if (departmenthead == null) {
map.put("departmenthead", userByPort.getId()); map.put("departmenthead", userByPort.getId());
map.put("departmentheadPass", 1); map.put("departmentheadPass", 1);
map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime));
@ -2522,8 +2521,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (flagForDepartmentHeadPass || flagForOpenDepository == 2) { if (flagForDepartmentHeadPass || flagForOpenDepository == 2) {
map.put("state", userByPort.getName() + "审核未通过"); map.put("state", userByPort.getName() + "审核未通过");
map.put("depositoryManagerPass", 4); map.put("depositoryManagerPass", 4);
String departmenthead = recordP.getDepartmenthead(); if ("0".equals(departmentheadTime)) {
if (departmenthead == null) {
map.put("departmentheadPass", 2); map.put("departmentheadPass", 2);
map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime));

6
src/test/java/com/dreamchaser/depository_manage/SomeTest.java

@ -243,7 +243,7 @@ public class SomeTest {
ApprovalInfo approvalInfo = new ApprovalInfo(); ApprovalInfo approvalInfo = new ApprovalInfo();
approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF"); approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF");
approvalInfo.setSpNo("202306080014"); approvalInfo.setSpNo("202306080008");
// 模拟第一个节点(部门负责人) // 模拟第一个节点(部门负责人)
@ -301,8 +301,8 @@ public class SomeTest {
spRecord_list.add(asr1); spRecord_list.add(asr1);
spRecord_list.add(asr2); // spRecord_list.add(asr2);
spRecord_list.add(asr3); // spRecord_list.add(asr3);
spRecord_list.add(asr4); spRecord_list.add(asr4);
approvalInfo.setSpRecord(spRecord_list); approvalInfo.setSpRecord(spRecord_list);

Loading…
Cancel
Save