From c61be765fe40fce1a57471a8fc8b93932c0a970c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期六, 02 四月 2022 15:37:50 +0800 Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs --- src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java index a823d3e..5a3dc21 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java @@ -24,14 +24,15 @@ } @Override + public OrderDetl selectItem(String orderNo, String matnr, String batch) { + return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch); + } + + @Override public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) { for (OrderDetl orderDetl : orderDetls) { if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr)) { - if (!Cools.isEmpty(batch)) { - if (orderDetl.getBatch().equals(batch)) { - return orderDetl; - } - } else { + if (Cools.eq(batch, orderDetl.getBatch())) { return orderDetl; } } @@ -43,4 +44,15 @@ public boolean increase(Long orderId, String matnr, String batch, Double qty) { return this.baseMapper.increase(orderId, matnr, batch, qty) > 0; } + + @Override + public boolean decrease(String orderNo, String matnr, String batch, Double qty) { + return this.baseMapper.decrease(orderNo, matnr, batch, qty) > 0; + } + + @Override + public boolean modifyStatus(Long orderId, Integer status) { + return this.baseMapper.modifyStatus(orderId, status) > 0; + } + } -- Gitblit v1.9.1