|
|
|
@ -180,6 +180,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
} |
|
|
|
// 修改入库数量扩大100倍
|
|
|
|
map.put("quantity", ObjectFormatUtil.toDouble(map.get("quantity")) * 100); |
|
|
|
log.info("插入入库申请数据:" + JSONObject.toJSONString(map)); |
|
|
|
return depositoryRecordMapper.insertApplicationInRecord(map); |
|
|
|
} |
|
|
|
|
|
|
|
@ -2520,8 +2521,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
// 将当前redis中存储的spno删除
|
|
|
|
redisPool.getRedisTemplateByDb(14).delete("wms_QyWxMessage_" + spNo); |
|
|
|
} |
|
|
|
} |
|
|
|
else { |
|
|
|
} else { |
|
|
|
// 如果是部门负责人
|
|
|
|
|
|
|
|
String departmentheadTime = recordP.getDepartmentheadTime(); |
|
|
|
@ -2637,6 +2637,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
@Override |
|
|
|
public void reviewByQyWxApprovalIn(String mainId, ApprovalInfo_Details approvalInfo_details, String userAgent, String spStatus, String spNo) { |
|
|
|
log.info("入库审批,企业微信端:" + mainId + approvalInfo_details + spNo); |
|
|
|
// 获取当前入库订单id
|
|
|
|
String[] split = mainId.replace("[", "").replace("]", "").split(","); |
|
|
|
// 获取分支审批人
|
|
|
|
@ -3371,6 +3372,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
@Override |
|
|
|
@Transactional |
|
|
|
public Integer reviewIn(Map<String, Object> map, Integer userId, UserByPort userToken, String userAgent) { |
|
|
|
log.info("入库申请审批,系统端数据:" + JSONObject.toJSON(map) + ";" + userId); |
|
|
|
Object id = map.get("id"); // 主订单编号
|
|
|
|
// 获取当前审批结果
|
|
|
|
Integer approverPass = ObjectFormatUtil.toInteger(map.get("approverPass")); |
|
|
|
@ -4376,7 +4378,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
} |
|
|
|
if (map.containsKey("depositoryId")) { |
|
|
|
depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); |
|
|
|
} else if (!map.containsKey("depositoryIdList")) { |
|
|
|
} else if (!map.containsKey("depositoryIdList")) { |
|
|
|
List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId()); |
|
|
|
depositoryAndRole.addAll(roleService.findDepositoryAndRole(userByPort.getPosition())); |
|
|
|
for (RoleAndDepository depository : depositoryAndRole |
|
|
|
|