From 1dca57c0f15c3cdfbebf14ad1e9e04d8c84e775c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 07 三月 2026 09:51:47 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 136 +++++++++++++++++++++++++++++++++------------
1 files changed, 100 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 0262ca7..135f19c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
@Slf4j
@Service("orderService")
@@ -47,6 +49,15 @@
}
@Override
+ public List<Order> selectBySettle(Long settle) {
+ List<Order> orderList = this.selectList(new EntityWrapper<Order>().eq("settle", settle));
+ if (Cools.isEmpty(orderList)) {
+ return new ArrayList<>();
+ }
+ return orderList;
+ }
+
+ @Override
public List<OrderDetl> selectWorkingDetls(Long orderId) {
return orderDetlMapper.selectWorkingDetls(orderId);
}
@@ -59,7 +70,7 @@
@Override
public void checkComplete(String orderNo) {
Order order = this.selectByNo(orderNo);
- if (order.getSettle() >= 4L) {
+ if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
return;
}
List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
@@ -105,44 +116,59 @@
@Override
public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
try {
- List<DetlDto> detlDtos = new ArrayList<>();
- wrkDetls.forEach(wrkDetl -> {
- detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
- });
- String orderNo = "HAND" + snowflakeIdWorker.nextId();
- if (pakin) {
- // 鐢熸垚鍏ュ簱鍗曟嵁
- OpenOrderPakinParam openParam = new OpenOrderPakinParam();
- openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
- openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
- openParam.setOrderDetails(detlDtos);
- openService.pakinOrderCreate(openParam);
- } else {
- // 鐢熸垚鍑哄簱鍗曟嵁
- OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
- openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
- openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
- openParam.setOrderDetails(detlDtos);
- openService.pakoutOrderCreate(openParam);
- }
- Order order = this.selectByNo(orderNo);
- if (null == order) {
- throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
- }
- if (!this.updateSettle(order.getId(), 4L, null)) {
- throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
- }
- for (DetlDto detlDto : detlDtos) {
- // 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
- throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
+// String orderNo = "HAND" + snowflakeIdWorker.nextId();
+// if (pakin) {
+// // 鐢熸垚鍏ュ簱鍗曟嵁
+// OpenOrderPakinParam openParam = new OpenOrderPakinParam();
+// openParam.setOrderNo(orderNo);
+// openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+// openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
+// openParam.setOrderDetails(detlDtos);
+// openService.pakinOrderCreate(openParam);
+// } else {
+// // 鐢熸垚鍑哄簱鍗曟嵁
+// OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
+// openParam.setOrderNo(orderNo);
+// openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+// openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
+// openParam.setOrderDetails(detlDtos);
+// openService.pakoutOrderCreate(openParam);
+// }
+
+
+ Map<String, List<WrkDetl>> listMap = wrkDetls.stream().collect(Collectors.groupingBy(WrkDetl::getOrderNo));
+
+ listMap.keySet().forEach(orderNo -> {
+ Order order = this.selectByNo(orderNo);
+ if (null == order) {
+ throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
}
- }
+ if (!this.updateSettle(order.getId(), 4L, null)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+
+ List<DetlDto> detlDtos = new ArrayList<>();
+ listMap.get(orderNo).forEach(wrkDetl -> {
+ detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme(), wrkDetl.getThreeCode()));
+ });
+
+ for (DetlDto detlDto : detlDtos) {
+ // 淇敼璁㈠崟鏄庣粏鏁伴噺
+ if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(),detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
+ }
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(),detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
+ }
+ });
+
+
} catch (Exception e) {
- log.error("", e);
+ log.error("saveHandlerOrder===>>", e);
return false;
}
return true;
@@ -162,8 +188,46 @@
}
@Override
+ public List<Order> selectComplete1() {
+ return this.baseMapper.selectComplete1();
+ }
+
+ @Override
+ public List<Order> selectComplete99() {
+ return this.baseMapper.selectComplete99();
+ }
+
+ @Override
+ public List<Order> selectComplete8() {
+ return this.baseMapper.selectComplete8();
+ }
+
+ @Override
public boolean addToLogTable(Order order) {
return this.baseMapper.addToLogTable(order) > 0;
}
+ @Override
+ public List<Order> selectorderNoL(String orderNo) {
+ return this.baseMapper.selectorderNoL(orderNo);
+ }
+
+ @Override
+ public Order selectOrderMoveStatus() {
+ return this.baseMapper.selectOrderMoveStatus();
+ }
+ @Override
+ public Order selectOrderMoveStatusInitial() {
+ return this.baseMapper.selectOrderMoveStatusInitial();
+ }
+
+ /**
+ * 鏌ヨ鎹熸孩鍗曞畬缁撶殑璁㈠崟
+ * @return
+ */
+ @Override
+ public List<CheckOrder> selectCompleteCheck() {
+ return this.baseMapper.selectCompleteCheck();
+ }
+
}
--
Gitblit v1.9.1