From 93b591f65d0dbc0ab2238fb8a027c58f44e5fb66 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 08 九月 2021 16:12:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 159 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 8eadac7..9ba2830 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,14 +1,31 @@
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.CombBillQueryVo;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.WrkDetl;
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.WrkDetlService;
+import com.zy.common.model.MobileLocDetlVo;
import com.zy.common.web.BaseController;
+import com.zy.ints.entity.WaitMatin;
+import com.zy.ints.service.WaitMatinService;
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;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -20,6 +37,14 @@
@Autowired
private MobileService mobileService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private WaitMatinService waitMatinService;
/**
* 缁勬墭
@@ -31,4 +56,138 @@
return R.ok();
}
+ /**
+ * 缁勬墭
+ */
+ @RequestMapping("/comb/form")
+ @ManagerAuth(memo = "缁勬墭")
+ public R combForm(@RequestParam CombParam combParam){
+ mobileService.comb(combParam, getUserId());
+ return R.ok();
+ }
+
+ /**
+ * 搴撳瓨鏌ヨ(鏍规嵁鐗╂枡缂栫爜鍜屽簱浣嶆煡璇㈠簱瀛樻暟閲忓拰鎹℃枡鏁伴噺)
+ * @param locNo
+ * @param matNo
+ * @return
+ */
+ @RequestMapping("/locDetl/stockQuery")
+ @ManagerAuth
+ public R stockQuery(@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();
+ List<WrkDetl> wrkDetlsList = wrkDetlService.queryWrkDetl(locDetl.getMatNo(), locDetl.getLocNo());
+ final Double[] pickNum = {0.0};
+ wrkDetlsList.forEach(item -> {
+ pickNum[0] = pickNum[0] + item.getQty();
+ });
+ vo.setPickNum(pickNum[0]);
+ vo.setLocNo(locDetl.getLocNo());
+ vo.setMatNo(locDetl.getMatNo());
+ vo.setMatName(locDetl.getMatName());
+ vo.setCount(locDetl.getQty());
+ res.add(vo);
+ });
+ return R.ok().add(res);
+ }
+ if (!Cools.isEmpty(matNo)) {
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("mat_no", matNo).orderBy("appe_time", false));
+ List<MobileLocDetlVo> res = new ArrayList<>();
+ locDetls.forEach(locDetl -> {
+ MobileLocDetlVo vo = new MobileLocDetlVo();
+ List<WrkDetl> wrkDetlsList = wrkDetlService.queryWrkDetl(locDetl.getMatNo(), locDetl.getLocNo());
+ final Double[] pickNum = {0.0};
+ wrkDetlsList.forEach(item -> {
+ pickNum[0] = pickNum[0] + item.getQty();
+ });
+ vo.setPickNum(pickNum[0]);
+ vo.setLocNo(locDetl.getLocNo());
+ vo.setMatNo(locDetl.getMatNo());
+ vo.setMatName(locDetl.getMatName());
+ vo.setCount(locDetl.getQty());
+ res.add(vo);
+ });
+ return R.ok().add(res);
+ }
+ return R.parse(BaseRes.PARAM);
+ }
+
+ /**
+ * 鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
+ */
+ @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.setMatNo(locDetl.getMatNo());
+ vo.setMatName(locDetl.getMatName());
+ vo.setCount(locDetl.getQty());
+ res.add(vo);
+ });
+ return R.ok().add(res);
+ }
+ if (!Cools.isEmpty(matNo)) {
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("mat_no", matNo).orderBy("appe_time", false));
+ List<MobileLocDetlVo> res = new ArrayList<>();
+ locDetls.forEach(locDetl -> {
+ MobileLocDetlVo vo = new MobileLocDetlVo();
+ vo.setLocNo(locDetl.getLocNo());
+ vo.setMatNo(locDetl.getMatNo());
+ vo.setMatName(locDetl.getMatName());
+ vo.setCount(locDetl.getQty());
+ res.add(vo);
+ });
+ return R.ok().add(res);
+ }
+ return R.parse(BaseRes.PARAM);
+ }
+
+ /**
+ * 鏍规嵁閫氱煡鍗曟煡璇㈡槑缁�
+ */
+ @RequestMapping("/bill/query/auth")
+ @ManagerAuth(memo = "鏍规嵁閫氱煡鍗曟煡璇㈡槑缁�")
+ public R billQuery(@RequestParam String billNo){
+ List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo).last("and qty > in_qty"));
+ List<CombBillQueryVo> vos = new ArrayList<>();
+ if (!Cools.isEmpty(waitMatins)) {
+ for (WaitMatin waitMatin : waitMatins) {
+ CombBillQueryVo vo = new CombBillQueryVo();
+ vo.setMatNo(waitMatin.getMatNo());
+ vo.setMatName(waitMatin.getMatName());
+ vo.setCount(waitMatin.getQty()-waitMatin.getInQty());
+ vo.setBillNo(waitMatin.getBillNo());
+ vo.setSeqNo(waitMatin.getSeqNo());
+ vo.setUnit(waitMatin.getUnit());
+ vo.setSpecs(waitMatin.getSpecs());
+ vo.setSize(waitMatin.getSize());
+ vo.setColor(waitMatin.getColor());
+ vos.add(vo);
+ }
+ }
+ return R.ok().add(vos);
+ }
}
--
Gitblit v1.9.1