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 30e32eb2..de33c274 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 @@ -1735,7 +1735,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if(!flagForFirst){ // if (Integer.compare(361, maindeparment) == 0) { - // 如果是仓储中心负责人 String depositoryManagerTime = recordP.getDepositoryManagerTime(); if ("0".equals(depositoryManagerTime)) { @@ -1747,6 +1746,16 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("depositoryManagerTime", DateUtil.DateTimeToTimeStamp(simpleTime)); map.put("depositoryManager", userByPort.getId()); map.put("depositoryId", recordP.getDepositoryId()); + + // 获取部门负责人审批时间 + String departmentheadTime = recordP.getDepartmentheadTime(); + // 定义标志位为部门负责人已经审批 + boolean flagForDepartmentHeadPass = false; + if("0".equals(departmentheadTime)){ + // 如果没有审批 + flagForDepartmentHeadPass = true; + } + if ("2".equals(spStatus)) { // 如果点击的是通过 map.put("depositoryManagerPass", 1); @@ -1860,12 +1869,26 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 将主订单插入到redis中 redisTemplate.opsForHash().put("record:" + recordP.getId(), "minRecord", minRecordByMain.toString()); map.put("state", "仓储中心负责人审核通过"); - } else { + if(flagForDepartmentHeadPass){ + map.put("state", "部门负责人审核通过"); + map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); + map.put("departmenthead", userByPort.getId()); + map.put("departmentheadPass", 1); + } + + } + else { // 如果是不通过 updateInventoryForOutRefused(recordP); map.put("depositoryManagerPass", 2); map.put("pass", 2); map.put("state", "仓储中心负责人审核未通过"); + if(flagForDepartmentHeadPass){ + map.put("departmentheadPass", 2); + map.put("state", "部门负责人审核未通过"); + map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); + map.put("departmenthead", userByPort.getId()); + } } // 将当前redis中存储的spno删除 redisTemplate.delete(spNo); @@ -1898,7 +1921,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } QyWxUid.append("PangFuZhen" + ","); map.put("depositoryManager", depositoryManager.toString()); - } else { + } + else { // 如果点击的是驳回 updateInventoryForOutRefused(recordP); map.put("pass", 2); @@ -2060,8 +2084,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (departmentheadPass == 1) { result = "通过"; map.put("state", "待仓储中心负责人审核"); - - // 获取仓储中心详情 Administration company = LinkInterfaceUtil.getCompany(361, userToken); // 获取仓储中心负责人 @@ -2134,7 +2156,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1); } }).start(); - } else { + } + else { String result = ""; // 开启线程更改其他用户卡片模板样式 String simpleTime = DateUtil.getSimpleTime(new Date());