From 401da88caef79968c8c0b1cb15487c4a554761ec Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期三, 23 十月 2024 14:37:04 +0800 Subject: [PATCH] 测试环境暂时注释 --- src/main/java/com/zy/asrs/service/OrderService.java | 22 +++++++++++++++++----- 1 files changed, 17 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 d29343c..e48f8b2 100644 --- a/src/main/java/com/zy/asrs/service/OrderService.java +++ b/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.service.IService; -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; @@ -16,12 +14,26 @@ boolean updateSettle(Long orderId, Long settle, Long userId); - void checkComplete(String orderNo); + boolean updateSettle2(Long orderId, Long settle, Integer pltType); + + + void checkComplete(String orderNo, String locNo); 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