diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java index 942c995cf..151054997 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java @@ -93,6 +93,21 @@ public class DummyInventoryInfoEOController extends JeroController acquireAdd(@Validated @RequestBody DummyInventoryInfoEO dummyInventoryInfoEO) { + dummyInventoryInfoEOService.acquireAdd(dummyInventoryInfoEO); + return Result.OK("添加成功!"); + } + /** * 编辑 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java index 6d12f1937..328f29093 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java @@ -25,6 +25,12 @@ public interface IDummyInventoryInfoEOService extends IService infoEOQueryWrapper = new QueryWrapper<>(); + List baseList = dummyInventoryBaseEOService.list(infoEOQueryWrapper.eq("id", dummyInventoryInfoEO.getDummyInventoryBaseId())); + if(CollectionUtils.isNotEmpty(baseList)){ + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getIds())){ + //要添加的虚拟清单 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(DummyInventoryInfoEO::getId, Arrays.asList(dummyInventoryInfoEO.getIds().split(","))); + List dummyInventoryInfoEOList = this.list(wrapper); + + //不需要验重,直接添加,此时可以存在多条编号一样的数据 + List list = new ArrayList<>(); + for (DummyInventoryInfoEO dummyInventoryInfoEOTemp : dummyInventoryInfoEOList) { + String id = UUID.randomUUID().toString().replace("-", ""); + dummyInventoryInfoEOTemp.setId(id); + dummyInventoryInfoEOTemp.setDummyInventoryBaseId(dummyInventoryInfoEO.getDummyInventoryBaseId()); + dummyInventoryInfoEOTemp.setCreateTime(new Date()); + dummyInventoryInfoEOTemp.setUpdateTime(new Date()); + list.add(dummyInventoryInfoEOTemp); + } + this.saveBatch(list); + //更新log + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String username = sysUser.getUsername(); + String serialNumber = list.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); + String contentLog = username+"向清单中添加了“"+serialNumber+"”"; + String enContentLog = username+" added “"+serialNumber+"” to the list."; + dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); + dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); + } + }else{ + if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ + throw new JeroBootException("该虚拟清单不存在,新增失败"); + }else{ + throw new JeroBootException("The virtual list does not exist, and adding failed."); + } + } + } /** * 更新