123

zhang

3 天以前 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85

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

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

import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.common.model.OrderMergeVo;

import java.util.List;

@@ -13,6 +14,8 @@
    Order selectByNo(String orderNo);

    List<OrderDetl> selectWorkingDetls(Long orderId);

    List<OrderDetl> selectTotalDetls(Long orderId);

    boolean updateSettle(Long orderId, Long settle, Long userId);

@@ -24,4 +27,16 @@

    List<Order> selectComplete();

    /**
     * 订单合并预览
     */
    List<OrderMergeVo> mergePreview(List<Long> ids);

    /**
     * 查询上报完结历史档
     * @return
     */
    List<Order> selectToBeHistoryOrder();

    List<Order> selectOrderNoL(String orderNo);
}