From 15ae1e3b5cda40a8248a1addf4a64c1e0a9e2b13 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 七月 2024 18:02:04 +0800
Subject: [PATCH] 设备管理修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartRequirementController.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 113 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartRequirementController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartRequirementController.java
index 3bd209d..08bd777 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartRequirementController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartRequirementController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -13,7 +14,11 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.DailyInspectionStandard;
+import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentChange;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.spare.entity.*;
import org.jeecg.modules.spare.service.*;
import org.jeecg.modules.spare.vo.SparePartRequirementDeatilPage;
@@ -25,6 +30,7 @@
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -34,10 +40,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @Description: 澶囦欢闇�姹�
@@ -54,6 +57,9 @@
private ISparePartRequirementService sparePartScrapRequirementService;
@Autowired
private ISparePartRequirementDeatilService sparePartScrapRequirementDetailService;
+
+ @Autowired
+ private IEamEquipmentService equipmentService;
/**
@@ -75,6 +81,30 @@
QueryWrapper<SparePartRequirement> queryWrapper = QueryGenerator.initQueryWrapper(sparePartScrap, req.getParameterMap());
Page<SparePartRequirement> page = new Page<SparePartRequirement>(pageNo, pageSize);
IPage<SparePartRequirement> pageList = sparePartScrapRequirementService.page(page, queryWrapper);
+ for (SparePartRequirement record : pageList.getRecords()) {
+ String equipmentId = record.getEquipmentId();
+ String id = record.getId();
+ List<SparePartRequirementDeatil> sparePartRequirementDeatils = sparePartScrapRequirementDetailService.lambdaQuery()
+ .eq(SparePartRequirementDeatil::getSparePartRequirementId, id).eq(SparePartRequirementDeatil::getDelFlag, 0).list();
+ record.setSparePartRequirementDeatilList(sparePartRequirementDeatils);
+
+ if(StringUtils.isNotBlank(equipmentId)){
+ Equipment equipment = equipmentService.getById(equipmentId);
+ record.setEquipmentNumNameModel(equipment.getNum()+"/"+equipment.getName()+"/"+equipment.getModel());
+ }
+ }
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value = "澶囦欢闇�姹�-鍒嗛〉鍒楄〃鏌ヨ", notes = "澶囦欢闇�姹�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/getSparePartRequirementDetails")
+ public Result<IPage<SparePartRequirementDeatil>> getSparePartRequirementDetails(SparePartRequirementDeatil sparePartRequirementDeatil,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<SparePartRequirementDeatil> queryWrapper = QueryGenerator.initQueryWrapper(sparePartRequirementDeatil, req.getParameterMap());
+ Page<SparePartRequirementDeatil> page = new Page<SparePartRequirementDeatil>(pageNo, pageSize);
+ IPage<SparePartRequirementDeatil> pageList = sparePartScrapRequirementDetailService.page(page, queryWrapper);
return Result.OK(pageList);
}
@@ -92,6 +122,25 @@
SparePartRequirement sparePartRequirement = new SparePartRequirement();
BeanUtils.copyProperties(sparePartRequirementDeatilPage, sparePartRequirement);
sparePartScrapRequirementService.saveMain(sparePartRequirement, sparePartRequirementDeatilPage.getSparePartRequirementDeatilList());
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+
+ /**
+ * 娣�
+ */
+ @AutoLog(value = "澶囦欢闇�姹�-娣诲姞")
+ @ApiOperation(value = "澶囦欢闇�姹�-娣诲姞", notes = "澶囦欢闇�姹�-娣诲姞")
+ @PostMapping(value = "/addNew")
+ public Result<String> addNew(@RequestBody SparePartRequirement sparePartRequirement) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ sparePartRequirement.setPerson(sysUser.getRealname());
+ sparePartScrapRequirementService.save(sparePartRequirement);
+ List<SparePartRequirementDeatil> sparePartRequirementDeatilList = sparePartRequirement.getSparePartRequirementDeatilList();
+ for (SparePartRequirementDeatil sparePartRequirementDeatil : sparePartRequirementDeatilList) {
+ sparePartRequirementDeatil.setSparePartRequirementId(sparePartRequirement.getId());
+ sparePartScrapRequirementDetailService.save(sparePartRequirementDeatil);
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -116,6 +165,34 @@
}
+
+ /**
+ * 缂栬緫
+ *
+ */
+ @AutoLog(value = "澶囦欢闇�姹�-缂栬緫")
+ @ApiOperation(value = "澶囦欢闇�姹�-缂栬緫", notes = "澶囦欢闇�姹�-缂栬緫")
+ @RequestMapping(value = "/editNew", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> editNew(@RequestBody SparePartRequirement sparePartRequirement) {
+ sparePartScrapRequirementService.updateById(sparePartRequirement);
+ //1.鍒犻櫎澶囦欢鏄庣粏
+ List<SparePartRequirementDeatil> sparePartRequirementDeatils = sparePartScrapRequirementDetailService.lambdaQuery()
+ .eq(SparePartRequirementDeatil::getSparePartRequirementId, sparePartRequirement.getId())
+ .eq(SparePartRequirementDeatil::getDelFlag, 0).list();
+ for (SparePartRequirementDeatil sparePartRequirementDeatil : sparePartRequirementDeatils) {
+ sparePartScrapRequirementDetailService.removeById(sparePartRequirementDeatil);
+ }
+ //2.閲嶆柊鎸佷箙澶囦欢鏄庣粏
+ List<SparePartRequirementDeatil> sparePartRequirementDeatilList = sparePartRequirement.getSparePartRequirementDeatilList();
+ for (SparePartRequirementDeatil sparePartRequirementDeatil : sparePartRequirementDeatilList) {
+ sparePartRequirementDeatil.setId("");
+ sparePartRequirementDeatil.setSparePartRequirementId(sparePartRequirement.getId());
+ sparePartScrapRequirementDetailService.save(sparePartRequirementDeatil);
+ }
+ return Result.OK("缂栬緫鎴愬姛!");
+
+ }
+
/**
* 閫氳繃id鍒犻櫎
*
@@ -127,6 +204,19 @@
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
sparePartScrapRequirementService.delMain(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ @AutoLog(value = "澶囦欢闇�姹�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "澶囦欢闇�姹�-閫氳繃id鍒犻櫎", notes = "澶囦欢闇�姹�-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/deleteNew")
+ public Result<String> deleteNew(@RequestParam(name = "id", required = true) String id) {
+ sparePartScrapRequirementService.removeById(id);
+ List<SparePartRequirementDeatil> sparePartRequirementDeatils = sparePartScrapRequirementDetailService.lambdaQuery()
+ .eq(SparePartRequirementDeatil::getSparePartRequirementId, id).list();
+ for (SparePartRequirementDeatil sparePartRequirementDeatil : sparePartRequirementDeatils) {
+ sparePartScrapRequirementDetailService.removeById(sparePartRequirementDeatil);
+ }
return Result.OK("鍒犻櫎鎴愬姛!");
}
@@ -146,6 +236,23 @@
sparePartScrapRequirementService.submit(id);
return Result.OK("鎻愪氦鎴愬姛锛�");
+ }
+
+ /**
+ * 绛惧娴佺▼
+ */
+ @RequestMapping(value = "/auditApproval", method = {RequestMethod.PUT,RequestMethod.POST})
+ @Transactional(rollbackFor = { Exception.class })
+ public Result<String> auditApproval(@RequestBody SparePartRequirement sparePartRequirement) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ sparePartRequirement.setAuditPerson(sysUser.getRealname());
+ sparePartRequirement.setAuditTime(new Date());
+ boolean b = sparePartScrapRequirementService.updateById(sparePartRequirement);
+ if (b){
+ return Result.OK("瀹℃牳鎴愬姛!");
+ }else{
+ return Result.error("瀹℃牳澶辫触!");
+ }
}
@@ -342,4 +449,6 @@
return Result.OK("鏂囦欢瀵煎叆澶辫触锛�");
}
+
+
}
--
Gitblit v1.9.3