From 85f15182f6a6d97ad86739967e59e80299e1b98f Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 09 九月 2025 14:14:10 +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/OrderService.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderService.java index 0bac41c..a673372 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderService.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderService.java @@ -10,9 +10,9 @@ public interface OrderService extends IService<Order> { - boolean createOrder(CreateOrderParam param); + boolean createOrder(CreateOrderParam param, Long userId); - boolean createOrder(List<CreateOrderParam> list); + boolean createOrder(List<CreateOrderParam> list, Long userId); boolean updateOrder(UpdateOrderParam param); @@ -22,5 +22,7 @@ Order selectByBarcode(String barcode); - List<OrderInfoDto> getDetlForOrderId(Long id); + List<OrderInfoDto> getDetlForOrderId(Long id, String matnr); + + Order doneOrder(Long id); } -- Gitblit v1.9.1