From 5747655ff976c6226cf6e0ebcaef6d38d396bb9f Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 09 九月 2021 10:42:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 68 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 19 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..9ba2830 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -5,6 +5,7 @@
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;
@@ -15,6 +16,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 +43,8 @@
private LocDetlService locDetlService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private WaitMatinService waitMatinService;
/**
* 缁勬墭
@@ -50,7 +55,6 @@
mobileService.comb(combParam, getUserId());
return R.ok();
}
-
/**
* 缁勬墭
@@ -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,53 @@
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).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