no message

skyouc

2025-07-08 958951ca8ce8c9eb1a592d2f2b13500bd0ce815a

no message

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java

@@ -6,6 +6,7 @@
import com.zy.asrs.wms.asrs.entity.*;

import com.zy.asrs.wms.asrs.entity.dto.OrderInfoDto;

import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;

import com.zy.asrs.wms.asrs.entity.enums.OrderType;

import com.zy.asrs.wms.asrs.entity.param.CreateOrderParam;

import com.zy.asrs.wms.asrs.entity.param.UpdateOrderParam;

import com.zy.asrs.wms.asrs.mapper.OrderMapper;

@@ -36,6 +37,8 @@
    private OrderNoRuleService orderNoRuleService;

    @Autowired

    private OrderUtils orderUtils;

    @Autowired

    private WaitPakinService waitPakinService;



    @Override

    @Transactional

@@ -257,6 +260,10 @@
            throw new CoolException("订单已经生成波次，删除失败");

        }



        List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getOrderId, orderId));

        if (!waitPakins.isEmpty()) {

            throw new CoolException("单据已生成组托，不可执行删除操作！！");

        }

        //删除订单

        this.removeById(orderId);

        //删除明细


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java

@@ -60,7 +60,8 @@
        }



        //可用数量

        Double count = Math.round((orderDetl.getAnfme() - orderDetl.getWorkQty() - orderDetl.getQty()) * 1000) / 1000.0;

//        Double count = orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty() - orderDetl.getWaitQty();

        Double count = Math.round((orderDetl.getAnfme() - orderDetl.getWorkQty() - orderDetl.getQty() - orderDetl.getWaitQty()) * 1000) / 1000.0;

        if (waitPakin.getAnfme() > count) {

            throw new CoolException("组托数量超过剩余可用数量");

        }