From b3b117424d3405190cf482f9236a40295ef2a447 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 11 三月 2025 15:11:39 +0800
Subject: [PATCH] #新增 1. 添加扩展字段 2. 添加扩展字段明细
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 7343d00..98dcfd3 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
@@ -13,6 +13,7 @@
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -56,6 +57,7 @@
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
@OperationLog("Create ASN鍗曟嵁")
@PostMapping("/asnOrder/save")
+ @ApiOperation("淇濆瓨")
public R save(@RequestBody AsnOrder asnOrder) {
asnOrder.setCreateBy(getLoginUserId());
asnOrder.setCreateTime(new Date());
@@ -70,6 +72,7 @@
@PreAuthorize("hasAuthority('manager:asnOrder:update')")
@OperationLog("Update ASN鍗曟嵁")
@PostMapping("/asnOrder/update")
+ @ApiOperation("鏇存柊")
public R update(@RequestBody AsnOrder asnOrder) {
asnOrder.setUpdateBy(getLoginUserId());
asnOrder.setUpdateTime(new Date());
@@ -91,6 +94,7 @@
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrder/query")
+ @ApiOperation("鏌ヨ")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<AsnOrder> wrapper = new LambdaQueryWrapper<>();
@@ -105,16 +109,28 @@
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrder/export")
+ @ApiOperation("瀵煎嚭")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
ExcelUtil.build(ExcelUtil.create(asnOrderService.list(), AsnOrder.class), response);
}
+ /**
+ * 璐ㄦ涓婃姤
+ * @param orders
+ * @return
+ */
@PostMapping("/asnOrder/inspect")
+ @ApiOperation("璐ㄦ涓婃姤")
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
- public R inspect(@RequestBody List<AsnOrder> orders) {
-
-
- return R.ok();
+ public R notifyInspect(@RequestBody List<AsnOrder> orders) {
+ if (orders.isEmpty()) {
+ return R.error("涓婃姤鍗曟嵁涓嶈兘涓虹┖!!");
+ }
+ if (asnOrderService.notifyInspect(orders)) {
+ return R.ok("璐ㄦ涓婃姤鎴愬姛锛侊紒");
+ } else {
+ return R.error("涓�閿笂鎶ュけ璐ワ紒锛�");
+ }
}
--
Gitblit v1.9.1