From a96011ae74eaeeb5cca6ae394e7f15b84c289102 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 03 九月 2021 15:31:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 65 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 0c246a2..08e1876 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -15,6 +15,8 @@
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;
@@ -40,6 +42,8 @@
private LocDetlService locDetlService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private WaitMatinService waitMatinService;
/**
* 缁勬墭
@@ -82,36 +86,36 @@
List<MobileLocDetlVo> res = new ArrayList<>();
locDetls.forEach(locDetl -> {
MobileLocDetlVo vo = new MobileLocDetlVo();
- List<WrkDetl> wrkDetlsList = wrkDetlService.queryWrkDetl(locDetl.getMatnr(), locDetl.getLocNo());
+ List<WrkDetl> wrkDetlsList = wrkDetlService.queryWrkDetl(locDetl.getMatNo(), locDetl.getLocNo());
final Double[] pickNum = {0.0};
wrkDetlsList.forEach(item -> {
- pickNum[0] = pickNum[0] + item.getAnfme();
+ pickNum[0] = pickNum[0] + item.getQty();
});
vo.setPickNum(pickNum[0]);
vo.setLocNo(locDetl.getLocNo());
- vo.setMatnr(locDetl.getMatnr());
- vo.setMaktx(locDetl.getMaktx());
- vo.setCount(locDetl.getAnfme());
+ 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("matnr", matNo).orderBy("appe_time", false));
+ .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.getMatnr(), locDetl.getLocNo());
+ List<WrkDetl> wrkDetlsList = wrkDetlService.queryWrkDetl(locDetl.getMatNo(), locDetl.getLocNo());
final Double[] pickNum = {0.0};
wrkDetlsList.forEach(item -> {
- pickNum[0] = pickNum[0] + item.getAnfme();
+ pickNum[0] = pickNum[0] + item.getQty();
});
vo.setPickNum(pickNum[0]);
vo.setLocNo(locDetl.getLocNo());
- vo.setMatnr(locDetl.getMatnr());
- vo.setMaktx(locDetl.getMaktx());
- vo.setCount(locDetl.getAnfme());
+ vo.setMatNo(locDetl.getMatNo());
+ vo.setMatName(locDetl.getMatName());
+ vo.setCount(locDetl.getQty());
res.add(vo);
});
return R.ok().add(res);
@@ -137,27 +141,52 @@
locDetls.forEach(locDetl -> {
MobileLocDetlVo vo = new MobileLocDetlVo();
vo.setLocNo(locDetl.getLocNo());
- vo.setMatnr(locDetl.getMatnr());
- vo.setMaktx(locDetl.getMaktx());
- vo.setCount(locDetl.getAnfme());
+ 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("matnr", matNo).orderBy("appe_time", false));
+ .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.setMatnr(locDetl.getMatnr());
- vo.setMaktx(locDetl.getMaktx());
- vo.setCount(locDetl.getAnfme());
+ 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));
+ List<CombBillQueryVo> vos = new ArrayList<>();
+ if (!Cools.isEmpty(waitPakins)) {
+ for (WaitMatin waitMatin : waitMatins) {
+ CombBillQueryVo vo = new CombBillQueryVo();
+ vo.setMatNo(waitMatin.getMatnr());
+ vo.setMatName(waitMatin.getMaktx());
+ vo.setCount(waitMatin.getAnfme());
+ vo.setSupplier(waitMatin.getSupplier());
+ vo.setAltme(waitMatin.getAltme());
+ vo.setType(waitMatin.getType());
+ vo.setLgnum(waitMatin.getLgnum());
+ vo.setColor(waitMatin.getColor());
+ vos.add(vo);
+ }
+ }
+ return R.ok().add(vos);
+ }
}
--
Gitblit v1.9.1