pjb
2025-03-08 83b51a5a0774ea8ecb9a06304af3b956a21307c8
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
@@ -5,6 +5,7 @@
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.OrderPickStatus;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.asrs.mapper.*;
import com.zy.asrs.wms.asrs.service.OrderDetlService;
@@ -14,6 +15,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -59,7 +61,7 @@
        List<CacheSite> sites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, waveSeed.getOrderNo()));
        if (sites.isEmpty()) {
            throw new CoolException("当前订单未绑定播种库位,请绑定后再操作!!");
            throw new CoolException("当前订单未绑定播种库位,请使用PDA->地标绑定,功能绑定后再操作!!");
        }
        Double stock = Optional.of(waveSeed.getAnfme() - waveSeed.getWorkQty()).orElse(0.0D);
@@ -80,12 +82,36 @@
        if (Objects.isNull(orderDetl)) {
            throw new CoolException("当前播种订单明细不存在!!");
        }
        orderDetl.setWorkQty(orderDetl.getWorkQty() + param.getReviewNum());
        if (orderDetl.getWorkQty() + orderDetl.getQty() > orderDetl.getAnfme()) {
        if (param.getReviewNum() + orderDetl.getQty() > orderDetl.getAnfme()) {
            throw new CoolException("请核对明细数量后,再进行操作!!");
        }
        //如果拣货数量与订单明细数量相等,表明拣货完成
        if (new BigDecimal(param.getReviewNum() + orderDetl.getQty()).compareTo(new BigDecimal(orderDetl.getAnfme())) == 0) {
            orderDetl.setPickStatus(OrderPickStatus.ORDER_PICK_STATUS_DONE.val);
        } else {
            orderDetl.setPickStatus(OrderPickStatus.ORDER_PICK_STATUS_SECTION.val);
        }
        if (orderDetlMapper.updateById(orderDetl) < 1) {
            throw new CoolException("订单明细数量更新失败");
            throw new CoolException("订单状态更新失败!!");
        }
        List<OrderDetl> detls = orderDetlMapper.selectList(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderNo, orderDetl.getOrderNo()));
        List<OrderDetl> detlList = detls.stream().filter(ord -> {
            return ord.getPickStatus() != OrderPickStatus.ORDER_PICK_STATUS_DONE.val;
        }).collect(Collectors.toList());
        int update;
        if (detlList.isEmpty()) {
             update = orderMapper.update(new LambdaUpdateWrapper<Order>().eq(Order::getOrderNo, orderDetl.getOrderNo()).set(Order::getPickStatus, OrderPickStatus.ORDER_PICK_STATUS_DONE.val));
        } else {
            update = orderMapper.update(new LambdaUpdateWrapper<Order>().eq(Order::getOrderNo, orderDetl.getOrderNo()).set(Order::getPickStatus, OrderPickStatus.ORDER_PICK_STATUS_SECTION.val));
        }
        if (update < 1) {
            throw new CoolException("原始订单主单拣货状态更新失败!!");
        }
        waveSeed.setUpdateTime(new Date());