From acaf6624ef2f706b8ccf442b453d802320829bd3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 四月 2025 16:51:16 +0800
Subject: [PATCH] # 修改 1. 任务列表修改 2. ASN执行状态修改 3. ASN扩展字段优化 4. 确认收货扩展字段优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java |   71 +++++++++++++++++++++++++++++++++++
 1 files changed, 71 insertions(+), 0 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 80e9d25..037dee9 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,9 +10,13 @@
 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;
 import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,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));
@@ -64,6 +69,10 @@
     public R save(@RequestBody AsnOrder asnOrder) {
         asnOrder.setCreateBy(getLoginUserId());
         asnOrder.setUpdateBy(getLoginUserId());
+        String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, asnOrder);
+        if (!Objects.isNull(code)) {
+            asnOrder.setCode(code);
+        }
         if (!asnOrderService.save(asnOrder)) {
             return R.error("Save Fail");
         }
@@ -133,4 +142,66 @@
             return R.error("涓�閿笂鎶ュけ璐ワ紒锛�");
         }
     }
+
+    @PostMapping("/asnOrder/matnr/list")
+    @ApiOperation("鐗╂枡鑾峰彇璁㈠崟")
+    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+    public R getListByMatnr(@RequestBody Map<String, String> params){
+        if (Objects.isNull(params)) {
+            return R.error("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
+        }
+        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());
+    }
+
+
+
+
+
 }

--
Gitblit v1.9.1