From 44b3fa1452e1e52746f5037caa673a8e8d1bfbcf Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 08 十二月 2025 08:20:11 +0800
Subject: [PATCH] 1、修改进出片任务汇报破损时的类型和钢化提交破损时的类型
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
index d29e489..63ee9ba 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
@@ -5,9 +5,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.common.S7object;
import com.mes.common.config.Const;
+import com.mes.common.config.ConstSysConfig;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.device.PlcParameterObject;
+import com.mes.sysconfig.service.SysConfigService;
import com.mes.sysdict.entity.SysDictData;
import com.mes.sysdict.service.SysDictDataService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
@@ -18,7 +20,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.util.Comparator;
@@ -47,14 +48,13 @@
@Autowired
private SysDictDataService sysDictDataService;
+ @Autowired
+ private SysConfigService sysConfigService;
+
private static final String ALONE_STATE = "0";
- @Value("${mes.width}")
- private Integer temperingWidth;
- @Value("${mes.height}")
- private Integer temperingHeight;
-// @Scheduled(fixedDelay = 1000)
+ // @Scheduled(fixedDelay = 1000)
public void temperingGlassBefore() {
Date startDate = new Date();
log.info("鏈浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
@@ -105,6 +105,8 @@
double maxArea = temperingGlassList.stream().mapToDouble(e -> e.getWidth() * e.getHeight()).max().orElse(0.0);
double minArea = temperingGlassList.stream().mapToDouble(e -> e.getWidth() * e.getHeight()).min().orElse(0.0);
double areaDifference = (10000 * (maxArea - minArea) / maxArea);
+ Integer temperingHeight = sysConfigService.queryConfigValue(ConstSysConfig.TEMPERING_HEIGHT);
+ Integer temperingWidth = sysConfigService.queryConfigValue(ConstSysConfig.TEMPERING_HEIGHT);
double loadingRate = (int) (10000 * sumArea / (temperingHeight * temperingWidth));
TemperingRecord temperingRecord = new TemperingRecord();
temperingRecord.setEngineerId(maxGlassInfo.getEngineerId());
@@ -152,7 +154,7 @@
damage.setWorkingProcedure("閽㈠寲");
damage.setRemark("閽㈠寲");
damage.setStatus(1);
- damage.setType(e.getState());
+ damage.setType(Const.GLASS_STATE_DAMAGE);
return damage;
}).collect(Collectors.toList());
damageService.batchInsertDamage(damageList);
--
Gitblit v1.8.0