From c2168378d7af6950d1b8a3c749dfa0b0424de28c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期二, 05 十一月 2024 14:42:17 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/OrderService.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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..97876c7 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,10 +14,26 @@
boolean updateSettle(Long orderId, Long settle, Long userId);
- void checkComplete(String orderNo);
+ boolean updateSettle2(Long orderId, Long settle, Integer pltType,String inTime);
- boolean saveHandlerOrder(WrkMast wrkMast, List<WrkDetl> wrkDetls);
+
+ void checkComplete(String orderNo, Integer pltType);
+
+ 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