diff --git a/wms/src/main/java/com/cyl/wms/controller/ReceiptOrderController.java b/wms/src/main/java/com/cyl/wms/controller/ReceiptOrderController.java index 032e537..65cde8f 100644 --- a/wms/src/main/java/com/cyl/wms/controller/ReceiptOrderController.java +++ b/wms/src/main/java/com/cyl/wms/controller/ReceiptOrderController.java @@ -72,7 +72,11 @@ public class ReceiptOrderController extends BaseController { @Log(title = "入库单", businessType = BusinessType.INSERT) @PostMapping("add-or-update") public ResponseEntity addOrUpdate(@RequestBody ReceiptOrderForm receiptOrder) { - return ResponseEntity.ok(service.addOrUpdate(receiptOrder)); + if(receiptOrder.getId() == null ){ + return ResponseEntity.ok(service.add(receiptOrder)); + }else { + return ResponseEntity.ok(service.update(receiptOrder)); + } } @ApiOperation("修改入库单") diff --git a/wms/src/main/java/com/cyl/wms/service/ReceiptOrderService.java b/wms/src/main/java/com/cyl/wms/service/ReceiptOrderService.java index 7d0a081..c885444 100644 --- a/wms/src/main/java/com/cyl/wms/service/ReceiptOrderService.java +++ b/wms/src/main/java/com/cyl/wms/service/ReceiptOrderService.java @@ -144,26 +144,36 @@ public class ReceiptOrderService { } /** - * 新增或更新入库单以及入库明细 + * 新增入库单 * * @param receiptOrder 入库单 * @return 结果 */ @Transactional - public int addOrUpdate(ReceiptOrderForm receiptOrder) { + public int add(ReceiptOrderForm receiptOrder) { int res; // 1. 新增 - if (receiptOrder.getId() == null) { - receiptOrder.setDelFlag(0); - receiptOrder.setCreateTime(LocalDateTime.now()); - res = receiptOrderMapper.insert(receiptOrder); - saveDetails(receiptOrder.getId(), receiptOrder.getDetails()); - if(receiptOrder.getSupplierId()!=null && receiptOrder.getPayableAmount()!=null){ - //保存订单金额到供应商流水表 - saveOrUpdatePayAmount(receiptOrder); - } - return res; + receiptOrder.setDelFlag(0); + receiptOrder.setCreateTime(LocalDateTime.now()); + res = receiptOrderMapper.insert(receiptOrder); + saveDetails(receiptOrder.getId(), receiptOrder.getDetails()); + if(receiptOrder.getSupplierId()!=null && receiptOrder.getPayableAmount()!=null){ + //保存订单金额到供应商流水表 + saveOrUpdatePayAmount(receiptOrder); } + return res; + + } + + /** + * 更新入库单 + * + * @param receiptOrder 入库单 + * @return 结果 + */ + @Transactional + public int update(ReceiptOrderForm receiptOrder){ + int res; // 2. 编辑 QueryWrapper qw = new QueryWrapper<>(); qw.eq("receipt_order_id", receiptOrder.getId());