From 941668d781ec980ccdafd6e32b6e93a705d43ca7 Mon Sep 17 00:00:00 2001
From: ly <986321569@qq.com>
Date: 星期一, 22 三月 2021 20:56:02 +0800
Subject: [PATCH] 修改重复引用service
---
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index 4b4decd..f269d4f 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -531,9 +531,22 @@
selectedTmpOrderList = null;
}
+ public void hideOrderTmp() {
+ //清空
+ selectedTmpOrderList = null;
+ //隐藏
+ RequestContext.getCurrentInstance().execute("document.getElementById('showTabOrder').style.display='none'");
+ }
+
public void clearInputStorageTmp(){
selectedInputStorageTmpOrderList = null;
}
+
+ public void hideInputStorageTmp(){
+ selectedInputStorageTmpOrderList = null;
+
+ RequestContext.getCurrentInstance().execute("document.getElementById('putInStorage').style.display='none'");
+ }
public void cancel(){
if (trulySelectedList == null || trulySelectedList.size()<=0){
@@ -563,6 +576,10 @@
}
+ public void hide(){
+ selectedTmpList = null;
+ RequestContext.getCurrentInstance().execute("document.getElementById('showTab').style.display='none'");
+ }
public void cancelOrderTmp(){
if (trulySelectedOrderList == null || trulySelectedOrderList.size()<=0){
FacesUtils.info("至少选择一个");
@@ -1497,6 +1514,10 @@
}
if(list.size()>0&&list!=null){
for (OpeWarehouseReserve selectWarehouseReserve : list) {
+ Map reagentDetail = sysReagentService.getReagentDetail(selectWarehouseReserve.getReagentId());
+ if (reagentDetail == null) {
+ throw new Exception("试剂有误,请联系管理员");
+ }
List<String> reagentCodes = selectWarehouseReserve.getReagentCodes();
if (reagentCodes != null && reagentCodes.size() > 0)
for (String opeReagentStatusId : reagentCodes) {
@@ -1523,7 +1544,6 @@
//}
}
ApplyListDto lis = new ApplyListDto();
- Map reagentDetail = sysReagentService.getReagentDetail(selectWarehouseReserve.getReagentId());
lis.setNum(String.valueOf(selectWarehouseReserve.getSelectNum())); //数量
lis.setMainMetering(String.format("%s%s", reagentDetail.get("main_metering"), reagentDetail.get("unit")));
lis.setControlProducts((String) reagentDetail.get("controlProducts"));
@@ -1546,6 +1566,10 @@
List<OpeApply> opeList=new ArrayList<>();
//this.opeApplyService.getOpeApplyList(null,null,null,null,null)
for(int i=0;i<list2.size();i++){
+ Map reagentDetail = sysReagentService.getReagentDetail(list2.get(i).getReagentId());
+ if (reagentDetail == null) {
+ throw new Exception("试剂有误,请联系管理员");
+ }
OpeApply opeApply=new OpeApply();
opeApply.setArticleNumber(list2.get(i).getArticleNumber());
opeApply.setHouseId(laboratoryId);
@@ -1565,7 +1589,6 @@
this.opeLaboratoryReserveService.insert(lr);
//opeList.add(this.opeApplyService.getOpeApply(list2.get(i).getId()));
ApplyListDto lis = new ApplyListDto();
- Map reagentDetail = sysReagentService.getReagentDetail(list2.get(i).getReagentId());
lis.setNum(String.valueOf(list2.get(i).getSelectNum())); //数量
lis.setMainMetering(String.format("%s%s", reagentDetail.get("main_metering"), reagentDetail.get("unit")));
@@ -1637,6 +1660,13 @@
*/
public void onSaveInputWarehouseClick(){
try{
+ //0.0输入校验
+ for (OpeApplyReserve opeApplyReserve : opeApplyList) {
+ if (StringUtils.isBlank(opeApplyReserve.getArticleNumber())) {
+ throw new BusinessException(ExceptionEnumCode.PARAM_EXIST, opeApplyReserve.getReagent().getName() + ":批号不能为空");
+ }
+ }
+
//用来检验提交表单得试剂条码是否重复
Map<String,Boolean> checkTable= new HashMap<>();
if (opeApplyList != null && opeApplyList.size() > 0) {
--
Gitblit v1.9.2