From e0ab99bf3cbc65f8d65396f7bf466de3f17d1d0e Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Mon, 27 Feb 2023 14:37:47 +0800
Subject: [PATCH] 更新入库单详情删除的方法
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java | 30 +++++-------------------------
1 file changed, 5 insertions(+), 25 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
index 068110a..96d4ba4 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
@@ -1,7 +1,6 @@
package org.jeecg.modules.wms.receipt.receiptHeader.controller;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -45,7 +44,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
-import com.aliyun.oss.ServiceException;import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -255,27 +254,8 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
@DeleteMapping(value = "/deleteReceiptDetail")
@OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情删除'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
public Result<String> deleteReceiptDetail(@RequestParam(name = "id", required = true) String id) {
- ReceiptDetail receiptDetail = receiptDetailService.getById(id);
- if (receiptDetail == null) {
- return Result.error("删除失败, 没有找到入库单详情");
- }
- ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
- if (receiptHeader == null) {
- return Result.error("删除失败, 没有找到入库单");
- }
- if (receiptHeader.getFirstStatus().intValue() != QuantityConstant.RECEIPT_HEADER_BUILD) {
- return Result.error("删除失败, 入库单必须是新建状态才能删除详情");
- }
- boolean success = receiptDetailService.removeById(id);
- if (!success) {
- throw new ServiceException("删除详情失败");
- }
- success = receiptHeaderService.updateReceiptHeader(receiptDetail.getReceiptId());
- if (!success) {
- throw new ServiceException("更新入库单头数量失败");
- }
- LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(Collections.singletonList(receiptDetail)));// 操作日志收集
- return Result.OK("删除成功!");
+ Result result = receiptDetailService.removeDetailById(id);
+ return result;
}
/**
@@ -288,8 +268,8 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
@RequiresPermissions("receiptDetail:deleteBatch")
@DeleteMapping(value = "/deleteBatchReceiptDetail")
public Result<String> deleteBatchReceiptDetail(@RequestParam(name = "ids", required = true) String ids) {
- this.receiptDetailService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("批量删除成功!");
+ Result result = receiptDetailService.removeDetailListById(Arrays.asList(ids.split(",")));
+ return result;
}
/**
--
libgit2 0.22.2