From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlService.java |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlService.java
index 086cd63..95d7a83 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlService.java
@@ -1,12 +1,19 @@
-package com.zy.asrs.wms.asrs.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wms.asrs.entity.OrderDetl;
-
-import java.util.List;
-
-public interface OrderDetlService extends IService<OrderDetl> {
-
-    List<OrderDetl> getOrderDetlByOrderId(Long orderId);
-
-}
+package com.zy.asrs.wms.asrs.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wms.asrs.entity.OrderDetl;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
+
+import java.util.List;
+
+public interface OrderDetlService extends IService<OrderDetl> {
+
+    List<OrderDetl> getOrderDetlByOrderId(Long orderId);
+
+    List<OrderDetl> parseDetl(List<OrderDetl> list);
+
+    IPage<OrderDetl> pageByType(PageParam<OrderDetl, BaseParam> pageParam, QueryWrapper<OrderDetl> queryWrapper);
+}

--
Gitblit v1.9.1