From 20bd270fbecc8356a17b1b429eb97abe1a48700e Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 09 七月 2025 16:43:37 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 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 4b978d1..3fa481c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -59,7 +59,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()));
@@ -114,17 +114,17 @@
// 鐢熸垚鍏ュ簱鍗曟嵁
OpenOrderPakinParam openParam = new OpenOrderPakinParam();
openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+ openParam.setInboundDate(DateUtils.convert(wrkMast.getModiTime()));
openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
- openParam.setOrderDetails(detlDtos);
+ openParam.setDetails(detlDtos);
openService.pakinOrderCreate(openParam);
} else {
// 鐢熸垚鍑哄簱鍗曟嵁
OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+ openParam.setInboundDate(DateUtils.convert(wrkMast.getModiTime()));
openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
- openParam.setOrderDetails(detlDtos);
+ openParam.setDetails(detlDtos);
openService.pakoutOrderCreate(openParam);
}
@@ -140,9 +140,13 @@
if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
}
} catch (Exception e) {
- log.error("", e);
+ log.error("saveHandlerOrder===>>", e);
return false;
}
return true;
@@ -162,8 +166,27 @@
}
@Override
- public void addToLogTable(Order order) {
- this.baseMapper.addToLogTable(order);
+ 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();
}
}
--
Gitblit v1.9.1