From 4f966da6047cdcd9c53e254c1f1c7bdd70af0b34 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 21 四月 2025 10:08:18 +0800
Subject: [PATCH] 1、卧式理片笼配置参数由配置yml文件改为数据库配置表获取 2、磨边后参数改造，解决plc查询数据异常问题 3、大理片笼配置参数由配置yml文件改为数据库配置表获取 4、钢化配置参数由配置yml文件改为数据库配置表获取 5、配置参数常量类配置修改，提供获取配置参数的方法
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index e7cdac4..f93875f 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -1,9 +1,9 @@
package com.mes.temperingglass.controller;
-import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.entity.LoadGlassInfo;
+import com.mes.temperingglass.eneity.request.DamageRequest;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.utils.Result;
@@ -50,16 +50,20 @@
@ApiOperation("//閽㈠寲鐮存崯鎷胯蛋鏀惧洖")
@PostMapping("/updateTemperingState") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
- public Result <Integer> updateTemperingState(@RequestBody Damage damage) {
+ public Result<List<LoadGlassInfo>> updateTemperingState(@RequestBody DamageRequest damage) {
TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
- temperingGlassInfo.setState(damage.getStatus());
+ temperingGlassInfo.setState(damage.getState());
temperingGlassInfo.setGlassId(damage.getGlassId());
int result=temperingGlassInfoService.updateTemperingState(temperingGlassInfo);
- if (damage.getStatus() > 5) {
+ if (damage.getState() > 5) {
damageService.autoSubmitReport(damage.getGlassId(), damage.getLine()
- , damage.getWorkingProcedure(), "閽㈠寲鐐�", damage.getStatus());
+ , damage.getWorkingProcedure(), "閽㈠寲鐐�", damage.getState());
}
- return Result.build(200, "鐮存崯鎴愬姛", result);
+ GlassInfo glassInfo = new GlassInfo();
+ glassInfo.setEngineerId(damage.getEngineerId());
+ glassInfo.setTemperingLayoutId(damage.getTemperingLayoutId());
+ List<LoadGlassInfo> glass = temperingGlassInfoService.selectTemperingGlass(glassInfo);
+ return Result.build(200, "鐮存崯鎴愬姛", glass);
}
@ApiOperation("//鏌ヨ褰撳墠宸ョ▼鍙锋墍鏈夌殑鐐夊彿")
--
Gitblit v1.8.0