订单领取：过期处理(确认和过期 状态处理),增加状态过期（需要将数据库字段加长） 实验室选中问题 仓库领取的仓库不存在问题

lyfO_o

2021-06-11 df47c9300bfe6c641c88707aa5b54591ab4c004c

 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() {
@@ -1518,6 +1520,10 @@
            if(selectWarehouseReserve.getFlag()==1){
               list.add(selectWarehouseReserve);
            }else{
               if (selectWarehouseReserve.getWarehouseId() == null) {
                  FacesUtils.warn("仓库不存在。");
                  return;
               }
               list2.add(selectWarehouseReserve);
            }
         }
@@ -1782,11 +1788,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 +1897,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("申购编号");
@@ -2744,6 +2750,7 @@

   public void resetLaboratory(){
      laboratory = null;
      laboratoryId = null;
      laboratoryContainers = null;
      //getLaboratory();
      //getLaboratoryContainers();
@@ -3094,4 +3101,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("操作成功。");
   }
}