From 48e75f8b9bd83aea8e0c3ca252ceec6bbde9e060 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 十二月 2023 20:33:06 +0800
Subject: [PATCH] #检料盘点工作档更新

---
 src/main/java/com/zy/asrs/service/OrderService.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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..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;
 
@@ -22,6 +23,17 @@
 
     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