From 58270402a93c8ad2742e00408cf6bbc54c75898c Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 09 五月 2025 17:43:30 +0800
Subject: [PATCH] 1.借用部件(可批量) 修改接口
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java | 8 +++++++-
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ComponentInfoController.java | 4 ++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ComponentInfoController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ComponentInfoController.java
index 6bc4abe..4b10371 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ComponentInfoController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ComponentInfoController.java
@@ -78,8 +78,8 @@
@AutoLog(value = "鍊熺敤閮ㄤ欢(鍙壒閲�)")
@ApiOperation(value = "鍊熺敤閮ㄤ欢(鍙壒閲�)", notes = "鍊熺敤閮ㄤ欢(鍙壒閲�)")
- @PostMapping("/borrow")
- public Result<?> borrowComponent(@RequestParam("oldId") String oldId, @RequestParam("newIds") String newIds) {
+ @GetMapping("/borrow")
+ public Result<?> borrowComponent(String oldId, String newIds) {
return componentInfoService.borrowComponent(oldId,newIds);
}
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
index 986a593..96d8f04 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
@@ -608,13 +608,14 @@
//鏉冮檺鎺掗櫎,涓嶈兘寮曠敤鑷繁涓婁笅绾ч儴浠�
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String productIds = loginUser.getProductionIds();
+ ComponentInfo oldComponentInfo = super.getById(componentInfo.getComponentId());
IPage<ComponentInfo> page = new Page<>(pageNo, pageSize);
if (productIds != null && !productIds.isEmpty()) {
List<String> productIdList = Arrays.asList(productIds.split(","));
List<ProductMix> productMixList = permissionStreamNewService.
loadProductMixByBusinessIdAndBusinessType(loginUser.getId(),productIdList,componentInfo.getComponentId(),"2");
List<Long> ids = productMixList.stream().map(ProductMix::getId).collect(Collectors.toList());
- //鑾峰彇宸茬粡琚�熺敤鐨勯儴浠�
+ //鑾峰彇宸茬粡鑷韩琚�熺敤鐨勯儴浠�
LambdaQueryWrapper<ComponentInfo> borrowQueryWrapper = new LambdaQueryWrapper<>();
borrowQueryWrapper.in(ComponentInfo::getBorrowId,ids);
borrowQueryWrapper.eq(ComponentInfo::getParentId,componentInfo.getComponentId());
@@ -624,6 +625,7 @@
queryWrapper.like(StrUtil.isNotEmpty(componentInfo.getComponentCode()),ComponentInfo::getComponentCode, componentInfo.getComponentCode());
queryWrapper.isNull(ComponentInfo::getBorrowId);
queryWrapper.in(ComponentInfo::getComponentId,ids);
+ queryWrapper.ne(StrUtil.isNotEmpty(oldComponentInfo.getBorrowId()),ComponentInfo::getComponentId,oldComponentInfo.getBorrowId());
if (!borrowIds.isEmpty()) {
queryWrapper.notIn(ComponentInfo::getComponentId,borrowIds);
}
@@ -678,6 +680,10 @@
newComponentInfo.setProductId(componentInfo.getProductId());
newComponentInfo.setParentId(componentInfo.getComponentId());
newComponentInfo.setBorrowId(item.getComponentId());
+ newComponentInfo.setCreateTime(null);
+ newComponentInfo.setCreateBy(null);
+ newComponentInfo.setUpdateTime(null);
+ newComponentInfo.setUpdateBy(null);
addComponentInfo(newComponentInfo);
});
return Result.ok("閮ㄤ欢鍊熺敤鎴愬姛");
--
Gitblit v1.9.3