From 7f11e541f239d8c816bcefb32aae6b9efa31e28e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:49:15 +0800
Subject: [PATCH] 生产线点检
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
index 3606d73..5426b62 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
@@ -21,6 +21,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.*;
+import org.jeecg.modules.eam.model.MaintenanceCycleVo;
import org.jeecg.modules.eam.service.*;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
@@ -136,12 +137,22 @@
/**
- * 鏃ュ父淇濆吇宸ュ崟鍒涘缓 缁勪欢閫氳繃浣跨敤閮ㄩ棬杩囨护鑾峰彇淇濆吇鏍囧噯
+ * 浜屼繚 缁勪欢閫氳繃浣跨敤閮ㄩ棬杩囨护鑾峰彇淇濆吇鏍囧噯
* qsw 2023-4-26
*/
@GetMapping("getMaintenanceStandard2List")
public Result<?> getMaintenanceStandard2List(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
IPage<Map<String, Object>> maintenanceStandardList = maintenanceStandardService.getMaintenanceStandard2List(pageNo, pageSize, params);
+ return Result.ok(maintenanceStandardList);
+ }
+
+ /**
+ * 涓変繚 缁勪欢閫氳繃浣跨敤閮ㄩ棬杩囨护鑾峰彇淇濆吇鏍囧噯
+ * qsw 2023-12-12
+ */
+ @GetMapping("getMaintenanceStandard3List")
+ public Result<?> getMaintenanceStandard3List(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> maintenanceStandardList = maintenanceStandardService.getMaintenanceStandard3List(pageNo, pageSize, params);
return Result.ok(maintenanceStandardList);
}
@@ -160,9 +171,16 @@
// maintenanceStandard.setType("daily");
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
maintenanceStandard.setWritePerson(sysUser.getRealname());
+ maintenanceStandard.setAssignMode("1");
maintenanceStandardService.save(maintenanceStandard);
+
+ Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
+ List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
List<MaintenanceStandardDetail> maintenanceStandardDetaillist = maintenanceStandard.getMaintenanceStandardDetaillist();
for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetaillist) {
+ if(maintenanceCycle.size() > 0){
+ maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.get(0).getValue());
+ }
maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId());
maintenanceStandardDetail.setPhoto(maintenanceStandardDetail.getPhoto());
maintenanceStandardDetailService.saveOrUpdate(maintenanceStandardDetail);
@@ -190,8 +208,13 @@
maintenanceStandardDetailService.updateById(dailyInspectionStandardDetail);
}
//2.閲嶆柊鎸佷箙淇濆吇椤圭洰
+ Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
+ List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
List<MaintenanceStandardDetail> maintenanceStandardDetails = maintenanceStandard.getMaintenanceStandardDetaillist();
for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetails) {
+ if(maintenanceCycle.size() > 0){
+ maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.get(0).getValue());
+ }
maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId());
maintenanceStandardDetailService.saveOrUpdate(maintenanceStandardDetail);
}
@@ -302,14 +325,17 @@
equipmentNum =cellEquipmentNum.getText();
equipment = equipmentService.getOne(new QueryWrapper<Equipment>().eq("num",equipmentNum).eq("del_flag",0),false);
if(ObjectUtils.isNotNull(equipment)){
- maintenanceStandard = maintenanceStandardService.getOne(new QueryWrapper<MaintenanceStandard>().eq("version_status",2).eq("del_flag",0).eq("equipment_id",equipment.getId()),false);
+ maintenanceStandard = maintenanceStandardService.getOne(new QueryWrapper<MaintenanceStandard>().eq("version_status","2").eq("del_flag",0).eq("equipment_id",equipment.getId()),false);
if(ObjectUtils.isNull(maintenanceStandard)){
maintenanceStandard = new MaintenanceStandard();
maintenanceStandard.setNum(sysIdentityService.getNumByTypeAndLength("DailyMaintenanceStandard",4));
maintenanceStandard.setEquipmentId(equipment.getId());
maintenanceStandard.setAssignMode("1");
maintenanceStandard.setVersion("1.0");
+ maintenanceStandard.setType("daily");
maintenanceStandard.setVersionStatus("2");
+ maintenanceStandard.setDelFlag(0);
+ maintenanceStandard.setApprovalStatus("5");
maintenanceStandardService.save(maintenanceStandard);
}
else {
@@ -327,11 +353,17 @@
else {
continue;
}
+ String role0 = "";
for (XWPFTableRow row : table.getRows()) {
XWPFTableCell cell0 = row.getCell(0);
XWPFTableCell cell2 = row.getCell(2);
- if(rowNumber>3){
- String role = getMergedCellValue(cell0);
+ if(rowNumber>1){
+ String role = cell0.getText();
+ if(StringUtils.isNotBlank(role)){
+ role0=role;
+ }
+ }
+ if(rowNumber>2){
String projectName = cell2.getText();
MaintenanceStandardDetail maintenanceStandardDetail = new MaintenanceStandardDetail();
MaintenanceProjectCategory maintenanceProjectCategory = maintenanceProjectCategoryService.getOne(new QueryWrapper<MaintenanceProjectCategory>().eq("name","浜岀骇淇濆吇").eq("del_flag",0),false);
@@ -347,15 +379,18 @@
maintenanceProjectService.save(maintenanceProject);
}
maintenanceStandardDetail.setMaintenanceProjectId(maintenanceProject.getId());
- if(role.equals("缁翠慨浜哄憳淇濆吇鍐呭")){
+ if(role0.equals("缁翠慨浜哄憳淇濆吇鍐呭")){
maintenanceStandardDetail.setMaintenanceRole("maintenance");
- } else if(role.equals("鎿嶄綔浜哄憳淇濆吇鍐呭")){
+ } else if(role0.equals("鎿嶄綔浜哄憳淇濆吇鍐呭")){
maintenanceStandardDetail.setMaintenanceRole("operator");
}
if(ObjectUtils.isNotNull(maintenanceCycle)){
maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.getId());
}
+ maintenanceStandardDetail.setDelFlag(0);
+ maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId());
maintenanceStandardDetailService.save(maintenanceStandardDetail);
+
}
}
@@ -363,6 +398,7 @@
}
}
}
+ return Result.OK("瀵煎叆鎴愬姛");
} else {
System.out.println("鏃犳硶瑙ｆ瀽璇ユ枃浠�");
}
@@ -420,6 +456,8 @@
maintenanceStandard.setAssignMode("1");
maintenanceStandard.setVersion("1.0");
maintenanceStandard.setVersionStatus("2");
+ maintenanceStandard.setType("daily");
+ maintenanceStandard.setApprovalStatus("5");
maintenanceStandardService.save(maintenanceStandard);
}
else {
@@ -467,6 +505,7 @@
maintenanceStandardDetail.setMaintenanceProjectId(maintenanceProject.getId());
maintenanceStandardDetail.setLocation(location);
maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.getId());
+ maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId());
maintenanceStandardDetailService.save(maintenanceStandardDetail);
}
@@ -519,15 +558,20 @@
//鏄庣粏淇℃伅
List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandard.getMaintenanceStandardDetaillist();
MaintenanceStandardDetail isd = null;
+ Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
+ List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetailList) {
isd = new MaintenanceStandardDetail();
isd.setMaintenanceStandardId(maintenanceStandard.getId());
isd.setLocation(maintenanceStandardDetail.getLocation());
isd.setPhoto(maintenanceStandardDetail.getPhoto());
isd.setMaintenanceProjectId(maintenanceStandardDetail.getMaintenanceProjectId());
- isd.setMaintenanceCycleId(maintenanceStandardDetail.getMaintenanceCycleId());
+// isd.setMaintenanceCycleId(maintenanceStandardDetail.getMaintenanceCycleId());
isd.setMaintenanceMode(maintenanceStandardDetail.getMaintenanceMode());
isd.setMaintenanceRequire(maintenanceStandardDetail.getMaintenanceRequire());
+ if(maintenanceCycle.size() > 0){
+ isd.setMaintenanceCycleId(maintenanceCycle.get(0).getValue());
+ }
maintenanceStandardDetailService.save(isd);
}
if(CollectionUtils.isNotEmpty(maintenanceStandardPlanningMaterialList)){
@@ -644,4 +688,5 @@
return cell.getParagraphs().get(0).getText();
}
+
}
--
Gitblit v1.9.3