From 14b64e57f9d3e644f931e67f4452957497ab34d2 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Thu, 04 Feb 2021 17:47:16 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index ecde8c7..4b4decd 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -47,8 +47,8 @@
/**
* Created by cmower on 17/11/20.
*/
-@Controller
@PropertySource(value = "WEB-INF/config.properties",encoding = "utf-8")
+@Controller
@Scope("session")
public class WarehouseStockMngController extends BaseController {
@@ -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;
@@ -623,7 +624,7 @@
FacesUtils.info("至少选择一个");
return;
}
-
+ this.userId = getUser().getId();
this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW, Constants.PAGE_WAREHOUSE_STOCK_MNG);
}
//
@@ -648,6 +649,8 @@
}
}
checkTable = null;
+ //
+ this.userId = selectedTmpOrderList.get(0).getApplyUser();
this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW_PERSON, Constants.PAGE_WAREHOUSE_STOCK_MNG);
}
@@ -1538,6 +1541,7 @@
//}
this.opeWarehouseReserveService.claim(list, userId,projectNum);
}
+
if(list2.size()>0&&list2!=null){
List<OpeApply> opeList=new ArrayList<>();
//this.opeApplyService.getOpeApplyList(null,null,null,null,null)
@@ -1735,11 +1739,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 +1848,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("申购编号");
@@ -2723,7 +2727,7 @@
// this.oriLaboratoryId = this.laboratory.get(0).getId();
//}
- this.laboratoryId= laboratoryId==null?this.laboratory.get(0).getId():laboratoryId;
+ this.laboratoryId = this.laboratory.get(0).getId();
this.laboratoryContainers = this.sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryId);
}else {
this.oriLaboratoryId = null;
@@ -3037,4 +3041,12 @@
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
+
+ public Integer getIsAllApply() {
+ return isAllApply;
+ }
+
+ public void setIsAllApply(Integer isAllApply) {
+ this.isAllApply = isAllApply;
+ }
}
--
Gitblit v1.9.2