Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

2025-12-29 13796df077a2ccba587667e233f7cb48ea6c73b6

 tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java

@@ -55,7 +55,9 @@
    public TableDataInfo costList(TmsDispatchOrder tmsDispatchOrder)
    {
        startPage();
        tmsDispatchOrder.setInStatusList(Arrays.asList(2,3,4,6,7,8,9));
        if (tmsDispatchOrder.getInStatusList() == null || tmsDispatchOrder.getInStatusList().isEmpty()){
            tmsDispatchOrder.setInStatusList(Arrays.asList(2,3,4,6,7,8,9));
        }
        List<TmsDispatchOrder> list = tmsDispatchOrderService.selectTmsDispatchOrderList(tmsDispatchOrder);
        return getDataTable(list);
    }