From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
index 5f9e5c8..70a771e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
@@ -3,18 +3,33 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import java.util.List;
import java.util.Map;
-public interface AsnOrderService extends IService<AsnOrder> {
+public interface AsnOrderService extends IService<WkOrder> {
- boolean notifyInspect(List<AsnOrder> orders);
+ boolean notifyInspect(List<WkOrder> orders);
- R generateBarcode(List<AsnOrder> orders);
+ List<WkOrder> getListByMatnr(Map<String, String> params);
- List<AsnOrder> getListByMatnr(Map<String, String> params);
+ R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) throws Exception;
- R saveOrderAndItems(AsnOrderAndItemsParams params);
+ R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception;
+
+ boolean batchUpdate(BatchUpdateParam params, Long loginUserId);
+
+ R completeOrder(Long id, Long loginUserId);
+
+ R closeOrder(Long id);
+
+ R createByPo(Map<String, Object> params);
+
+ R removeOrders(List<Long> list);
+
+ R getDashbord();
+
+ R getStockTrand();
}
--
Gitblit v1.9.1