From 18d68d8f70a6a434f6fda012299ae1b219c81ed7 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期二, 19 十一月 2024 13:31:48 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/OrderService.java | 12 +++++++-----
1 files changed, 7 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 7e4380a..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,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;
@@ -17,7 +14,10 @@
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);
boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
@@ -34,4 +34,6 @@
List<Order> selectorderNoL(String orderNo);
+ List<Order> selectToBeHistoryOrder();
+
}
--
Gitblit v1.9.1