From 9263c5de6bf864b4b0dcd9ed8bb7aa124f76afd7 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 11:35:46 +0800
Subject: [PATCH] 订单组托代码
---
src/main/java/com/zy/asrs/controller/MobileController.java | 15 +++++++++------
1 files changed, 9 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 714ec33..770eeb9 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -421,13 +421,13 @@
System.out.println("-------------------------");
System.out.println(billNo);
System.out.println(size);
- List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", billNo).like("model", size).last("and anfme > work_qty"));
+ 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"));
//濡傛灉閫氱煡鍗曞崟鍙蜂负绌猴紝鍒欐煡璇㈣皟鎷ㄥ崟鍙�
- if (Cools.isEmpty(waitMatins) || waitMatins.size() <= 0) {
- waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("temp1", billNo).like("size", size).last("and qty > in_qty"));
- }
+// if (Cools.isEmpty(waitMatins) || waitMatins.size() <= 0) {
+// waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("temp1", billNo).like("size", size).last("and anfme > work_qty"));
+// }
List<CombBillQueryVo> vos = new ArrayList<>();
if (!Cools.isEmpty(waitMatins)) {
@@ -435,8 +435,8 @@
CombBillQueryVo vo = new CombBillQueryVo();
vo.setMatNo(waitMatin.getMatnr());
vo.setMatName(waitMatin.getMaktx());
- vo.setCount(waitMatin.getQty() - waitMatin.getAnfme());
- vo.setQty(waitMatin.getQty() - waitMatin.getWorkQty());
+ vo.setQty(waitMatin.getQty());
+ vo.setCount(waitMatin.getAnfme() - waitMatin.getWorkQty());
vo.setBillNo(waitMatin.getOrderNo());
vo.setSeqNo(waitMatin.getINo());
vo.setUnit(waitMatin.getUnit());
@@ -446,6 +446,9 @@
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);
}
}
return R.ok().add(vos);
--
Gitblit v1.9.1