diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppYYDetailVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppYYDetailVo.java index 8bd84033..b700dabf 100644 --- a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppYYDetailVo.java +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppYYDetailVo.java @@ -116,8 +116,6 @@ public class VisitorsAppYYDetailVo { @Schema(description="随行人员集合") private List otherPeople; - - // @Schema(description="邀约id") // private Long yyId; diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java index 226cba0c..62e8a705 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java @@ -325,17 +325,33 @@ public class VisitorsServiceImpl extends ServiceImpl().eq(VisitorsEntity::getYyId,id)); + if (cancelVisitor != null){ + //发送短信 + +// sendVisitorCancelSms(visitorUser, cancelVisitor); + //取消邀约 + cancelVisitor.setCheckStatus(TaskCheckStatusEnum.CANCEL.getCode()); + baseMapper.updateById(cancelVisitor); + } + } return baseMapper.updateById(visitors); } @@ -432,7 +448,7 @@ public class VisitorsServiceImpl extends ServiceImpl finalItems = smErpInventoryRecordsItemMapper.selectList( + new LambdaQueryWrapper() + .eq(SmErpInventoryRecordsItemEntity::getInventoryId, inventoryRecordEditDTO.getId()) + ); + + // 计算新的总金额 + int newTotalAmount = finalItems.stream() + .mapToInt(item -> item.getTotalAmount() != null ? item.getTotalAmount() : 0) + .sum(); + + // 更新主表的totalAmount + SmErpInventoryRecordsEntity updateEntity = new SmErpInventoryRecordsEntity(); + updateEntity.setId(inventoryRecordEditDTO.getId()); + updateEntity.setTotalAmount(newTotalAmount); + baseMapper.updateById(updateEntity); + //todo 实际上应该审批后才会入库 //更新库存 smErpStockService.updateStock(updateStockDTOS); @@ -1268,4 +1284,7 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl(summaryMap.values()); } + + + } \ No newline at end of file