From 8ca385d65454fb8e993970a768ed3ad5c3a095ab Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 18 一月 2025 13:44:44 +0800
Subject: [PATCH] 优化库位检索逻辑，修复代码并添加新功能
---
src/main/java/com/zy/asrs/service/OrderService.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 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 2716ac4..722bdf4 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;
@@ -14,10 +12,33 @@
List<OrderDetl> selectWorkingDetls(Long orderId);
+ boolean updateTel(Long orderId, String tel);
+
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);
+
+ void checkComplete2(String orderNo);
+
+ 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