From de010011aa92785f04b6f0345411c584d49a92d4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 14:59:06 +0800
Subject: [PATCH] #优化 1. 出库单据优化 2. 字典类型数据优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 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 aaffe4f..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
@@ -145,6 +145,7 @@
@ApiOperation("缁勬嫋")
@PostMapping("/waitPakin/merge")
public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
+ Long userId = getLoginUserId();
if (Objects.isNull(waitPakin)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -154,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')")
@@ -264,4 +265,59 @@
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