Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs

zyx

2024-07-04 cb1f6d4df311494908b6ca50ac9a7e1fbfd5861f

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

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

import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.*;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.OrderDetl;

import java.util.List;

@@ -10,6 +9,27 @@

    Order selectByNo(String orderNo);

    List<OrderDetl> selectWorkingDetls(String orderNo);
    List<OrderDetl> selectWorkingDetls(Long orderId);

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

    void checkComplete(String orderNo);

//    boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);

    void remove(Long orderId);

    List<Order> selectComplete();

    boolean addToLogTable(Order order);

    void BackToInit(String orderNo);

    List<Order> selectInOrOutOrders(boolean inOrders);

    void checkSettleUpdate(Long orderId);

    List<Order> selectToBeHistoryOrder(boolean isERP);

    List<OrderListDTO> selectAllorderNo();
}