From 481819975d08f3455fb148410e272f560dd7adb2 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 03 四月 2025 09:14:47 +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 | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 64 insertions(+), 5 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 df6eb98..13eb3eb 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
@@ -1,13 +1,11 @@
package com.vincent.rsf.server.api.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.controller.params.*;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.QlyIsptItem;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import io.swagger.annotations.Api;
@@ -86,7 +84,6 @@
}
return mobileService.receiptToWarehouse(params);
}
-
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/orders/other")
@@ -183,4 +180,66 @@
}
return mobileService.confirmIspt(id);
}
+
+ @ApiOperation("蹇�熻川妫�淇℃伅")
+ @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
+ @PostMapping("/inspect/query")
+ public R checkObjs(@RequestBody CheckObjParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.checkObjs(params);
+ }
+
+
+ @ApiOperation("蹇甫璐ㄦ")
+ @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
+ @PostMapping("/inspect/check/update")
+ public R checkUpdate(@RequestBody QlyIsptItem params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.checkUpdate(params);
+ }
+
+ @ApiOperation("鑾峰彇涓婃灦淇℃伅")
+ @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
+ @PostMapping("/stock/operate/list")
+ public R operateToStock(@RequestBody OpStockParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.operateToStock(params);
+ }
+
+ @ApiOperation("浜哄伐涓婃灦")
+ @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
+ @PostMapping("/stock/operate")
+ public R publicToStock(@RequestBody PublicToStockParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.publicToStock(params);
+ }
+
+ @ApiOperation("鑾峰彇浠诲姟淇℃伅")
+ @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
+ @PostMapping("/task/stock/{code}")
+ public R taskToStock(@PathVariable String code) {
+ if (Objects.isNull(code)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.taskToStock(code);
+ }
+
+ @ApiOperation("浠诲姟涓婃灦")
+ @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
+ @PostMapping("/task/stock")
+ public R taskToLocs(@PathVariable String code) throws Exception {
+ if (Objects.isNull(code)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.taskGetLocs(code);
+ }
+
}
--
Gitblit v1.9.1