From 6c5edf41ef56af07e6e3baa25f77759ecaf8f68c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 09 四月 2025 15:41:50 +0800
Subject: [PATCH] 任务列表界面优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 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 0f8d3ec..2e9e296 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
@@ -11,6 +11,7 @@
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.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -147,29 +148,66 @@
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
public R getListByMatnr(@RequestBody Map<String, String> params){
if (Objects.isNull(params)) {
- throw new CoolException("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
+ return R.error("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
}
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("鍗曟嵁涓嶈兘涓虹┖!!");
- }
- return asnOrderService.generateBarcode(orders);
}
@PostMapping("/asnOrder/items/save")
@ApiOperation("淇濆瓨涓诲崟鍙婃槑缁�")
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
- public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) {
+ public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) throws Exception {
if (Objects.isNull(params)) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return asnOrderService.saveOrderAndItems(params);
+ return asnOrderService.saveOrderAndItems(params, getLoginUserId());
}
+
+ @ApiOperation("鍗曟嵁淇℃伅淇敼")
+ @PostMapping("/asnOrder/items/update")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ public R orderAndrItemUpdate(@RequestBody AsnOrderAndItemsParams params) throws Exception {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return asnOrderService.updateOrderItem(params, getLoginUserId());
+ }
+
+ @ApiOperation("鍗曟嵁鎵归噺淇敼")
+ @PostMapping("/asnOrder/batch/update")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ public R batchUpdate(@RequestBody BatchUpdateParam params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getOrder())) {
+ return R.error("淇敼鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
+ return R.error("淇敼ID涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok(asnOrderService.batchUpdate(params, getLoginUserId()));
+ }
+
+ @ApiOperation("涓�閿敹璐�")
+ @PostMapping("/asnOrder/complete/{id}")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ public R completeOrder(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return asnOrderService.completeOrder(id, getLoginUserId());
+ }
+
+ @ApiOperation("鍏抽棴鏀惰揣鍗�")
+ @PostMapping("/asnOrder/close/{id}")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ public R closeOrder(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return asnOrderService.closeOrder(id);
+ }
+
}
--
Gitblit v1.9.1