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 | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 08e1876..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;
@@ -54,7 +55,6 @@
mobileService.comb(combParam, getUserId());
return R.ok();
}
-
/**
* 缁勬墭
@@ -171,18 +171,19 @@
@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<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo).last("and qty > in_qty"));
List<CombBillQueryVo> vos = new ArrayList<>();
- if (!Cools.isEmpty(waitPakins)) {
+ if (!Cools.isEmpty(waitMatins)) {
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.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);
}
--
Gitblit v1.9.1