Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

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

@@ -220,6 +220,8 @@
   //private boolean flag = false;
   //领用单号
   private String receiptNumber;
   //备注
   private String note;
   // 试剂库
    private LazyDataModel<SysReagent> reagentDataModel;
   // 直接入库试剂List
@@ -671,7 +673,11 @@
      checkTable = null;
      //
      this.userId = selectedTmpOrderList.get(0).getApplyUser();

      SysUser sysUser = sysUserService.getSysUser(this.userId);
      if (sysUser == null){
         FacesUtils.info("申领人不存在");
         return;
      }
      this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW_PERSON, Constants.PAGE_WAREHOUSE_STOCK_MNG);
   }

@@ -1215,6 +1221,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());
@@ -1267,7 +1277,7 @@
    */
   public void associatedFlowReceiptNumber() {
      try {
         opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber);
         opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber, note);
         //弹出打印窗口
         RequestContext.getCurrentInstance().execute("document.getElementById('indirectPrint').click()");
      } catch (Exception e) {
@@ -1283,7 +1293,7 @@

   public void associatedFlowReceiptNumber2() {
      try {
         opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber);
         opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber,note);
         //弹出打印窗口
         RequestContext.getCurrentInstance().execute("document.getElementById('indirectPrint').click()");
      } catch (Exception e) {
@@ -1295,7 +1305,7 @@

   public void closeDialog() {
      try {
         opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber);
         opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber,note);
         onCancelBtnClick();
      } catch (Exception e) {
         logger.info(e.getMessage());
@@ -1305,7 +1315,7 @@

   public void closeDialog2() {
      try {
         opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber);
         opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber,note);
         onCancelBtnClick();
      } catch (Exception e) {
         logger.info(e.getMessage());
@@ -1496,6 +1506,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());
@@ -1528,6 +1542,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());
@@ -1617,7 +1654,7 @@

               sum += list2.get(i).getSelectNum();
            }
            this.opeWarehouseReserveService.reagentDStore4(opeList,userId);
            this.opeWarehouseReserveService.reagentDStore4(opeList,userId,receiptNum);
            for(int i=0;i<list2.size();i++){

               List<String> reagentCodes = opeReagentStatusService
@@ -1666,6 +1703,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("操作失败。");
@@ -1748,22 +1789,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);
            }
         };
      }
@@ -1781,7 +1823,7 @@
               List<OpeApplyReserve> list = null;
               SysUser loginUser = getUser();
               String id="";
               if(loginUser.getSeeFlag()==SeeFlag.MANAGE){
               if(loginUser.getSeeFlag()==SeeFlag.MANAGE||loginUser.getSeeFlag() ==SeeFlag.LEADING){

               }else {
                  //userName=loginUser.getName();
@@ -1798,22 +1840,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);
            }
         };
      }
@@ -1888,7 +1931,7 @@
         //map=null;
         SysUser loginUser = getUser();
         String id="";
         if(loginUser.getSeeFlag()==SeeFlag.MANAGE){
         if(loginUser.getSeeFlag()==SeeFlag.MANAGE||loginUser.getSeeFlag() == SeeFlag.LEADING){

         }else {
            //userName=loginUser.getName();
@@ -2568,6 +2611,10 @@
         }
   }

   public void clearStartAndEndCode(){
      endReagentCode = "";
   }

   public void handleEventForPerson(){
      if(useNum!=null && useNum>0){
         if(startReagentCodeForPerson!=null && !startReagentCodeForPerson.equals("")){
@@ -2660,17 +2707,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);
                }
            };
        }
@@ -3155,4 +3202,12 @@
      opeApplyService.updateOpeApplyStatus(ApplyStatus.SUPPLIER_CONFIRM, null, ids);
      FacesUtils.warn("操作成功。");
   }

    public String getNote() {
        return note;
    }

    public void setNote(String note) {
        this.note = note;
    }
}