From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 01 二月 2021 10:19:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master --- src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java index 9924439..e84cdfa 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java @@ -530,7 +530,7 @@ } @Override - public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status) { + public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply) { try { Map<String, Object> params = new HashMap<String, Object>(); params.put("reagentName", reagentName); @@ -539,6 +539,7 @@ params.put("productSn",productSn); params.put("applyCode",applyCode); params.put("status",status); + params.put("isAllApply",isAllApply); return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params); } catch (DataAccessException e) { logger.error(e.getMessage(), e); @@ -548,7 +549,7 @@ } @Override public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first, - Integer pageSize,String productSn,String applyCode,Integer status) { + Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply) { try { Map<String, Object> params = new HashMap<String, Object>(); params.put("reagentName", reagentName); @@ -559,6 +560,7 @@ params.put("productSn",productSn); params.put("applyCode",applyCode); params.put("status",status); + params.put("isAllApply",isAllApply); return this.opeApplyDao.getOpeApplyReserveListFor(params); } catch (DataAccessException e) { logger.error(e.getMessage(), e); @@ -682,12 +684,12 @@ if (codeList == null){ //无条码入库 不需要增加状态和流向 //1.1库存表增加 - opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo); + opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId); }else{ //条码入库 assert codeList.size() > 0; //1.1入库(库存表增加) - opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo); + opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId); //1.2试剂状态表增加,流向增加 opeReagentStatusService.orderInputWarehouseReagentStatusAndUseFlow(opeApplyReserve,consigneeId,codeList,oo); } -- Gitblit v1.9.2