Commit 211ef71a authored by Smile's avatar Smile

创建集运订单默认申请验货为未申请

parent d8c4ed1c
...@@ -189,6 +189,7 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme ...@@ -189,6 +189,7 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
cons.setConsNum(consNum); cons.setConsNum(consNum);
cons.setStatus(0); cons.setStatus(0);
cons.setNeedInspect(0); cons.setNeedInspect(0);
cons.setInspectStatus(0);
consMapper.insert(cons); consMapper.insert(cons);
if (createReqVO.getConsItemVOList() != null && !createReqVO.getConsItemVOList().isEmpty()) { if (createReqVO.getConsItemVOList() != null && !createReqVO.getConsItemVOList().isEmpty()) {
createReqVO.getConsItemVOList().forEach(consItemVO -> { createReqVO.getConsItemVOList().forEach(consItemVO -> {
...@@ -457,6 +458,9 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme ...@@ -457,6 +458,9 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
List<ConsBackVO> consBackS = consMapper.myConsPageList(start, size, query); List<ConsBackVO> consBackS = consMapper.myConsPageList(start, size, query);
consBackS.removeAll(Collections.singleton(null)); consBackS.removeAll(Collections.singleton(null));
List<Long> consIds = consBackS.stream().map(ConsBackVO::getId).collect(Collectors.toList()); List<Long> consIds = consBackS.stream().map(ConsBackVO::getId).collect(Collectors.toList());
if (consIds.isEmpty()){
return new PageResult<>(Collections.emptyList(), total, mpPage.getSize(), page.getPage(), (total + mpPage.getSize() - 1) / mpPage.getSize());
}
List<ConsExceptionDO> consExceptionS = consExceptionService.selectList(ConsExceptionDO::getConsId, consIds); List<ConsExceptionDO> consExceptionS = consExceptionService.selectList(ConsExceptionDO::getConsId, consIds);
List<ConsApprovalDO> consApprovalS = consApprovalService.selectList(ConsApprovalDO::getConsId, consIds); List<ConsApprovalDO> consApprovalS = consApprovalService.selectList(ConsApprovalDO::getConsId, consIds);
List<ConsSpecialNeedDO> consSpecialNeeds = consSpecialNeedService.selectList(ConsSpecialNeedDO::getConsId, consIds); List<ConsSpecialNeedDO> consSpecialNeeds = consSpecialNeedService.selectList(ConsSpecialNeedDO::getConsId, consIds);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment