From 5f6dbe95bb56f30ccd7acb98282d486e5ed2afd8 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 26 六月 2025 17:33:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index fd09a48..c75a28d 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -17,6 +18,7 @@
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +29,7 @@
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
* Created by vincent on 2020/6/10
*/
+@Slf4j
@RestController
@RequestMapping("mobile")
public class MobileController extends BaseController {
@@ -125,23 +128,55 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
+ public synchronized R comb(@RequestBody CombParam combParam){
+ log.info("comb,{}",JSONObject.toJSON(combParam));
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@RequestMapping("/comb/auth2")
@ManagerAuth(memo = "缁勬墭")
- public R comb2(@RequestBody CombParam combParam){
+ public synchronized R comb2(@RequestBody CombParam combParam){
+ log.info("comb2,{}",JSONObject.toJSON(combParam));
mobileService.comb2(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
- @RequestMapping("/merge/comb/auth")
+ @RequestMapping("/comb/auth3")
@ManagerAuth(memo = "缁勬墭")
+ public synchronized R comb3(@RequestBody CombParam combParam){
+ log.info("comb3,{}",JSONObject.toJSON(combParam));
+ mobileService.comb3(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/check/fullplt/auth")
+ @ManagerAuth(memo = "妫�娴嬬墿鏂欐槸鍚︽湁鏈弧鎵樻墭鐩�")
+ public R checkFullplt(@RequestBody CombParam.CombMat combMat){
+ List<LocMast> locMasts = mobileService.checkFullplt(combMat, getUserId());
+ return R.ok().add(locMasts);
+ }
+
+
+ @RequestMapping("/merge/comb/auth")
+ @ManagerAuth(memo = "骞舵澘")
public R mergeComb(@RequestBody CombParam combParam){
mobileService.mergeComb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/merge/out/auth")
+ @ManagerAuth(memo = "pda骞舵澘鍑哄簱")
+ public R mergeOut(@RequestParam String locNo,@RequestParam String staNo){
+ mobileService.mergeOut(locNo,staNo, getUserId());
+ return R.ok("鍑哄簱鎴愬姛");
+ }
+
+ @RequestMapping("/merge/comb2/auth")
+ @ManagerAuth(memo = "骞舵澘")
+ public R mergeComb2(@RequestBody CombParam combParam){
+ mobileService.mergeComb2(combParam, getUserId());
+ return R.ok("骞舵澘鎴愬姛");
}
@RequestMapping("/comb/checkBom")
@@ -605,4 +640,11 @@
return R.ok();
}
+ @RequestMapping("/adjustNew/v2/auth")
+ @ManagerAuth(memo = "琛ヨ揣")
+ public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam){
+ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+ return R.ok("琛ヨ揣鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1