From 58eb037bf612320dc53c0df6100ab7d5feb66689 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 09 九月 2024 12:55:23 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java | 14 ++++++++++++--
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java | 2 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java | 12 ++++++++++--
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
index 6296d20..52897a7 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
@@ -25,5 +25,5 @@
List<OrderNameListDto> selectAllorderNo(Long hostId);
- List<String> selectAllOutOrderNo(Long hostId);
+ List<String> selectAllOutOrderNo(String orderNo,Long hostId);
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
index 24a83a3..e5a4b96 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
@@ -181,8 +181,16 @@
}
@Override
- public List<String> selectAllOutOrderNo(Long hostId) {
- List<Order> list = list(new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId));
+ public List<String> selectAllOutOrderNo(String orderNo,Long hostId) {
+ List<Order> list = list(new LambdaQueryWrapper<Order>()
+ .eq(Order::getHostId, hostId)
+ .like(Order::getOrderNo, orderNo)
+ );
+ if (Cools.isEmpty(orderNo) || orderNo.isEmpty()){
+ list = list(new LambdaQueryWrapper<Order>()
+ .eq(Order::getHostId, hostId)
+ );
+ }
if (Cools.isEmpty(list)){
return null;
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
index b9c50c2..f659893 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
@@ -19,6 +19,7 @@
import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.framework.exception.CoolException;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -61,6 +62,9 @@
for (OrderDetl o: orderDetl1) {
BigDecimal c1 = new BigDecimal(o.getEnableQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
o.setAnfme(c1.doubleValue());
+ if (o.getAnfme().equals(0.0)){
+ continue;
+ }
orderDetls.add(o);
}
return R.ok(orderDetls);
@@ -72,10 +76,16 @@
return R.ok(orderService.selectAllorderNo(getHostId()));
}
+// @RequestMapping(value = "/outOrder/list/all")
+// @ManagerAuth
+// public R orderOutList() {
+// return R.ok(orderService.selectAllOutOrderNo(getHostId()));
+// }
+
@RequestMapping(value = "/outOrder/list/all")
@ManagerAuth
- public R orderOutList() {
- return R.ok(orderService.selectAllOutOrderNo(getHostId()));
+ public R orderOutListOrder(@RequestBody String orderNo) {
+ return R.ok(orderService.selectAllOutOrderNo(orderNo,getHostId()));
}
@RequestMapping(value = "/order/{id}/auth")
--
Gitblit v1.9.1