From 3bc79850da426a40002a5d07ceb63fcbcdc2d93d Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 16 Jun 2021 09:39:51 +0800
Subject: [PATCH] 危废处理取消和恢复
---
src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java
index 9038eeb..86b00ef 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java
@@ -6,6 +6,15 @@
import javax.annotation.Resource;
+import com.nanometer.smartlab.dao.SysLaboratoryDao;
+import com.nanometer.smartlab.entity.SysLaboratory;
+import com.nanometer.smartlab.entity.SysLaboratoryContainer;
+import com.nanometer.smartlab.entity.SysWarehouseContainer;
+import com.nanometer.smartlab.exception.BusinessException;
+import com.nanometer.smartlab.exception.ExceptionEnumCode;
+import com.nanometer.smartlab.service.SysLaboratoryContainerService;
+import com.nanometer.smartlab.service.SysLaboratoryService;
+import com.nanometer.smartlab.service.SysWarehouseContainerService;
import org.apache.log4j.Logger;
import org.primefaces.context.RequestContext;
import org.primefaces.model.LazyDataModel;
@@ -31,6 +40,12 @@
@Resource
private SysWarehouseService sysWarehouseService;
+ @Resource
+ private SysLaboratoryDao sysLaboratoryDao;
+ @Resource
+ private SysLaboratoryContainerService sysLaboratoryContainerService;
+ @Resource
+ private SysWarehouseContainerService sysWarehouseContainerService;
/**
* 数据源
@@ -99,7 +114,13 @@
return;
}
- this.sysWarehouseService.updateSysWarehouse(sysWarehouse);
+ SysLaboratory sysLaboratory = sysLaboratoryDao.getSysLaboratoryByName(sysWarehouse.getName());
+ if (sysLaboratory != null) {
+ this.sysWarehouseService.updateSysWarehouse2(sysWarehouse,sysLaboratory);
+ } else {
+ this.sysWarehouseService.updateSysWarehouse(sysWarehouse);
+ }
+
FacesUtils.info("修改成功。");
RequestContext.getCurrentInstance().execute("PF('dialog').hide()");
@@ -116,10 +137,19 @@
FacesUtils.warn("请选择数据。");
return;
}
-
+ //判断下面是否有柜子，有就拒绝删除
+ for (SysWarehouse sysWarehouse : selectedList) {
+ List<SysWarehouseContainer> list = sysWarehouseContainerService.getSysWarehouseContainerList(sysWarehouse.getId());
+ if (list.size() > 0) {
+ throw new BusinessException(ExceptionEnumCode.SYS_ERR, "该仓库下还有货柜,请清除货柜后删除仓库");
+ }
+ }
this.sysWarehouseService.deleteSysWarehouse(this.selectedList);
FacesUtils.info("删除成功。");
+ } catch (BusinessException e) {
+ logger.error(e.getMessage());
+ FacesUtils.warn(e.getMessage());
} catch (Exception e) {
logger.error("操作失败。", e);
FacesUtils.warn("操作失败。");
--
Gitblit v1.9.2