From 7ff441cde857c41ae9908100de9c469ed5ab76be Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 19:11:56 +0800
Subject: [PATCH] 视图sql
---
src/main/java/com/zy/asrs/controller/MobileController.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index cff4b1d..4200c10 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -159,7 +159,6 @@
elem.setBatch(elem.getItemBatch());
}
});
- System.out.println(combParam);
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@@ -428,12 +427,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("pg_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"));
@@ -456,17 +457,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