From 74ea9efdc9fe120e24b6b0bf78198dfa2e57badc Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 12 四月 2025 16:44:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 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 aabf195..661f074 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -165,6 +165,54 @@
// }
// return R.ok().add(orderDetls);
// }
+
+
+// @RequestMapping("/order/search/orderNo/auth")
+// @ManagerAuth
+// public R orderSearchByBarcode(@RequestParam String orderNo){
+// if (Cools.isEmpty(orderNo)){
+// orderNo=null;
+// }
+//// List<Order> orders = orderService.selectorderNoL(orderNo);
+// List<Order> orders = OrderInAndOutUtil.selectOrderNoL(null, orderNo);
+// if (Cools.isEmpty(orders)){
+// return R.ok();
+// }
+// LinkedList<CombParam> combParams = new LinkedList<>();
+// if (!Cools.isEmpty(orders)){
+// for (Order order:orders){
+// CombParam combParam=new CombParam();
+// if (order == null) {
+// continue;
+// }
+// DocType docType = docTypeService.selectById(order.getDocType());
+// if (docType.getPakin() == null || docType.getPakin() != 1) {
+// continue;
+// }
+// if (order.getSettle() > 2) {
+// continue;
+// }
+//// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
+// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectWorkingDetls(order.getPakinPakoutStatus$(), order.getId());
+// if (!Cools.isEmpty(orderDetls)) {
+// LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
+// for (OrderDetl orderDetl:orderDetls){
+// CombParam.CombMat combMat = new CombParam.CombMat();
+// combMat.setMatnr(orderDetl.getMatnr());
+// combMat.setBatch(orderDetl.getBatch());
+// combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
+// combMat.setMaktx(orderDetl.getMaktx());
+// combMat.setSpecs(orderDetl.getSpecs());
+// combMats.add(combMat);
+// }
+// combParam.setCombMats(combMats);
+// }
+// combParam.setOrderNo(order.getOrderNo());
+// combParams.add(combParam);
+// }
+// }
+// return R.ok().add(combParams);
+// }
@RequestMapping("/order/search/orderNo/auth")
@ManagerAuth
public R orderSearchByBarcode(@RequestParam String orderNo){
@@ -201,12 +249,21 @@
combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setBrand(orderDetl.getBrand());
+ combMat.setBoxType1(orderDetl.getBoxType1());
+ combMat.setBoxType2(orderDetl.getBoxType2());
+ combMat.setBoxType3(orderDetl.getBoxType3());
+ combMat.setStandby1(orderDetl.getStandby1());
+ combMat.setStandby2(orderDetl.getStandby2());
+ combMat.setStandby3(orderDetl.getStandby3());
combMats.add(combMat);
}
combParam.setCombMats(combMats);
}
combParam.setOrderNo(order.getOrderNo());
- combParams.add(combParam);
+ return R.ok().add(combParam);
+
+// combParams.add(combParam);
}
}
return R.ok().add(combParams);
--
Gitblit v1.9.1