From 89b19f453e03402aa2c8a588e5be1f491c007141 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 11 三月 2025 13:49:03 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into front
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 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 e96c1e4..cc8ee72 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
@@ -2,12 +2,14 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.api.controller.params.OtherReceiptParams;
import com.vincent.rsf.server.api.controller.params.ReceiptParams;
import com.vincent.rsf.server.api.entity.dto.ReceiptDetlsDto;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import org.apache.tika.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,12 @@
private MobileService mobileService;
+ /**
+ * PDA鐢ㄦ埛鐧诲綍
+ * @param param
+ * @param request
+ * @return
+ */
@PostMapping("/login")
@ApiOperation("PDA鐢ㄦ埛鐧诲綍")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
@@ -51,6 +59,11 @@
}
+ /**
+ * 鏍囧噯鎵爜鏀惰揣淇℃伅
+ * @param barcode
+ * @return
+ */
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@GetMapping("/orders/{barcode}")
@ApiOperation("鏍囧噯鎵爜鏀惰揣")
@@ -61,7 +74,12 @@
return mobileService.getOrderByCode(barcode);
}
- @PreAuthorize("hasAuthority('manager:warehouseAreas:save')")
+ /**
+ * 纭鏀惰揣淇℃伅
+ * @param params
+ * @return
+ */
+ @PreAuthorize("hasAuthority('manager:warehouseAreasItem:save')")
@PostMapping("/orders/confirm")
@ApiOperation("纭鏀惰揣")
public R confirmReceipt(@RequestBody ReceiptParams params) {
@@ -72,5 +90,31 @@
}
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @PostMapping("/orders/other")
+ @ApiOperation("鍏跺畠鎵爜鏀惰揣")
+ public R getOtherReceipt(@RequestBody OtherReceiptParams params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+
+ return mobileService.otherReceipt(params);
+ }
+
+ @PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
+ @ApiOperation("鑾峰彇鏀惰揣鍖�")
+ @GetMapping("/areas/receipt")
+ public R getReceiptAreas() {
+ return mobileService.getReceiptAreas();
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @GetMapping("/orders/asn")
+ @ApiOperation("鑾峰彇閫氱煡鍗�")
+ public R getAllAsnOrders() {
+ return R.ok(mobileService.getAllAsnOrders());
+ }
+
}
--
Gitblit v1.9.1