From 69048aa010cbd2671647c9f66ce0fd92ffda8d57 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 12 十二月 2022 11:06:10 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 50 insertions(+), 10 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 99f70f4..aa0f93e 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java @@ -1,21 +1,31 @@ package com.zy.asrs.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.core.common.Cools; -import com.zy.asrs.mapper.OrderDetlMapper; -import com.zy.asrs.entity.OrderDetl; -import com.zy.asrs.service.OrderDetlService; +import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.core.common.Cools; +import com.zy.asrs.entity.OrderDetl; +import com.zy.asrs.mapper.OrderDetlMapper; +import com.zy.asrs.service.OrderDetlService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.List; +@Slf4j @Service("orderDetlService") public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetl> implements OrderDetlService { @Override public List<OrderDetl> selectByOrderId(Long orderId) { return this.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)); + } + + @Override + public Page<OrderDetl> getPakoutPage(Page<OrderDetl> page) { + page.setRecords(baseMapper.getPakoutPage(page.getCondition())); + page.setTotal(baseMapper.getPakoutPageCount(page.getCondition())); + return page; } @Override @@ -32,16 +42,17 @@ 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; } } } return null; + } + + @Override + public boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty) { + return this.baseMapper.increaseAnfme(orderId, matnr, batch, qty) > 0; } @Override @@ -51,7 +62,36 @@ @Override public boolean decrease(String orderNo, String matnr, String batch, Double qty) { - return this.baseMapper.decrease(orderNo, matnr, batch, qty) > 0; + 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 List<OrderDetl> selectRemainder(Long orderId) { + return this.baseMapper.selectRemainder(orderId); + } + + @Override + public OrderDetl selectByMatnr(String matnr) { + List<OrderDetl> orderDetls = this.baseMapper.selectByMatnr(matnr); + if (!Cools.isEmpty(orderDetls)) { + if (orderDetls.size() > 1) { + log.error("{}鏉$爜鍚屾椂瀛樺湪澶氱瑪璁㈠崟锛岃娉ㄦ剰鏌ョ湅锛�", matnr); + } else { + return orderDetls.get(0); + } + } + return null; + } + + } -- Gitblit v1.9.1