Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-15 edd30bf5081f3e267a8d21c1e60ee102a1a1acec

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

@@ -3,6 +3,8 @@
import com.zy.asrs.entity.Order;
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;

@@ -10,6 +12,16 @@

    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();

}