wms / wms4_foshansanji · Commits

Commit e0ab99bf3cbc65f8d65396f7bf466de3f17d1d0e

Authored by 肖超群
1 parent 35ceab38

更新入库单详情删除的方法

Inline Side-by-side
Showing 1 changed file with 5 additions and 25 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @e0ab99b
1 1 package org.jeecg.modules.wms.receipt.receiptHeader.controller;
2 2  
3 3 import java.io.IOException;
4   -import java.util.ArrayList;
5 4 import java.util.Arrays;
6 5 import java.util.Collections;
7 6 import java.util.List;
... ... @@ -45,7 +44,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
45 44 import org.springframework.web.servlet.ModelAndView;
46 45  
47 46 import com.alibaba.fastjson.JSON;
48   -import com.aliyun.oss.ServiceException;import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  47 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
49 48 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
50 49 import com.baomidou.mybatisplus.core.metadata.IPage;
51 50 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
... ... @@ -255,27 +254,8 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
255 254 @DeleteMapping(value = "/deleteReceiptDetail")
256 255 @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情删除'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
257 256 public Result<String> deleteReceiptDetail(@RequestParam(name = "id", required = true) String id) {
258   - ReceiptDetail receiptDetail = receiptDetailService.getById(id);
259   - if (receiptDetail == null) {
260   - return Result.error("删除失败, 没有找到入库单详情");
261   - }
262   - ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
263   - if (receiptHeader == null) {
264   - return Result.error("删除失败, 没有找到入库单");
265   - }
266   - if (receiptHeader.getFirstStatus().intValue() != QuantityConstant.RECEIPT_HEADER_BUILD) {
267   - return Result.error("删除失败, 入库单必须是新建状态才能删除详情");
268   - }
269   - boolean success = receiptDetailService.removeById(id);
270   - if (!success) {
271   - throw new ServiceException("删除详情失败");
272   - }
273   - success = receiptHeaderService.updateReceiptHeader(receiptDetail.getReceiptId());
274   - if (!success) {
275   - throw new ServiceException("更新入库单头数量失败");
276   - }
277   - LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(Collections.singletonList(receiptDetail)));// 操作日志收集
278   - return Result.OK("删除成功!");
  257 + Result result = receiptDetailService.removeDetailById(id);
  258 + return result;
279 259 }
280 260  
281 261 /**
... ... @@ -288,8 +268,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
288 268 @RequiresPermissions("receiptDetail:deleteBatch")
289 269 @DeleteMapping(value = "/deleteBatchReceiptDetail")
290 270 public Result<String> deleteBatchReceiptDetail(@RequestParam(name = "ids", required = true) String ids) {
291   - this.receiptDetailService.removeByIds(Arrays.asList(ids.split(",")));
292   - return Result.OK("批量删除成功!");
  271 + Result result = receiptDetailService.removeDetailListById(Arrays.asList(ids.split(",")));
  272 + return result;
293 273 }
294 274  
295 275 /**
... ...