From 5de7d78bc629f316749b9e11b9c6113d5e0d0b8f Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 27 三月 2025 11:20:23 +0800 Subject: [PATCH] 新增站点初始化功能 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java index 8453c56..a6e9503 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java @@ -10,6 +10,7 @@ import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; +import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.service.AsnOrderService; import com.vincent.rsf.server.system.constant.SerialRuleCode; @@ -54,6 +55,7 @@ } @PreAuthorize("hasAuthority('manager:asnOrder:list')") + @OperationLog("琛ㄥ崟鏌ヨ") @GetMapping("/asnOrder/{id}") public R get(@PathVariable("id") Long id) { return R.ok().add(asnOrderService.getById(id)); @@ -150,13 +152,14 @@ return R.ok(asnOrderService.getListByMatnr(params)); } - @PostMapping("/asnOrder/generate/barcode") - @ApiOperation("鐢熸垚ASN鏍囩") - @PreAuthorize("hasAuthority('manager:asnOrder:list')") - public R generateBarcode(@RequestBody List<AsnOrder> orders) { - if (orders.isEmpty()) { - return R.error("鍗曟嵁涓嶈兘涓虹┖!!"); + + @PostMapping("/asnOrder/items/save") + @ApiOperation("淇濆瓨涓诲崟鍙婃槑缁�") + @PreAuthorize("hasAuthority('manager:asnOrder:save')") + public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) { + if (Objects.isNull(params)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); } - return asnOrderService.generateBarcode(orders); + return asnOrderService.saveOrderAndItems(params); } } -- Gitblit v1.9.1