Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master int...

skyouc

2025-07-05 8c4b2879bf6750951ed24643fc7faecf220e41e0

Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/OrderOutMergeDto.java

@@ -8,7 +8,6 @@
import java.util.List;



@Data

@Accessors(chain = true)

public class OrderOutMergeDto {



    private Long locId;


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java

@@ -1496,12 +1496,12 @@
                continue;

            }

            OrderOutMergeDto outMergeParam = new OrderOutMergeDto();

            outMergeParam.setAnfme(outLocDetl.getAnfme())

                    .setLocNo(outLocDetl.getLocNo())

                    .setLocDetlId(detl.getId())

                    .setLocId(detl.getLocId())

                    .setMatnr(outLocDetl.getMatnr())

                    .setBatch(detl.getBatch());

            outMergeParam.setAnfme(outLocDetl.getAnfme());

            outMergeParam.setLocNo(outLocDetl.getLocNo());

            outMergeParam.setLocDetlId(detl.getId());

            outMergeParam.setLocId(detl.getLocId());

            outMergeParam.setMatnr(outLocDetl.getMatnr());

            outMergeParam.setBatch(detl.getBatch());

            orders.add(outMergeParam);



            //根据库位ID分组


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

@@ -92,6 +92,12 @@
    @Override

    @Transactional(rollbackFor = Exception.class)

    public boolean batchMergeOrders(BatchMergeOrdersParam ordersParam) {



        Loc locServiceOne = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, ordersParam.getMergeNo()), false);

        if (!Objects.isNull(locServiceOne)) {

            throw new CoolException("托盘已入库，不能再组托！！");

        }



        Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, ordersParam.getOrderNo()));

        if (Objects.isNull(order)) {

            throw new CoolException("订单不存在！！");

@@ -211,9 +217,7 @@
            }

        });



        if (!waitPakinService.removeBatchByIds(waitPakins)) {

            throw new CoolException("组拖档删除失败！！");

        }



        //通过组拖订单ID获取订单，并删除原单据，加入单据历史档

        Set<Long> list = waitPakins.stream().map(WaitPakin::getOrderId).collect(Collectors.toSet());

        List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getId, list));

@@ -232,32 +236,34 @@
            }

        });



        //删除订单数据

        if (!orderService.removeBatchByIds(orders)) {

            throw new CoolException("订单删除失败！！");

//        //删除订单数据

//        if (!orderService.removeBatchByIds(orders)) {

//            throw new CoolException("订单删除失败！！");

//        }



//        List<OrderDetl> detls = orderDetlMapper.selectList(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list));

//        List<OrderDetlLog> detlLogs = new ArrayList<>();

//        detls.forEach(delt ->{

//            OrderDetlLog detlLog = new OrderDetlLog();

//            BeanUtils.copyProperties(delt, detlLog);

//            detlLog.setQty(delt.getWorkQty());

//            detlLog.setWorkQty(0.0);

//            detlLog.setId(null);

//            detlLogs.add(detlLog);

//        });



//        //订单明细转历史档

//        if (!orderDetlLogService.saveBatch(detlLogs)) {

//            throw new CoolException("订单明细转历史失败！！");

//        }

//

//        //删除订单明细数据

//        if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list))) {

//            throw new CoolException("订单明细删除失败！！");

//        }

        if (!waitPakinService.removeBatchByIds(waitPakins)) {

            throw new CoolException("组拖档删除失败！！");

        }



        List<OrderDetl> detls = orderDetlMapper.selectList(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list));

        List<OrderDetlLog> detlLogs = new ArrayList<>();

        detls.forEach(delt ->{

            OrderDetlLog detlLog = new OrderDetlLog();

            BeanUtils.copyProperties(delt, detlLog);

            detlLog.setQty(delt.getWorkQty());

            detlLog.setWorkQty(0.0);

            detlLog.setId(null);

            detlLogs.add(detlLog);

        });



        //订单明细转历史档

        if (!orderDetlLogService.saveBatch(detlLogs)) {

            throw new CoolException("订单明细转历史失败！！");

        }



        //删除订单明细数据

        if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list))) {

            throw new CoolException("订单明细删除失败！！");

        }



        return true;

    }