From bed735aae42b6e0c75bf3fd63d9cd0996fba9355 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 21 五月 2025 14:21:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 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 48a58aa..6a9eb9b 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,6 +3,7 @@ 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.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrder; import java.util.List; @@ -14,7 +15,17 @@ List<AsnOrder> getListByMatnr(Map<String, String> params); - R saveOrderAndItems(AsnOrderAndItemsParams params); + R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) throws Exception; - R updateOrderItem(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); } -- Gitblit v1.9.1