From 422622d3121acde709e79ca9b92f30c47e05272c Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期日, 07 二月 2021 14:38:12 +0800 Subject: [PATCH] 修改枪领用 --- src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java index 008d127..8f4bf0e 100644 --- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java +++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java @@ -47,8 +47,8 @@ /** * Created by cmower on 17/11/20. */ -@Controller @PropertySource(value = "WEB-INF/config.properties",encoding = "utf-8") +@Controller @Scope("session") public class WarehouseStockMngController extends BaseController { @@ -624,7 +624,7 @@ FacesUtils.info("至少选择一个"); return; } - + this.userId = getUser().getId(); this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW, Constants.PAGE_WAREHOUSE_STOCK_MNG); } // @@ -649,6 +649,8 @@ } } checkTable = null; + // + this.userId = selectedTmpOrderList.get(0).getApplyUser(); this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW_PERSON, Constants.PAGE_WAREHOUSE_STOCK_MNG); } @@ -1539,6 +1541,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) @@ -1634,6 +1637,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) { @@ -2724,7 +2734,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