From d8d107072cde858bdc4d23318c56d52e91f28c93 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期五, 21 七月 2023 09:47:13 +0800 Subject: [PATCH] #wrkmast==>sheetNo:徐工汉云拆垛标记 0: 未拆 1: 已拆 2:已处理可下一步(转历史档) --- src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 52 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..327edbb 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java @@ -1,6 +1,7 @@ package com.zy.asrs.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.core.common.Cools; import com.zy.asrs.mapper.OrderDetlMapper; import com.zy.asrs.entity.OrderDetl; @@ -19,19 +20,27 @@ } @Override + public Page<OrderDetl> getPakoutPage(Page<OrderDetl> page) { + page.setRecords(baseMapper.getPakoutPage(page.getCondition())); + page.setTotal(baseMapper.getPakoutPageCount(page.getCondition())); + return page; + } + + @Override public OrderDetl selectItem(Long orderId, String matnr, String batch) { return this.baseMapper.selectItem(orderId, matnr, batch); + } + + @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 +52,42 @@ 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) { + int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty); + if (decrease == 0) { + return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0; + } else { + return true; + } + } + + @Override + public boolean modifyStatus(Long orderId, Integer status) { + return this.baseMapper.modifyStatus(orderId, status) > 0; + } + + @Override + public boolean addToLogTable(OrderDetl orderDetl) { + return this.baseMapper.addToLogTable(orderDetl) > 0; + } + + @Override + public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) { + return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0; + } + + /** + * 鍏ュ嚭搴撲换鍔$敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲� + * @param orderId + * @param matnr + * @param batch + * @param workQty + * @return + */ + @Override + public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) { + return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0; + } } -- Gitblit v1.9.1