From bcb19e8c93c3cabf0d8eb3ee34ed819b3c5a10ef Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期一, 25 十一月 2024 13:14:11 +0800 Subject: [PATCH] #优化地图 --- src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 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 46f1a15..b0e109e 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java @@ -26,18 +26,30 @@ @Override public Page<OrderDetl> getPakoutPage(Page<OrderDetl> page) { page.setRecords(baseMapper.getPakoutPage(page.getCondition())); - page.setTotal(baseMapper.getPakoutPageCount(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); + public Page<OrderDetl> getOrderDetlByDoctype(Page<OrderDetl> page) { + page.setRecords(baseMapper.getOrderDetlByDoctype(page.getCondition())); + page.setTotal(baseMapper.getOrderDetlByDoctypeCount(page.getCondition())); + return page; } @Override - public OrderDetl selectItem(String orderNo, String matnr, String batch) { - return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch); + public OrderDetl selectItem(Long orderId, String matnr, String batch, String csocode, String isoCode) { + return this.baseMapper.selectItem(orderId,matnr,batch,csocode,isoCode); + } + + @Override + public OrderDetl selectItem(String orderNo, String matnr, String batch, String csocode, String isoCode) { + return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,csocode,isoCode); + } + + @Override + public OrderDetl selectItem(String orderNo, String matnr, String threeCode) { + return this.baseMapper.selectItemByOrderNo2(orderNo, matnr, threeCode); } @Override @@ -63,20 +75,20 @@ } @Override - public boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty) { - return this.baseMapper.increaseAnfme(orderId, matnr, batch, qty) > 0; + public boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty, String csocode, String isoCode) { + return this.baseMapper.increaseAnfme(orderId, matnr, batch, qty, csocode, isoCode) > 0; } @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, Double qty, String csocode, String isoCode) { + return this.baseMapper.increase(orderId, matnr, batch, qty, csocode, isoCode) > 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, Double qty, String csocode, String isoCode) { + int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty, csocode, isoCode); if (decrease == 0) { - return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0; + return this.baseMapper.decrease(orderNo, matnr, null, qty, csocode, isoCode) > 0; } else { return true; } @@ -109,8 +121,8 @@ @Override public OrderDetl selectByOrderNoAndMatnr(String orderNo, String matnr, String csocode, String isoseq) { Wrapper<OrderDetl> wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("matnr", matnr); - Utils.wapperSetCondition(wrapper,"csocode",csocode); - Utils.wapperSetCondition(wrapper,"isoseq",isoseq); + Utils.wapperSetCondition(wrapper,"three_code",csocode); + Utils.wapperSetCondition(wrapper,"dead_time",isoseq); return this.selectOne(wrapper); } -- Gitblit v1.9.1