From 637e8436a33cbc4ea04d4fc68763debaba8412c4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 11 八月 2025 14:19:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/asrs/service/OrderService.java | 8 ++++++--
1 files changed, 6 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 632ea83..0591117 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,7 +1,7 @@
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;
@@ -18,7 +18,7 @@
boolean updateSettle(Long orderId, Long settle, Long userId);
- boolean updateSettleStep(Long orderId, Long settle, Long userId, Integer step);
+ boolean updateSettleStep(Long orderId, Long settle, Long userId, Integer step, String memo, String remark);
void checkComplete(String orderNo);
@@ -27,8 +27,11 @@
void remove(Long orderId);
List<Order> selectComplete();
+
List<Order> selectComplete1();
+
List<Order> selectComplete99();
+
List<Order> selectComplete8();
boolean addToLogTable(Order order);
@@ -36,6 +39,7 @@
List<Order> selectorderNoL(String orderNo);
Order selectOrderMoveStatus();
+
Order selectOrderMoveStatusInitial();
}
--
Gitblit v1.9.1