From e6af1100ab9b98b142ce2e0b158f5416f499628b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 22 三月 2025 15:38:08 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java | 23 ++++++++++++++++-------
1 files changed, 16 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 2cf4547..320bcdc 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
@@ -4,12 +4,10 @@
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;
@@ -17,7 +15,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.List;
import java.util.Objects;
/**
@@ -34,8 +31,6 @@
@Autowired
private MobileService mobileService;
-
-
/**
* PDA鐢ㄦ埛鐧诲綍
* @param param
@@ -79,7 +74,7 @@
* @param params
* @return
*/
- @PreAuthorize("hasAuthority('manager:warehouseAreasItem:save')")
+ @PreAuthorize("hasAuthority('manager:warehouseAreas:save')")
@PostMapping("/orders/confirm")
@ApiOperation("纭鏀惰揣")
public R confirmReceipt(@RequestBody ReceiptParams params) {
@@ -97,8 +92,14 @@
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();
}
@@ -110,4 +111,12 @@
}
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @GetMapping("/dynamic/fields")
+ @ApiOperation("鑾峰彇鍔ㄦ�佸瓧娈�")
+ public R getDynamicFields() {
+ return R.ok(mobileService.getDynamicFields());
+ }
+
+
}
--
Gitblit v1.9.1