From 33590e66e814b1c2e025e038410ef0006f4f38f7 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期一, 21 十月 2024 16:37:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
index 7af4d98..3bd6353 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
@@ -1,12 +1,33 @@
package com.zy.asrs.common.wms.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.common.domain.dto.OrderNameListDto;
import com.zy.asrs.common.wms.entity.Order;
+import com.zy.asrs.common.wms.entity.OrderDetl;
+import com.zy.asrs.common.wms.entity.WrkDetl;
+import com.zy.asrs.common.wms.entity.WrkMast;
+
+import java.util.List;
public interface OrderService extends IService<Order> {
+ List<OrderDetl> selectWorkingDetls(Long orderId);
+
void updateOrder1(Long orderId,Long userId);
- Order selectByNo(String orderNo);
+ Order selectByNo(String orderNo, Long hostId);
+
+ boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls, Long hostId);
+
+ boolean updateSettle(Long orderId, Long settle, Long userId, Long hostId);
+
+ void checkComplete(String orderNo, Long hostId);
+
+
+ List<OrderNameListDto> selectAllCombOrderNo(Long hostId);
+ List<OrderNameListDto> selectAllorderNo(Long hostId);
+ List<String> selectAllOutOrderNo(String orderNo,Long hostId);
+
+ List<Order> selectComplete();
}
--
Gitblit v1.9.1