From ef97c2c8ede17710583bae8c69b3d1419775e992 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期三, 09 十月 2024 09:40:05 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 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 5417f72..ccbd2b3 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
@@ -38,6 +38,11 @@
private DocTypeService docTypeService;
@Override
+ public List<Order> selectComplete() {
+ return this.baseMapper.selectComplete();
+ }
+
+ @Override
public List<OrderDetl> selectWorkingDetls(Long orderId) {
return orderDetlMapper.selectWorkingDetls(orderId);
}
@@ -131,22 +136,23 @@
// 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
DocType docType = docTypeService.getById(order.getDocType());
if (null != docType && docType.getPakout() == 1) {
- if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId))) {
- throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
- }
- List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo, hostId);
- for (WrkDetl wrkDetl : wrkDetls) {
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(wrkDetl);
+ List<OrderDetl> orderDetlList = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId));
+// if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId))) {
+// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+// }
+// List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo, hostId);
+ for (OrderDetl orderDetl : orderDetlList) {
+// OrderDetl orderDetl = new OrderDetl();
+// orderDetl.sync(orderDetl1);
orderDetl.setQty(orderDetl.getAnfme());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(orderNo);
orderDetl.setStatus(1);
- orderDetl.setCreateTime(order.getCreateTime());
- orderDetl.setCreateBy(order.getCreateBy());
+// orderDetl.setCreateTime(order.getCreateTime());
+// orderDetl.setCreateBy(order.getCreateBy());
orderDetl.setUpdateTime(order.getUpdateTime());
orderDetl.setUpdateBy(order.getUpdateBy());
- if (!orderDetlService.save(orderDetl)) {
+ if (!orderDetlService.updateById(orderDetl)) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
}
@@ -179,4 +185,31 @@
return orderNameListDtos;
}
+
+ @Override
+ 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;
+ }
+ ArrayList<String> orderNameListDtos = new ArrayList<>();
+ for (Order order :list){
+ DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, order.getDocType()));
+
+ if (docType.getPakout() == 1){
+ orderNameListDtos.add(order.getOrderNo());
+ }
+ }
+
+ return orderNameListDtos;
+
+ }
}
--
Gitblit v1.9.1