From fc39b347617e3c88c87b879e9d2d1ceca58774a5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 四月 2022 15:30:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 78 +++++++++++++++------------------------
1 files changed, 30 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index d5408bd..ba76d5c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -2,7 +2,6 @@
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.*;
@@ -10,7 +9,6 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -18,7 +16,6 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -75,14 +72,12 @@
return R.ok().add(orderDetls);
}
-
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
-
@RequestMapping("/pack/get/auth")
@ManagerAuth
@@ -98,10 +93,38 @@
}
@RequestMapping("/pack/comb/auth")
- @ManagerAuth(memo = "缁勬墭")
+ @ManagerAuth(memo = "涓嬬嚎缁勬墭")
public R packComb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
+ mobileService.packComb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
+ }
+
+
+ // 鍑哄簱 ---------------------------------------------------------------------------------------------------
+
+ @RequestMapping("/pakout/query/auth")
+ @ManagerAuth
+ public R pakoutQuery(@RequestParam(required = false) String barcode,
+ @RequestParam(required = false) Integer staNo,
+ @RequestParam(required = false) String matnr){
+ if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
+ return R.ok();
+ }
+ if (!Cools.isEmpty(barcode)) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
+ return R.ok().add(wrkDetls);
+ }
+ if (!Cools.isEmpty(matnr)) {
+ if (!Cools.isEmpty(staNo)) {
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", staNo).eq("wrk_sts", 14L));
+ if (!Cools.isEmpty(wrkMasts)) {
+ WrkMast wrkMast = wrkMasts.get(0);
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ return R.ok().add(wrkDetls);
+ }
+ }
+ }
+ return R.ok();
}
@@ -138,45 +161,4 @@
}
- /**
- * 鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
- */
- @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