From 3da43e60cd97ad330dcc0911d76bb3c395a65b0c Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期五, 02 七月 2021 12:09:38 +0800 Subject: [PATCH] 修改危废统计 --- src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 85 +++++++++++++++++++++++++----------------- 1 files changed, 51 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java index 1440034..1e1b3d6 100644 --- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java +++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java @@ -426,7 +426,8 @@ System.out.println(getUser().getSeeFlag().getKey()); //SysUser u=sysUserService.getSysUser(getUserId()); //System.out.println(u); - if (getUser().getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) { + if (getUser().getSeeFlag().getKey() != SeeFlag.MANAGE.getKey() + && getUser().getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) { editFlag=0; }else{ editFlag=1; @@ -1214,6 +1215,10 @@ int sum = 0; List<ApplyListDto> applyList = new ArrayList<>(); SysUser applyPersonInfo = sysUserService.getUser(userId); + if (applyPersonInfo == null) { + FacesUtils.warn("申领人不存在或者申领人部门被删除。"); + return; + } printTable.put("head", instituteName); printTable.put("title", "领用单"); printTable.put("applyPerson", applyPersonInfo.getName()); @@ -1495,6 +1500,10 @@ printTable = new Hashtable(); List<ApplyListDto> applyList = new ArrayList<>(); SysUser applyPersonInfo = sysUserService.getUser(userId); + if (applyPersonInfo == null) { + FacesUtils.warn("申领人不存在或者申领人部门被删除。"); + return; + } printTable.put("head", instituteName); printTable.put("title", "领用单"); printTable.put("applyPerson", applyPersonInfo.getName()); @@ -1747,22 +1756,23 @@ } catch (Exception e) { logger.error(e); } + selectedList = null; return list; } @Override public OpeWarehouseReserve getRowData(String rowKey) { - Iterator<OpeWarehouseReserve> iterator = this.iterator(); - if (iterator != null) { - OpeWarehouseReserve su = null; - while (iterator.hasNext()) { - su = iterator.next(); - if (rowKey.equals(su.getId())) { - return su; - } - } - } - return null; +// Iterator<OpeWarehouseReserve> iterator = this.iterator(); +// if (iterator != null) { +// OpeWarehouseReserve su = null; +// while (iterator.hasNext()) { +// su = iterator.next(); +// if (rowKey.equals(su.getId())) { +// return su; +// } +// } +// } + return opeWarehouseReserveService.getRowData(rowKey); } }; } @@ -1797,22 +1807,23 @@ } catch (Exception e) { logger.error(e); } + selectedListForPerson = null; return list; } @Override public OpeApplyReserve getRowData(String rowKey) { - Iterator<OpeApplyReserve> iterator = this.iterator(); - if (iterator != null) { - OpeApplyReserve su = null; - while (iterator.hasNext()) { - su = iterator.next(); - if (rowKey.equals(su.getId())) { - return su; - } - } - } - return null; +// Iterator<OpeApplyReserve> iterator = this.iterator(); +// if (iterator != null) { +// OpeApplyReserve su = null; +// while (iterator.hasNext()) { +// su = iterator.next(); +// if (rowKey.equals(su.getId())) { +// return su; +// } +// } +// } + return opeApplyService.getOpeApplyReserveListByNameForRowData(rowKey); } }; } @@ -2303,6 +2314,7 @@ this.reagentDStore.setReagent((SysReagent)event.getObject()); this.reagentDStoreEditFlag = Constants.ACTION_ADD; + onWarehouseSelectChange(null); RequestContext.getCurrentInstance().execute("PF('reagentDStoreDialog').show()"); } @@ -2312,6 +2324,11 @@ this.changeWarehouseContainerList(warehouseId); this.changeWarehouseContainerPlaceList(null); } + + public void onWarehouseContainerSelectChange(String warehouseContainerId) { + this.warehouseContainerPlaceList = null; + this.changeWarehouseContainerPlaceList(warehouseContainerId); + } private void changeWarehouseContainerList(String warehouseId) { if (StringUtils.isBlank(warehouseId)) { @@ -2653,17 +2670,17 @@ @Override public SysReagent getRowData(String rowKey) { - Iterator<SysReagent> iterator = this.iterator(); - if (iterator != null) { - SysReagent sr = null; - while (iterator.hasNext()) { - sr = iterator.next(); - if (rowKey.equals(sr.getId())) { - return sr; - } - } - } - return null; +// Iterator<SysReagent> iterator = this.iterator(); +// if (iterator != null) { +// SysReagent sr = null; +// while (iterator.hasNext()) { +// sr = iterator.next(); +// if (rowKey.equals(sr.getId())) { +// return sr; +// } +// } +// } + return sysReagentService.getSysReagentListNewRowData(rowKey); } }; } -- Gitblit v1.9.2