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

zjj

2023-12-27 d814bde01eb91d1544b718463cd31317726bbf6b

 src/main/java/com/zy/asrs/service/OrderService.java

@@ -1,10 +1,8 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.*;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;

import java.util.List;

@@ -33,4 +31,8 @@
    void checkSettleUpdate(Long orderId);

    List<Order> selectToBeHistoryOrder(boolean isERP);

    List<OrderListDTO> selectAllorderNo();

    Page<Order> getOrderAll(Page<Order> page);
}