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 d30c139..443c94e 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 @@ -144,8 +144,11 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec @RequiresPermissions("receiptHeader:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name = "id", required = true) String id) { - receiptHeaderService.delMain(id,QuantityConstant.WMS_DELETE_RECEIPT); - return Result.OK("删除成功!"); + boolean bool = receiptHeaderService.delMain(id, QuantityConstant.WMS_DELETE_RECEIPT); + if (!bool) { + return Result.error("删除失败"); + } + return Result.ok("删除成功"); } /** diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java index d0f2621..0a2ad01 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java @@ -70,12 +70,10 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl<ReceiptHeaderMapper, R throw new ServiceException("不能删除非新建状态单据"); } receiptHeaderHistoryService.saveById(id,reason); - boolean success = receiptDetailMapper.deleteByMainId(id); - if (!success) { - return success; - } + boolean success = receiptDetailMapper.deleteByMainId(id); success = removeById(id); + return success; } @@ -94,7 +92,7 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl<ReceiptHeaderMapper, R @Override @Transactional - @OperationLog(bizId = "#receiptHeader.getCode()", bizType = "'入库单据追踪'", tag = "'入库单生成'", + @OperationLog(bizId = "#receiptHeader.getCode()", bizType = "'入库单据追踪'", tag = "'入库单生成'", msg = "'上游单号:['+ #receiptHeader.getReferCode() + '],仓库编码:[' + #receiptHeader.getWarehouseCode() + ']'", operatorId = "#username", recordReturnValue = true) public Result<ReceiptHeader> saveReceiptHeader(ReceiptHeader receiptHeader) { LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();