From d2be6e4afe1dba009b56f8555792f2823f9e4535 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 22 二月 2021 10:34:59 +0800 Subject: [PATCH] 订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序 --- src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java index 07a1fdd..f8ea1b4 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java @@ -16,8 +16,8 @@ Integer pageSize); int getOpeWarehouseReserveTotalCount(String reagentId, String supplierId); List<OpeWarehouseReserve> getOpeWarehouseReserveListByName(String reagentId, String supplierId, Integer first, - Integer pageSize,String productSn); - int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn); + Integer pageSize,String productSn,String warehouseName); + int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn,String warehouseName); OpeWarehouseReserve getOpeWarehouseReserve(String reagentId, String articleNumber); OpeWarehouseReserve getOpeWarehouseReserve2(String reagentId, String articleNumber,String warehouseId); @@ -38,11 +38,11 @@ public List<OpeWarehouseReserve> selectByReId(String id); public void updateByReId(String newReId,String oldReId); - void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo); + void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo,String consigneeId); List<OpeWarehouseReserve> selectWarehouseByReagentIdAndArticleNumber(String id,String articleNumber,boolean flag); - void btWarehouseReserveReduce(List<OpeApplyReserve> opeList,String userId); + void btWarehouseReserveReduce(List<OpeApplyReserve> opeList); List<OpeWarehouseReserve> selectWarehouseByRidAndArticleNumberAndWarehouse(String id, String articleNumber, String warehouseId); -- Gitblit v1.9.2