From 43a8037b60150b65651c03fd654621d37075d051 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 18:00:26 +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 |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 5 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 a6e9503..b6458c5 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,7 +11,9 @@
 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.entity.Matnr;
 import com.vincent.rsf.server.manager.service.AsnOrderService;
 import com.vincent.rsf.server.system.constant.SerialRuleCode;
 import com.vincent.rsf.server.system.controller.BaseController;
@@ -120,7 +122,13 @@
     @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);
+        List<AsnOrder> orders = new ArrayList<>();
+        if (!Objects.isNull(map.get("ids"))) {
+            orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, map.get("ids")).eq(AsnOrder::getStatus, 1));
+        } else {
+            orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().last("limit 1"));
+        }
+        ExcelUtil.build(ExcelUtil.create(orders, AsnOrder.class), response);
     }
 
     /**
@@ -147,7 +155,7 @@
     @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));
     }
@@ -156,10 +164,57 @@
     @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