From 2fbf3adb37334f90c29b1f119f0652f37a2608dc Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 19 十一月 2024 10:03:17 +0800
Subject: [PATCH] #优化

---
 src/main/java/com/zy/asrs/service/OrderService.java |   10 +++++-----
 1 files changed, 5 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 645a580..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);
 

--
Gitblit v1.9.1