From a0c27ec444c85326efe3bacf3205dfecbd66451d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 09:28:39 +0800
Subject: [PATCH] #新增 1. 新增出库单明细  2. 编码规则bug修改

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java |   85 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 81 insertions(+), 4 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 3b2dbe6..7471043 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,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -130,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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
@@ -143,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')")
@@ -193,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);
@@ -243,4 +255,69 @@
         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);
+    }
+
+    @ApiOperation("鑾峰彇缁勬嫋鍏ュ簱淇℃伅")
+    @PostMapping("/pakin/info/{barcode}")
+    @PreAuthorize("hasAuthority('manager:waitPakin:list')")
+    public R getPakinInStock(@PathVariable String barcode) {
+        if (Objects.isNull(barcode)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return mobileService.getPakinInStock(barcode);
+    }
+
+    @ApiOperation("鑾峰彇涓婃灦绔欑偣淇℃伅")
+    @GetMapping("/inStock/sites")
+    @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+    public R getTarSite() {
+        return mobileService.getDeviceSites();
+    }
+
+    @ApiOperation("鑾峰彇鎺ㄨ崘搴撲綅鍒楄〃淇℃伅")
+    @GetMapping("/locs/list")
+    @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+    public R getLocs() {
+        return mobileService.getRecommondLocs();
+    }
+
+    @ApiOperation("鐢熸垚浠诲姟鍒楄〃")
+    @PostMapping("/pakin/task")
+    @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+    public R pakinToTask(@RequestBody Map<String, Object> map) {
+        if (Objects.isNull(map)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return mobileService.generateTask(map, getLoginUserId());
+    }
 }
+

--
Gitblit v1.9.1