From ece092e4c5d4e968b424421c6f78b065bbb0bd73 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期六, 24 八月 2024 15:13:10 +0800 Subject: [PATCH] #修复目标站显示错误问题 --- src/main/java/com/zy/asrs/service/OrderService.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java index 08eae7a..645a580 100644 --- a/src/main/java/com/zy/asrs/service/OrderService.java +++ b/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; @@ -18,8 +19,21 @@ void checkComplete(String orderNo); - boolean saveHandlerOrder(WrkMast wrkMast, List<WrkDetl> wrkDetls); + 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