From 907e117c441d409fab5922e655039138a4715126 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 10:57:08 +0800
Subject: [PATCH] 订单组托代码
---
src/main/java/com/zy/asrs/controller/MobileController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 99647ea..c1d23cb 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -418,23 +418,23 @@
@RequestMapping("/bill/query1/auth")
@ManagerAuth(memo = "鏍规嵁閫氱煡鍗曟煡璇㈡槑缁�")
public R billQuery1(@RequestParam String billNo, @RequestParam String size){
- List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo).like("size", size).last("and qty > in_qty"));
+ List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", billNo).like("matnr", size).last("and anfme > work_qty"));
// List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo).last("and qty > in_qty"));
//濡傛灉閫氱煡鍗曞崟鍙蜂负绌猴紝鍒欐煡璇㈣皟鎷ㄥ崟鍙�
if(Cools.isEmpty(waitMatins) || waitMatins.size()<=0){
- waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("temp1", billNo).like("size", size).last("and qty > in_qty"));
+ waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("temp1", billNo).like("size", size).last("and qty > in_qty"));
}
List<CombBillQueryVo> vos = new ArrayList<>();
if (!Cools.isEmpty(waitMatins)) {
- for (WaitMatin waitMatin : waitMatins) {
+ for (OrderDetl waitMatin : waitMatins) {
CombBillQueryVo vo = new CombBillQueryVo();
- vo.setMatNo(waitMatin.getMatNo());
- vo.setMatName(waitMatin.getMatName());
+ vo.setMatNo(waitMatin.getMatnr());
+ vo.setMatName(waitMatin.getMaktx());
vo.setCount(waitMatin.getQty()-waitMatin.getInQty());
vo.setQty(waitMatin.getQty()-waitMatin.getInQty());
- vo.setBillNo(waitMatin.getBillNo());
+ vo.setBillNo(waitMatin.getOrderNo());
vo.setSeqNo(waitMatin.getSeqNo());
vo.setUnit(waitMatin.getUnit());
vo.setSpecs(waitMatin.getSpecs());
--
Gitblit v1.9.1