From ad0edcdd20bfc717fe08a9de26c664c33430b731 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期三, 11 九月 2024 10:34:28 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
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..923c0f0 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
@@ -69,7 +69,7 @@
OpenOrderPakinParam openParam = new OpenOrderPakinParam();
openParam.setOrderNo(orderNo);
openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
- openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
+ openParam.setOrderType("鎵嬪姩鍏ュ簱鍗昐H");
openParam.setOrderDetails(detlDtos);
openParam.setHostId(hostId);
openService.pakinOrderCreate(openParam);
@@ -78,7 +78,7 @@
OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
openParam.setOrderNo(orderNo);
openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
- openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
+ openParam.setOrderType("鎵嬪姩鍑哄簱鍗昐H");
openParam.setOrderDetails(detlDtos);
openParam.setHostId(hostId);
openService.pakoutOrderCreate(openParam);
@@ -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;
}
--
Gitblit v1.9.1