From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java |   73 +++++++++++++++++++++++++++++++++---
 1 files changed, 67 insertions(+), 6 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 51fb9d5..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
@@ -10,6 +10,8 @@
 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.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;
@@ -54,6 +56,7 @@
     }
 
     @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+    @OperationLog("琛ㄥ崟鏌ヨ")
     @GetMapping("/asnOrder/{id}")
     public R get(@PathVariable("id") Long id) {
         return R.ok().add(asnOrderService.getById(id));
@@ -140,13 +143,71 @@
         }
     }
 
-    @PostMapping("/asnOrder/generate/barcode")
-    @ApiOperation("鐢熸垚ASN鏍囩")
+    @PostMapping("/asnOrder/matnr/list")
+    @ApiOperation("鐗╂枡鑾峰彇璁㈠崟")
     @PreAuthorize("hasAuthority('manager:asnOrder:list')")
-    public R generateBarcode(@RequestBody List<AsnOrder> orders) {
-        if (orders.isEmpty()) {
-            return R.error("鍗曟嵁涓嶈兘涓虹┖!!");
+    public R getListByMatnr(@RequestBody Map<String, String> params){
+        if (Objects.isNull(params)) {
+            return R.error("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
         }
-        return asnOrderService.generateBarcode(orders);
+        return R.ok(asnOrderService.getListByMatnr(params));
     }
+
+
+    @PostMapping("/asnOrder/items/save")
+    @ApiOperation("淇濆瓨涓诲崟鍙婃槑缁�")
+    @PreAuthorize("hasAuthority('manager:asnOrder:save')")
+    public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) throws Exception {
+        if (Objects.isNull(params)) {
+           return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        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