Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-01 1cbac7aa20a183a9a893651bf0cef24b1909eb5c

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

@@ -166,6 +166,7 @@
   private String warehouseName;

   private Integer editFlag;
   private Integer isAllApply = 0;
   private StreamedContent file;
   @Value("${pdf.export.file.path}")
   private String pdfExportFilePath;
@@ -1148,7 +1149,7 @@
            this.opeWarehouseReserveService.reagentDStore3(opeList,userId);

            //扣库存
            opeWarehouseReserveService.btWarehouseReserveReduce(list2,userId);
            opeWarehouseReserveService.btWarehouseReserveReduce(list2);
         }

         for(int i=0;i<list2.size();i++){
@@ -1593,7 +1594,7 @@
                  opeUseFlow.setHouseId(list2.get(i).getWarehouseId());
                  opeUseFlow.setContainerId(warehouseReserveInfo.get(0).getContainerId());
                  opeUseFlow.setCreateTime(warehouseReserveInfo.get(0).getUpdateTime());
                  opeUseFlow.setUserId(userId);
                  opeUseFlow.setUserId(warehouseReserveInfo.get(0).getUserId());
                  opeUseFlow.setRemainder(list2.get(i).getReagent().getMainMetering()!=null?list2.get(i).getReagent().getMainMetering():new BigDecimal(0));
                  opeUseFlow.setStoreType(StoreType.DIRECTSTORE);

@@ -1735,11 +1736,11 @@
               }

               try {
                  int count = opeApplyService.getOpeApplyReserveTotalCountByNameFor(id,reagentId, userName,productSn,applyCode,status);
                  int count = opeApplyService.getOpeApplyReserveTotalCountByNameFor(id, reagentId, userName, productSn, applyCode, status, isAllApply);
                  this.setRowCount(count);
                  if (count > 0) {
                     list = opeApplyService.getOpeApplyReserveListByNameFor(id,reagentId, userName, first,
                           pageSize,productSn,applyCode,status);
                     list = opeApplyService.getOpeApplyReserveListByNameFor(id, reagentId, userName, first,
                           pageSize, productSn, applyCode, status, isAllApply);
                  }
               } catch (Exception e) {
                  logger.error(e);
@@ -1844,7 +1845,7 @@
            realDataList=selectedListForPerson;
         }else {
            realDataList = opeApplyService.getOpeApplyReserveListByNameFor(id,reagentId, userName, null,
                  null,productSn,applyCode,status);
                  null,productSn,applyCode,status,isAllApply);
         }
         List<String> headerList = new ArrayList<>();
         headerList.add("申购编号");
@@ -3037,4 +3038,12 @@
   public void setWarehouseName(String warehouseName) {
      this.warehouseName = warehouseName;
   }

   public Integer getIsAllApply() {
      return isAllApply;
   }

   public void setIsAllApply(Integer isAllApply) {
      this.isAllApply = isAllApply;
   }
}