From bb0ffb47062be1fab4817a81d93ea0b2c9eb7603 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期五, 12 三月 2021 08:21:02 +0800 Subject: [PATCH] 用户新建改 --- src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java index 527e594..2962b20 100644 --- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java +++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java @@ -542,6 +542,12 @@ selectedInputStorageTmpOrderList = null; } + public void hideInputStorageTmp(){ + selectedInputStorageTmpOrderList = null; + + RequestContext.getCurrentInstance().execute("document.getElementById('putInStorage').style.display='none'"); + } + public void cancel(){ if (trulySelectedList == null || trulySelectedList.size()<=0){ FacesUtils.info("至少选择一个"); @@ -1552,6 +1558,7 @@ //} this.opeWarehouseReserveService.claim(list, userId,projectNum); } + if(list2.size()>0&&list2!=null){ List<OpeApply> opeList=new ArrayList<>(); //this.opeApplyService.getOpeApplyList(null,null,null,null,null) @@ -1647,6 +1654,13 @@ */ public void onSaveInputWarehouseClick(){ try{ + //0.0输入校验 + for (OpeApplyReserve opeApplyReserve : opeApplyList) { + if (StringUtils.isBlank(opeApplyReserve.getArticleNumber())) { + throw new BusinessException(ExceptionEnumCode.PARAM_EXIST, opeApplyReserve.getReagent().getName() + ":批号不能为空"); + } + } + //用来检验提交表单得试剂条码是否重复 Map<String,Boolean> checkTable= new HashMap<>(); if (opeApplyList != null && opeApplyList.size() > 0) { @@ -2737,7 +2751,7 @@ // this.oriLaboratoryId = this.laboratory.get(0).getId(); //} - this.laboratoryId= laboratoryId==null?this.laboratory.get(0).getId():laboratoryId; + this.laboratoryId = this.laboratory.get(0).getId(); this.laboratoryContainers = this.sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryId); }else { this.oriLaboratoryId = null; -- Gitblit v1.9.2