From 6d47cee06ff442e5277a6629b2a7350613077029 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 14:33:03 +0800
Subject: [PATCH] 订单组托代码
---
src/main/java/com/zy/asrs/controller/MobileController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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..cff4b1d 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -150,6 +150,15 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam 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());
+ }
+ });
System.out.println(combParam);
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
@@ -422,7 +431,7 @@
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<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"));
//濡傛灉閫氱煡鍗曞崟鍙蜂负绌猴紝鍒欐煡璇㈣皟鎷ㄥ崟鍙�
--
Gitblit v1.9.1