修改选中项

李宇

2021-06-25 b48666e1f30b3334726d218d6b05d1228a307fd7

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

@@ -173,6 +173,8 @@
   @Value("${institute.name}")
   String instituteName;

   private boolean isExpired;

   private Hashtable printTable;

   public Hashtable getPrintTable() {
@@ -424,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;
@@ -1212,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());
@@ -1493,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());
@@ -1518,6 +1529,10 @@
            if(selectWarehouseReserve.getFlag()==1){
               list.add(selectWarehouseReserve);
            }else{
               if (selectWarehouseReserve.getWarehouseId() == null) {
                  FacesUtils.warn("仓库不存在。");
                  return;
               }
               list2.add(selectWarehouseReserve);
            }
         }
@@ -1782,11 +1797,11 @@
               }

               try {
                  int count = opeApplyService.getOpeApplyReserveTotalCountByNameFor(id, reagentId, userName, productSn, applyCode, status, isAllApply);
                  int count = opeApplyService.getOpeApplyReserveTotalCountByNameFor(id, reagentId, userName, productSn, applyCode, status, isAllApply,isExpired);
                  this.setRowCount(count);
                  if (count > 0) {
                     list = opeApplyService.getOpeApplyReserveListByNameFor(id, reagentId, userName, first,
                           pageSize, productSn, applyCode, status, isAllApply);
                           pageSize, productSn, applyCode, status, isAllApply,isExpired);
                  }
               } catch (Exception e) {
                  logger.error(e);
@@ -1891,7 +1906,7 @@
            realDataList=selectedListForPerson;
         }else {
            realDataList = opeApplyService.getOpeApplyReserveListByNameFor(id,reagentId, userName, null,
                  null,productSn,applyCode,status,isAllApply);
                  null,productSn,applyCode,status,isAllApply,isExpired);
         }
         List<String> headerList = new ArrayList<>();
         headerList.add("申购编号");
@@ -2297,6 +2312,7 @@
        this.reagentDStore.setReagent((SysReagent)event.getObject());

       this.reagentDStoreEditFlag = Constants.ACTION_ADD;
      onWarehouseSelectChange(null);
       RequestContext.getCurrentInstance().execute("PF('reagentDStoreDialog').show()");
    }

@@ -2306,6 +2322,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)) {
@@ -2744,6 +2765,7 @@

   public void resetLaboratory(){
      laboratory = null;
      laboratoryId = null;
      laboratoryContainers = null;
      //getLaboratory();
      //getLaboratoryContainers();
@@ -3094,4 +3116,51 @@
   public void setIsAllApply(Integer isAllApply) {
      this.isAllApply = isAllApply;
   }

   public boolean getIsExpired() {
      return isExpired;
   }

   public void setIsExpired(boolean isExpired) {
      this.isExpired = isExpired;
   }

   //过期处理
   public void expireOrder() {
      //1.判断当前订单是否是已入库的状态
      if (this.selectedListForPerson.size() < 1) {
         FacesUtils.warn("请选择数据。");
         return;
      }
      ArrayList<String> ids = new ArrayList<>();
      for (OpeApplyReserve oa : this.selectedListForPerson) {
         ids.add(oa.getId());
         if (oa.getStatus() != ApplyStatus.SUPPLIER_CONFIRM) {
            FacesUtils.warn("只能让已确认状态的单子过期。");
            return;
         }
      }

      opeApplyService.updateOpeApplyStatus(ApplyStatus.EXPIRED, null, ids);
      FacesUtils.warn("操作成功。");


   }

   public void recoverOrder(){
      if (this.selectedListForPerson.size() < 1) {
         FacesUtils.warn("请选择数据。");
         return;
      }
      ArrayList<String> ids = new ArrayList<>();
      for (OpeApplyReserve oa : this.selectedListForPerson) {
         ids.add(oa.getId());
         if (oa.getStatus() != ApplyStatus.EXPIRED) {
            FacesUtils.warn("只能让过期单子恢复确认。");
            return;
         }
      }
      opeApplyService.updateOpeApplyStatus(ApplyStatus.SUPPLIER_CONFIRM, null, ids);
      FacesUtils.warn("操作成功。");
   }
}