From eeaf1c0a087ea45a5956a8b268388fc869704bc2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 15 四月 2022 13:16:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 14 +++++++++++---
1 files changed, 11 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 2ba4a5a..421c7d2 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -8,6 +8,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.common.model.MobileLocDetlVo;
import com.zy.common.web.BaseController;
@@ -84,14 +85,21 @@
@RequestMapping("/checkDetl/auth")
@ManagerAuth
- public R getCheckDetl(@RequestParam Integer staNo) {
+ public R getCheckDetl(@RequestParam(required = false) Integer staNo) {
+ if (null == staNo || staNo == 0) {
+ return R.ok();
+ }
BasDevp basDevp = basDevpService.selectById(staNo);
if (null != basDevp && basDevp.getWrkNo() != null) {
WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
if (wrkMast != null && wrkMast.getIoType() == 107) {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
if (!Cools.isEmpty(wrkDetls)) {
- return R.ok().add(wrkDetls);
+ MobileAdjustResult result = new MobileAdjustResult();
+ result.setStaNo(staNo);
+ result.setWrkNo(wrkMast.getWrkNo());
+ result.setWrkDetls(wrkDetls);
+ return R.ok().add(result);
}
}
}
@@ -102,7 +110,7 @@
@ManagerAuth(memo = "鐩樼偣")
public R adjust(@RequestBody MobileAdjustParam combParam){
mobileService.adjust(combParam, getUserId());
- return R.ok();
+ return R.ok("鐩樼偣鎴愬姛");
}
--
Gitblit v1.9.1