From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 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 c551c47..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;
@@ -93,6 +94,39 @@
}
return Result.OK(pageList);
}
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param equipmentPrecisionParameters
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "mom_eam_equipment_precision_parameters-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="mom_eam_equipment_precision_parameters-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment_precision_parameters-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/getByEquipmentId")
+ public Result<IPage<EquipmentPrecisionParameters>> getByEquipmentId(EquipmentPrecisionParameters equipmentPrecisionParameters,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<EquipmentPrecisionParameters> queryWrapper = QueryGenerator.initQueryWrapper(equipmentPrecisionParameters, req.getParameterMap());
+ Page<EquipmentPrecisionParameters> page = new Page<EquipmentPrecisionParameters>(pageNo, pageSize);
+ IPage<EquipmentPrecisionParameters> pageList = equipmentPrecisionParametersService.page(page, queryWrapper);
+ for (EquipmentPrecisionParameters parameters : pageList.getRecords()) {
+ String precisionParametersId = parameters.getPrecisionParametersId();
+ PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
+ if(precisionParameters != null){
+ parameters.setPrecisionParametersNum(precisionParameters.getNum());
+ parameters.setPrecisionParametersName(precisionParameters.getName());
+ }
+ String upperLimit = parameters.getUpperLimit()+"";
+ String lowerLimit = parameters.getLowerLimit()+"";
+ parameters.setTolerance("["+upperLimit+"鈥�"+lowerLimit+"]");
+ }
+ return Result.OK(pageList);
+ }
/**
* 娣诲姞
@@ -209,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("缁存姢鎴愬姛");
+ }
}
--
Gitblit v1.9.3