From 7da4353b03a540e1de6f3b848a9613f84517db69 Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期四, 10 三月 2022 12:28:16 +0800 Subject: [PATCH] 申购后进入价格确认环节,可修改价格 --- src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 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..7f3b285 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); @@ -33,18 +33,23 @@ void reagentDStore3(List<OpeApply> reagentDStoreList, String loginUserId); - void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId); + void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId,String receiptNumber); 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); void updateBtReserve(String id,Integer useNum); + + //根据试剂Id查找当前库存 + int countByReagentId(String id); + + OpeWarehouseReserve getRowData(String rowKey); } -- Gitblit v1.9.2