库单上要显示工作口， 需要已组好的排在后面，未组的排前面

skyouc

2025-08-05 4d0a406c204d3a9c590fc713a6dc2fce60b9d012

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java

@@ -6,13 +6,12 @@
import com.zy.asrs.framework.common.Cools;

import com.zy.asrs.framework.common.R;

import com.zy.asrs.framework.exception.CoolException;

import com.zy.asrs.wms.asrs.entity.MatField;

import com.zy.asrs.wms.asrs.entity.OrderDetl;

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

import com.zy.asrs.wms.asrs.entity.*;

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

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

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

import com.zy.asrs.wms.asrs.entity.template.OrderTemplate;

import com.zy.asrs.wms.asrs.service.CacheSiteService;

import com.zy.asrs.wms.asrs.service.MatFieldService;

import com.zy.asrs.wms.asrs.service.OrderTypeService;

import com.zy.asrs.wms.asrs.service.impl.OrderDetlServiceImpl;

@@ -21,7 +20,6 @@
import com.zy.asrs.wms.common.domain.BaseParam;

import com.zy.asrs.wms.common.domain.KeyValVo;

import com.zy.asrs.wms.common.domain.PageParam;

import com.zy.asrs.wms.asrs.entity.Order;

import com.zy.asrs.wms.asrs.service.OrderService;

import com.zy.asrs.wms.system.controller.BaseController;

import com.zy.asrs.wms.utils.ExcelUtil;

@@ -47,6 +45,8 @@
    private MatFieldService matFieldService;

    @Autowired

    private OrderDetlServiceImpl orderDetlService;

    @Autowired

    private CacheSiteService cacheSiteService;



    @PreAuthorize("hasAuthority('asrs:order:list')")

    @PostMapping("/order/page")

@@ -157,6 +157,12 @@
            Double sum = detls.stream().mapToDouble(OrderDetl::getAnfme).sum();

            order.setWaitQty(sum);

        }



        CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>()

                .eq(CacheSite::getOrderId, order.getId()), false);

        if (!Objects.isNull(cacheSite)) {

            order.setSite(cacheSite.getChannel());

        }

        return R.ok().add(order);

    }