From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentScrapController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentScrapController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentScrapController.java
index f974d55..177f795 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentScrapController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentScrapController.java
@@ -13,7 +13,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
-import org.jeecg.modules.eam.entity.EquipmentSeal;
+import org.jeecg.modules.eam.entity.*;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EquipmentDisposalPage;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -25,8 +26,6 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EquipmentScrapDetail;
-import org.jeecg.modules.eam.entity.EquipmentScrap;
import org.jeecg.modules.eam.vo.EquipmentScrapPage;
import org.jeecg.modules.eam.service.IEquipmentScrapService;
import org.jeecg.modules.eam.service.IEquipmentScrapDetailService;
@@ -60,6 +59,8 @@
private IEquipmentScrapService equipmentScrapService;
@Autowired
private IEquipmentScrapDetailService equipmentScrapDetailService;
+ @Autowired
+ private IEamEquipmentService equipmentService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -421,6 +422,15 @@
@PostMapping(value = "/approve")
public Result<String> approve(@RequestBody EquipmentScrap equipmentScrap) {
equipmentScrapService.updateById(equipmentScrap);
+ //瀹℃壒閫氳繃鍚庢洿鏂拌澶囩姸鎬�
+ if("Approved".equals(equipmentScrap.getAuditStatus())){
+ List<EquipmentScrapDetail> equipmentSealDetailList = equipmentScrapDetailService.selectByMainId(equipmentScrap.getId());
+ for(EquipmentScrapDetail equipmentScrapDetail : equipmentSealDetailList){
+ Equipment equipment = equipmentService.getById(equipmentScrapDetail.getEquipmentId());
+ equipment.setEquipmentStatus("3");
+ equipmentService.updateById(equipment);
+ }
+ }
return Result.OK("鎿嶄綔鎴愬姛锛�");
}
}
--
Gitblit v1.9.3