From 5fa3c13b13f100525b3e076cad3742b202afb284 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 15 四月 2021 09:53:48 +0800
Subject: [PATCH] Merge branch 'gdasrs' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs
---
src/main/java/com/zy/asrs/controller/MobileController.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 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 5ba3f32..0c246a2 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -7,10 +7,12 @@
import com.core.common.R;
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 org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,8 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
/**
* 缁勬墭
@@ -59,6 +63,63 @@
}
/**
+ * 搴撳瓨鏌ヨ(鏍规嵁鐗╂枡缂栫爜鍜屽簱浣嶆煡璇㈠簱瀛樻暟閲忓拰鎹℃枡鏁伴噺)
+ * @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.getMatnr(), locDetl.getLocNo());
+ final Double[] pickNum = {0.0};
+ wrkDetlsList.forEach(item -> {
+ pickNum[0] = pickNum[0] + item.getAnfme();
+ });
+ vo.setPickNum(pickNum[0]);
+ 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();
+ List<WrkDetl> wrkDetlsList = wrkDetlService.queryWrkDetl(locDetl.getMatnr(), locDetl.getLocNo());
+ final Double[] pickNum = {0.0};
+ wrkDetlsList.forEach(item -> {
+ pickNum[0] = pickNum[0] + item.getAnfme();
+ });
+ vo.setPickNum(pickNum[0]);
+ 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);
+ }
+
+ /**
* 鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
*/
@RequestMapping("/locDetl")
--
Gitblit v1.9.1