From 9c0236bacbd10fb629a4142719c4199bca1038bc Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 四月 2025 17:28:58 +0800
Subject: [PATCH] 修改 1. 新增库位明细流界面 2. 修改库存信息表

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
index 13eb3eb..c0d588d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
@@ -16,6 +16,8 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -78,7 +80,7 @@
     @PreAuthorize("hasAuthority('manager:warehouseAreas:save')")
     @PostMapping("/orders/confirm")
     @ApiOperation("纭鏀惰揣")
-    public R confirmReceipt(@RequestBody ReceiptParams params) {
+    public R confirmReceipt(@RequestBody Map<String, Object> params) {
        if (Objects.isNull(params)) {
            throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛侊紒");
        }
@@ -129,10 +131,21 @@
         return mobileService.getDeltByCode(code);
     }
 
+    @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+    @ApiOperation("鑾峰彇鎷栫洏鏄庣粏")
+    @PostMapping("/asnOrderItem/container")
+    public R getItemByContainer(@RequestBody Map<String, Object> params) {
+        if (Objects.isNull(params)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return mobileService.getItemByContainer(params);
+    }
+
     @PreAuthorize("hasAuthority('manager:waitPakin:update')")
     @ApiOperation("缁勬嫋")
     @PostMapping("/waitPakin/merge")
     public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
+        Long userId = getLoginUserId();
         if (Objects.isNull(waitPakin)) {
             return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
@@ -142,7 +155,7 @@
         if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
             return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
         }
-        return R.ok(mobileService.mergeItems(waitPakin));
+        return R.ok(mobileService.mergeItems(waitPakin, userId));
     }
 
     @PreAuthorize("hasAuthority('manager:waitPakin:update')")
@@ -192,11 +205,11 @@
     }
 
 
-    @ApiOperation("蹇甫璐ㄦ")
+    @ApiOperation("蹇�熻川妫�")
     @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
     @PostMapping("/inspect/check/update")
-    public R checkUpdate(@RequestBody QlyIsptItem params) {
-        if (Objects.isNull(params)) {
+    public R checkUpdate(@RequestBody List<QlyIsptItem> params) {
+        if (Objects.isNull(params) || params.isEmpty()) {
             return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
         return mobileService.checkUpdate(params);
@@ -219,7 +232,7 @@
         if (Objects.isNull(params)) {
             return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
-        return mobileService.publicToStock(params);
+        return mobileService.publicToStock(params, getLoginUserId());
     }
 
     @ApiOperation("鑾峰彇浠诲姟淇℃伅")
@@ -234,7 +247,7 @@
 
     @ApiOperation("浠诲姟涓婃灦")
     @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
-    @PostMapping("/task/stock")
+    @PostMapping("/task/public/{code}")
     public R taskToLocs(@PathVariable String code) throws Exception {
         if (Objects.isNull(code)) {
             return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -242,4 +255,34 @@
         return mobileService.taskGetLocs(code);
     }
 
+    @ApiOperation("涓�閿敹璐�")
+    @PostMapping("/complete/{id}")
+    @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+    public R completeOrder(@PathVariable Long id) {
+        if (Objects.isNull(id)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return mobileService.completeOrder(id, getLoginUserId());
+    }
+
+
+    @ApiOperation("鑾峰彇涓嶈壇鎵樼洏鐗╂枡")
+    @PostMapping("/defect/matnrs")
+    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+    public R getAsnDefectItemByCode(@RequestBody Map<String, Object> map) {
+        if (Objects.isNull(map)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return mobileService.getItemByContainer(map);
+    }
+
+    @ApiOperation("鑾峰彇璁㈠崟涓嶈壇鐗╂枡")
+    @PostMapping("/defect/{trackCode}")
+    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+    public R defectProducts(@PathVariable String trackCode) {
+        if (Objects.isNull(trackCode)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return mobileService.defectProducts(trackCode);
+    }
 }

--
Gitblit v1.9.1