From be9f5efd7badcaab6f1746e76ec41ee7f91d37c7 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期二, 03 九月 2024 12:53:43 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/controller/MobileController.java | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index e3c19d1..9718208 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -150,7 +150,15 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam) {
- System.out.println(combParam);
+ if (Cools.isEmpty(combParam.getOrderNo())) {
+ combParam.setOrderNo(combParam.getBillNo());
+ }
+ List<CombParam.CombMat> combMats = combParam.getCombMats();
+ combMats.forEach(elem -> {
+ if (Cools.isEmpty(elem.getBatch())) {
+ elem.setBatch(elem.getItemBatch());
+ }
+ });
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@@ -181,22 +189,20 @@
@RequestMapping("/pakout/query/auth")
@ManagerAuth
@Deprecated
- public R pakoutQuery(@RequestParam(required = false) String barcode,
- @RequestParam(required = false) Integer staNo,
- @RequestParam(required = false) String matnr) {
- if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
+ public R pakoutQuery(@RequestParam String barcode) {
+ if (Cools.isEmpty(barcode)) {
return R.ok();
}
if (!Cools.isEmpty(barcode)) {
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
return R.ok().add(wrkDetls);
}
- if (!Cools.isEmpty(matnr)) {
- if (!Cools.isEmpty(staNo)) {
- List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
- return R.ok().add(wrkDetls);
- }
- }
+// if (!Cools.isEmpty(matnr)) {
+// if (!Cools.isEmpty(staNo)) {
+// List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
+// return R.ok().add(wrkDetls);
+// }
+// }
return R.ok();
}
@@ -419,12 +425,14 @@
@RequestMapping("/bill/query1/auth")
@ManagerAuth(memo = "鏍规嵁閫氱煡鍗曟煡璇㈡槑缁�")
public R billQuery1(@RequestParam String billNo, @RequestParam String size) {
- System.out.println("-------------------------");
- System.out.println(billNo);
- System.out.println(size);
- List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", billNo).like("model", size).last("and anfme > work_qty"));
-// List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo).last("and qty > in_qty"));
-
+ Order temp1 = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", billNo));
+ if (temp1 == null) {
+ throw new CoolException("璇ヨ鍗曚笉瀛樺湪");
+ }
+ List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).like("model", size).last("and anfme > work_qty"));
+ if (waitMatins == null || waitMatins.isEmpty()) {
+ throw new CoolException("璇ヨ鍗曢」涓嶅瓨鍦�");
+ }
//濡傛灉閫氱煡鍗曞崟鍙蜂负绌猴紝鍒欐煡璇㈣皟鎷ㄥ崟鍙�
// if (Cools.isEmpty(waitMatins) || waitMatins.size() <= 0) {
// waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("temp1", billNo).like("size", size).last("and anfme > work_qty"));
@@ -436,7 +444,7 @@
CombBillQueryVo vo = new CombBillQueryVo();
vo.setMatnr(waitMatin.getMatnr());
vo.setMatName(waitMatin.getMaktx());
- vo.setQty(waitMatin.getAnfme());
+ vo.setQty(waitMatin.getAnfme() - waitMatin.getWorkQty());
vo.setCount(waitMatin.getAnfme() - waitMatin.getWorkQty());
vo.setBillNo(waitMatin.getOrderNo());
vo.setSeqNo(waitMatin.getINo());
@@ -447,17 +455,10 @@
vo.setItemBatch(waitMatin.getBatch());
//vo.setOveFlag(waitMatin.getOveFlag());
vos.add(vo);
- 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