From b4ec8b4cc3476b49b9bc47e11ec03c4eecaba880 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期四, 06 三月 2025 19:27:52 +0800 Subject: [PATCH] 四期 --- src/main/java/com/zy/asrs/service/OrderService.java | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java index f5b50e5..722bdf4 100644 --- a/src/main/java/com/zy/asrs/service/OrderService.java +++ b/src/main/java/com/zy/asrs/service/OrderService.java @@ -1,10 +1,7 @@ package com.zy.asrs.service; 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.asrs.entity.*; import com.zy.common.model.OrderMergeVo; import java.util.List; @@ -15,19 +12,33 @@ List<OrderDetl> selectWorkingDetls(Long orderId); + boolean updateTel(Long orderId, String tel); + boolean updateSettle(Long orderId, Long settle, Long userId); - void checkComplete(String orderNo); + boolean updateSettle2(Long orderId, Long settle, Integer pltType,String inTime); + + + void checkComplete(String orderNo, Integer pltType); + + void checkComplete2(String orderNo); boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls); void remove(Long orderId); + void report(Long orderId, String username); + List<Order> selectComplete(); + /** * 璁㈠崟鍚堝苟棰勮 */ List<OrderMergeVo> mergePreview(List<Long> ids); + List<Order> selectorderNoL(String orderNo); + + List<Order> selectToBeHistoryOrder(); + } -- Gitblit v1.9.1