From 09aa0d2eebbdf7d0a584323babc02c4608ab852a Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 05 九月 2023 18:10:10 +0800
Subject: [PATCH] 设备台账维护子表
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentProcessParametersController.java | 7 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java | 7 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 5 +++++
3 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java
index 3659766..324b575 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java
@@ -15,6 +15,7 @@
import org.jeecg.common.util.oConvertUtils;
//import org.jeecg.modules.base.entity.Unit;
//import org.jeecg.modules.base.service.IUnitService;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentPrecisionParameters;
import org.jeecg.modules.eam.entity.PrecisionParameters;
import org.jeecg.modules.eam.service.IEquipmentPrecisionParametersService;
@@ -242,5 +243,11 @@
equipmentPrecisionParametersService.saveOrUpdateBatch(equipmentPrecisionParameters);
return Result.OK("鎻愪氦鎴愬姛");
}
+ @PutMapping("newEdit")
+ public Result<?> newEdit(@RequestBody Equipment equipment){
+ List<EquipmentPrecisionParameters> equipmentPrecisionParameters = equipment.getPrecisionEditTableList();
+ equipmentPrecisionParametersService.saveOrUpdateBatch(equipmentPrecisionParameters);
+ return Result.OK("缁存姢鎴愬姛");
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentProcessParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentProcessParametersController.java
index b5a64d3..2eb8d4b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentProcessParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentProcessParametersController.java
@@ -15,6 +15,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentPrecisionParameters;
import org.jeecg.modules.eam.entity.EquipmentProcessParameters;
import org.jeecg.modules.eam.entity.ProcessParameters;
@@ -207,5 +208,11 @@
equipmentProcessParametersService.saveOrUpdateBatch(equipmentProcessParameters);
return Result.OK("鎻愪氦鎴愬姛");
}
+ @PutMapping("newEdit")
+ public Result<?> newEdit(@RequestBody Equipment equipment){
+ List<EquipmentProcessParameters> equipmentProcessParameters = equipment.getProcessEditTableList();
+ equipmentProcessParametersService.saveOrUpdateBatch(equipmentProcessParameters);
+ return Result.OK("缁存姢鎴愬姛");
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 2b66aa5..b32b909 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -292,4 +292,9 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private java.util.Date updateTime;
+ @TableField(exist = false)
+ private List<EquipmentProcessParameters> processEditTableList;
+ @TableField(exist = false)
+ private List<EquipmentPrecisionParameters> precisionEditTableList;
+
}
--
Gitblit v1.9.3