修改导入申购

李宇

2021-07-12 cf6b965a86065a537a40c74f67e88a04447d2582

 src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java

@@ -1536,6 +1536,29 @@
               list2.add(selectWarehouseReserve);
            }
         }

         //list2为补贴条码,检查条码重复
         ArrayList<String> checkList = new ArrayList<>();
         if (list2.size() > 0) {
            for (OpeWarehouseReserve owr : list2) {
               checkList.addAll(owr.getReagentCodes());
            }
         }

         Set<String> checkTable = new HashSet<>();
         if (checkList.size() > 0) {
            for (String reagentCode : checkList) {
               if (checkTable.contains(reagentCode)) {
                  throw new BusinessException(ExceptionEnumCode.PARAM_EXIST, "当前订单条码重复," + reagentCode);
               } else {
                  checkTable.add(reagentCode);
               }
            }
         }
         checkTable = null;
         checkList = null;


         if(list.size()>0&&list!=null){
            for (OpeWarehouseReserve selectWarehouseReserve : list) {
               Map reagentDetail = sysReagentService.getReagentDetail(selectWarehouseReserve.getReagentId());
@@ -1674,6 +1697,10 @@
         FacesUtils.info("申领成功。");
         RequestContext.getCurrentInstance().execute("PF('printDialog').show()");
//            this.menuController.goToPage(Constants.PAGE_WAREHOUSE_STOCK_MNG, Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW);
      } catch (BusinessException e) {
         logger.error(e.getMessage(), e);
         FacesUtils.warn(e.getMessage());

      } catch (Exception e) {
         logger.error(e.getMessage(), e);
         FacesUtils.warn("操作失败。");
@@ -1756,22 +1783,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);
            }
         };
      }
@@ -1806,22 +1834,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);
            }
         };
      }
@@ -2668,17 +2697,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);
                }
            };
        }