From 46ed08ac607dbe690ed7f4ce1e7db39ad86f2842 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 09:43:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 95 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 9409681..b7f5391 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,9 +1,29 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.MobileService;
+import com.zy.asrs.service.OrderService;
+import com.zy.common.model.MobileLocDetlVo;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -11,16 +31,83 @@
*/
@RestController
@RequestMapping("mobile")
-public class MobileController {
+public class MobileController extends BaseController {
+
+ @Autowired
+ private MobileService mobileService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private OrderService orderService;
/**
- * 缁勬墭
+ * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
+ * http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
*/
+ @RequestMapping("/order/search/orderNo/auth")
+ @ManagerAuth
+ public R orderSearchByBarcode(@RequestParam String orderNo){
+ Order order = orderService.selectByNo(orderNo);
+ if (order.getSettle() > 2) {
+ return R.ok();
+ }
+ List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
+ if (Cools.isEmpty(orderDetls)) {
+ return R.ok();
+ }
+ return R.ok().add(orderDetls);
+ }
+
+
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(){
-
+ public R comb(@RequestBody CombParam combParam){
+ mobileService.comb(combParam, getUserId());
return R.ok();
}
+
+ /**
+ * 鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
+ */
+ @RequestMapping("/locDetl")
+ @ManagerAuth
+ public R getLocDetl(@RequestParam(required = false)String locNo,
+ @RequestParam(required = false)String matNo){
+ if (!Cools.isEmpty(locNo)) {
+ LocMast locMast = locMastService.selectById(locNo);
+ if (null == locMast || !"F".equals(locMast.getLocSts())) {
+ return R.parse(BaseRes.EMPTY);
+ }
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", locNo).orderBy("appe_time", false));
+ List<MobileLocDetlVo> res = new ArrayList<>();
+ locDetls.forEach(locDetl -> {
+ MobileLocDetlVo vo = new MobileLocDetlVo();
+ vo.setLocNo(locDetl.getLocNo());
+ vo.setMatnr(locDetl.getMatnr());
+ vo.setMaktx(locDetl.getMaktx());
+ vo.setCount(locDetl.getAnfme());
+ res.add(vo);
+ });
+ return R.ok().add(res);
+ }
+ if (!Cools.isEmpty(matNo)) {
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("matnr", matNo).orderBy("appe_time", false));
+ List<MobileLocDetlVo> res = new ArrayList<>();
+ locDetls.forEach(locDetl -> {
+ MobileLocDetlVo vo = new MobileLocDetlVo();
+ vo.setLocNo(locDetl.getLocNo());
+ vo.setMatnr(locDetl.getMatnr());
+ vo.setMaktx(locDetl.getMaktx());
+ vo.setCount(locDetl.getAnfme());
+ res.add(vo);
+ });
+ return R.ok().add(res);
+ }
+ return R.parse(BaseRes.PARAM);
+ }
}
--
Gitblit v1.9.1