From 290e5fd2e74efe19326f56e38c3391aaae23ffc5 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期三, 24 十二月 2025 17:14:09 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/asrs/service/OrderService.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 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 f30439c..667df16 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,8 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.*;
import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.OrderDetl;
import java.util.List;
@@ -10,8 +9,34 @@
Order selectByNo(String orderNo);
+ List<Order> selectBySettle(Long settle);
+
List<OrderDetl> selectWorkingDetls(Long orderId);
boolean updateSettle(Long orderId, Long settle, Long userId);
+ void checkComplete(String orderNo);
+
+ boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
+
+ void remove(Long orderId);
+
+ List<Order> selectComplete();
+ List<Order> selectComplete1();
+ List<Order> selectComplete99();
+ List<Order> selectComplete8();
+
+ boolean addToLogTable(Order order);
+
+ List<Order> selectorderNoL(String orderNo);
+
+ Order selectOrderMoveStatus();
+ Order selectOrderMoveStatusInitial();
+
+ /**
+ * 鏌ヨ鎹熸孩鍗曞畬缁撶殑璁㈠崟
+ * @return
+ */
+ List<CheckOrder> selectCompleteCheck();
+
}
--
Gitblit v1.9.1