From 0401f1e6323ebb34f13f446713cb35082b14a0cd Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 12:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/asrs/controller/MobileController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 770eeb9..e3c19d1 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -150,6 +150,7 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam) {
+ System.out.println(combParam);
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@@ -433,15 +434,15 @@
if (!Cools.isEmpty(waitMatins)) {
for (OrderDetl waitMatin : waitMatins) {
CombBillQueryVo vo = new CombBillQueryVo();
- vo.setMatNo(waitMatin.getMatnr());
+ vo.setMatnr(waitMatin.getMatnr());
vo.setMatName(waitMatin.getMaktx());
- vo.setQty(waitMatin.getQty());
+ vo.setQty(waitMatin.getAnfme());
vo.setCount(waitMatin.getAnfme() - waitMatin.getWorkQty());
vo.setBillNo(waitMatin.getOrderNo());
vo.setSeqNo(waitMatin.getINo());
vo.setUnit(waitMatin.getUnit());
vo.setSpecs(waitMatin.getSpecs());
- vo.setSize(waitMatin.getSpecs());
+ vo.setSize(waitMatin.getModel());
vo.setColor(waitMatin.getColor());
vo.setItemBatch(waitMatin.getBatch());
//vo.setOveFlag(waitMatin.getOveFlag());
@@ -449,6 +450,12 @@
System.out.println(waitMatin.getAnfme());
System.out.println(waitMatin.getWorkQty());
System.out.println(vo);
+// 10.0
+// 0.0
+// CombBillQueryVo(billNo=ZJFLC2407280005, seqNo=1, matNo=41011659, matName=寮圭哀鐩�, specs=null, size=null, color=null, count=10.0, qty=0.0, unit=Pcs, type=null, itemBatch=, oveFlag=null)
+// 10.0
+// 0.0
+// CombBillQueryVo(billNo=ZJFLC2407280005, seqNo=2, matNo=4103020554, matName=鏀灦, specs=null, size=null, color=null, count=10.0, qty=0.0, unit=Pcs, type=null, itemBatch=, oveFlag=null)
}
}
return R.ok().add(vos);
--
Gitblit v1.9.1