Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java

@@ -9,6 +9,7 @@ import com.glxp.api.constant.RedissonCacheKey;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.collect.RelCodeBatch;
 import com.glxp.api.req.collect.RelCodeBatchRequest;
+import com.glxp.api.req.collect.RelCodeDetailRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.collect.RelCodeBatchResponse;
 import com.glxp.api.service.collect.RelCodeBatchService;
@@ -95,4 +96,19 @@ public class RelCodeBatchController extends BaseController {
         return ResultVOUtils.success("修改成功！");
     }
 
+
+
+    @GetMapping("/udiwms/relCode/batch/deleteDetail")
+    public BaseResponse deleteDetail(@RequestParam("curCode") String curCode) {
+        relCodeBatchService.deleteDetail(curCode);
+        return ResultVOUtils.success("删除成功");
+    }
+
+
+    @PostMapping("/udiwms/relCode/batch/deleteAllDetail")
+    public BaseResponse deleteAllDetail(@RequestBody List<RelCodeDetailRequest> detailList) {
+        relCodeBatchService.deleteAllDetail(detailList);
+        return ResultVOUtils.success("清空成功");
+    }
+
 }

src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java

@@ -6,6 +6,7 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.XmlUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.collect.RelCodeDetail;
@@ -36,6 +37,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -200,4 +202,24 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
             this.add(item);
         });
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteDetail(String curCode) {
+        List<RelCodeDetail> list = relCodeDetailService.list(new LambdaQueryWrapper<RelCodeDetail>().eq(RelCodeDetail::getParentCode, curCode));
+        if (CollUtil.isNotEmpty(list)){
+            List<Integer> batchIds = list.stream().map(RelCodeDetail::getBatchIdFk).collect(Collectors.toList());
+            this.removeBatchByIds(batchIds);
+            relCodeDetailService.remove(new LambdaQueryWrapper<RelCodeDetail>().in(RelCodeDetail::getBatchIdFk,batchIds));
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteAllDetail(List<RelCodeDetailRequest> detailList) {
+        if (CollUtil.isNotEmpty(detailList)){
+            detailList.forEach( item -> {
+                String curCode = item.getCurCode();
+                this.deleteDetail(curCode);
+            });
+        }
+    }
 }