From 19838a8bf458e94bed799363d11b35b517ab15df Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 18 十二月 2024 18:48:46 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 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 327edbb..dbab1fd 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java @@ -27,19 +27,19 @@ } @Override - public OrderDetl selectItem(Long orderId, String matnr, String batch) { - return this.baseMapper.selectItem(orderId, matnr, batch); + public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) { + return this.baseMapper.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3); } @Override - public OrderDetl selectItem(String orderNo, String matnr, String batch) { - return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch); + public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3) { + return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3); } @Override - public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) { + public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) { for (OrderDetl orderDetl : orderDetls) { - if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr)) { + if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr) && orderDetl.getBrand().equals(brand) && orderDetl.getStandby1().equals(standby1) && orderDetl.getStandby2().equals(standby2) && orderDetl.getStandby3().equals(standby3)) { if (Cools.eq(batch, orderDetl.getBatch())) { return orderDetl; } @@ -49,15 +49,15 @@ } @Override - public boolean increase(Long orderId, String matnr, String batch, Double qty) { - return this.baseMapper.increase(orderId, matnr, batch, qty) > 0; + public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) { + return this.baseMapper.increase(orderId, matnr, batch,brand,standby1,standby2,standby3, qty) > 0; } @Override - public boolean decrease(String orderNo, String matnr, String batch, Double qty) { - int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty); + public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) { + int decrease = this.baseMapper.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty); if (decrease == 0) { - return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0; + return this.baseMapper.decrease(orderNo, matnr, "",brand,standby1,standby2,standby3, qty) > 0; } else { return true; } @@ -74,8 +74,8 @@ } @Override - public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) { - return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0; + public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) { + return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty) > 0; } /** @@ -87,7 +87,7 @@ * @return */ @Override - public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) { - return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0; + public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty) { + return this.baseMapper.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3, workQty) > 0; } } -- Gitblit v1.9.1