From 6eecac9d82c970acf021669e3bb4cd782f36bbfe Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期三, 24 一月 2024 11:34:00 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 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 625f2f2..952e6da 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())); @@ -84,6 +84,7 @@ orderDetl.setQty(orderDetl.getAnfme()); orderDetl.setOrderId(order.getId()); orderDetl.setOrderNo(orderNo); + orderDetl.setStatus(1); orderDetl.setCreateTime(order.getCreateTime()); orderDetl.setCreateBy(order.getCreateBy()); orderDetl.setUpdateTime(order.getUpdateTime()); @@ -139,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; @@ -155,4 +160,19 @@ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId)); } + @Override + public List<Order> selectComplete() { + return this.baseMapper.selectComplete(); + } + + @Override + public boolean addToLogTable(Order order) { + return this.baseMapper.addToLogTable(order) > 0; + } + + @Override + public List<Order> selectorderNoL(String orderNo) { + return this.baseMapper.selectorderNoL(orderNo); + } + } -- Gitblit v1.9.1