From aa21112291b04d0d3d53d75104a348f019f935a1 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 09 六月 2021 09:03:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/controller/MobileController.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 7aecf61..6d2b05c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -52,6 +52,16 @@
return R.ok();
}
+ /**
+ * 缁勬墭-鎵归噺
+ */
+ @RequestMapping("/comb/auth/batch")
+ @ManagerAuth(memo = "缁勬墭-鎵归噺")
+ public R combBatch(@RequestBody CombParam combParam){
+ mobileService.combBatch(combParam, getUserId());
+ return R.ok();
+ }
+
/**
* 缁勬墭
@@ -69,7 +79,9 @@
@RequestMapping("/locDetl")
@ManagerAuth
public R getLocDetl(@RequestParam(required = false)String locNo,
- @RequestParam(required = false)String matNo){
+ @RequestParam(required = false)String matNo,
+ @RequestParam(required = false)String supplier
+ ){
if (!Cools.isEmpty(locNo)) {
LocMast locMast = locMastService.selectById(locNo);
if (null == locMast || !"F".equals(locMast.getLocSts())) {
@@ -102,6 +114,20 @@
});
return R.ok().add(res);
}
+ if (!Cools.isEmpty(supplier)) {
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("supplier", supplier).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);
}
@@ -120,6 +146,10 @@
vo.setMatName(waitPakin.getMaktx());
vo.setCount(waitPakin.getAnfme());
vo.setMnemonic(waitPakin.getMnemonic());
+ vo.setSupplier(waitPakin.getSupplier());
+ vo.setAltme(waitPakin.getAltme());
+ vo.setType(waitPakin.getType());
+ vo.setLgnum(waitPakin.getLgnum());
vos.add(vo);
}
}
--
Gitblit v1.9.1