From bfacb129c01fd1c847a8340f1214d0bbccdefd58 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 四月 2022 09:29:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 89 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 87906fc..ef13ebd 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -5,12 +5,9 @@
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.*;
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.*;
import com.zy.common.model.MobileLocDetlVo;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,40 +33,84 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private DocTypeService docTypeService;
/**
- * 缁勬墭
+ * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
+ * 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 == null) {
+ return R.ok();
+ }
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (docType.getPakin() == null || docType.getPakin() != 1) {
+ return R.ok();
+ }
+ 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(@RequestBody CombParam combParam){
mobileService.comb(combParam, getUserId());
- return R.ok();
+ return R.ok("缁勬墭鎴愬姛");
}
+
/**
* 鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
*/
@RequestMapping("/locDetl")
@ManagerAuth
- public R getLocDetl(@RequestParam(required = false)String locNo){
- if (Cools.isEmpty(locNo)) {
- return R.parse(BaseRes.PARAM);
+ 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);
}
- LocMast locMast = locMastService.selectById(locNo);
- if (null == locMast || !"F".equals(locMast.getLocType())) {
- return R.parse(BaseRes.EMPTY);
+ 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);
}
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
- List<MobileLocDetlVo> res = new ArrayList<>();
- locDetls.forEach(locDetl -> {
- MobileLocDetlVo vo = new MobileLocDetlVo();
- vo.setLocNo(locNo);
- vo.setMatNo(locDetl.getMatnr());
- vo.setMatName(locDetl.getMaktx());
- vo.setCount(locDetl.getAnfme());
- res.add(vo);
- });
- return R.ok().add(res);
+ return R.parse(BaseRes.PARAM);
}
}
--
Gitblit v1.9.1