From 619e78ac55a3cd6af221244578742b5710157726 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 5 Dec 2022 10:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E8=B0=83?=
 =?UTF-8?q?=E5=8F=96=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DummyInventoryInfoEOController.java       | 15 ++++++
 .../service/IDummyInventoryInfoEOService.java |  6 +++
 .../impl/DummyInventoryInfoEOServiceImpl.java | 47 +++++++++++++++++++
 3 files changed, 68 insertions(+)

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<DummyInventor
 		return Result.OK("添加成功！");
 	}
 
+	/**
+	 *  虚拟清单调取虚拟清单添加数据
+	 *
+	 * @param dummyInventoryInfoEO
+	 * @return
+	 */
+	@AutoLog(value = "虚拟清单调取虚拟清单添加数据")
+	@ApiOperation(value="虚拟清单调取虚拟清单添加数据", notes="虚拟清单调取虚拟清单添加数据")
+	@PostMapping(value = "/acquireAdd")
+//	@RequiresPermissions("dummyInventoryInfo:acquire")
+	public Result<?> 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<DummyInventoryInf
 	 */
     void add(DummyInventoryInfoEO dummyInventoryInfoEO);
 
+	/**
+	 * 虚拟清单调取虚拟清单添加数据
+	 * @param dummyInventoryInfoEO
+	 */
+	void acquireAdd(DummyInventoryInfoEO dummyInventoryInfoEO);
+
 	/**
 	 * 更新
 	 *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 0c95df461..29d6eabc9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -177,6 +177,53 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			}
 		}
 	}
+	/**
+	 * 虚拟清单调取虚拟清单添加数据
+	 * @param dummyInventoryInfoEO
+	 * @return
+	 */
+	@Override
+	public void acquireAdd(DummyInventoryInfoEO dummyInventoryInfoEO) {
+//		dummyInventoryInfoEO.setIds("efd66ed0a8414fd0b3afd1cf3e4365e6,e13a1e992d774046b3770376583642b7");
+
+		//检查虚拟清单是否存在
+		QueryWrapper<DummyInventoryBaseEO> infoEOQueryWrapper = new QueryWrapper<>();
+		List<DummyInventoryBaseEO> baseList = dummyInventoryBaseEOService.list(infoEOQueryWrapper.eq("id", dummyInventoryInfoEO.getDummyInventoryBaseId()));
+		if(CollectionUtils.isNotEmpty(baseList)){
+			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getIds())){
+				//要添加的虚拟清单
+				LambdaQueryWrapper<DummyInventoryInfoEO> wrapper = new LambdaQueryWrapper<>();
+				wrapper.in(DummyInventoryInfoEO::getId, Arrays.asList(dummyInventoryInfoEO.getIds().split(",")));
+				List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(wrapper);
+
+				//不需要验重，直接添加，此时可以存在多条编号一样的数据
+				List<DummyInventoryInfoEO> 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.");
+			}
+		}
+	}
 
 	/**
 	 * 更新