From d7765b799489db445388e528044ab3b2bd2e649e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 12 六月 2025 08:22:57 +0800
Subject: [PATCH] 钢化模块modbus和S7改造
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 377 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 212 insertions(+), 165 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index d0f8f5c..1d944e7 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -1,28 +1,36 @@
package com.mes.edgstoragecage.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
+import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
-import com.mes.damage.mapper.DamageMapper;
+import com.mes.damage.entity.request.DamageRequest;
import com.mes.damage.service.DamageService;
+import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
+import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
+import com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.glassinfo.entity.GlassInfo;
-import com.mes.glassinfo.mapper.GlassInfoMapper;
-import com.mes.pp.entity.OptimizeDetail;
-import com.mes.pp.entity.OptimizeLayout;
-import com.mes.pp.mapper.OptimizeDetailMapper;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.largenscreen.entity.PieChartVO;
+import com.mes.pp.entity.OptimizeHeatDetail;
+import com.mes.pp.entity.OptimizeHeatLayout;
+import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.mapper.OptimizeHeatDetailMapper;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.TaskCacheService;
import com.mes.uppattenusage.entity.UpPattenUsage;
@@ -32,7 +40,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.print.attribute.standard.MediaSize;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -51,22 +59,17 @@
@Slf4j
public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
- @Autowired
- UpPattenUsageMapper upPattenUsageMapper;
-
- @Autowired
- OptimizeDetailMapper optimizeDetailMapper;
-
- @Autowired
- EdgStorageCageMapper edgStorageCageMapper;
- @Autowired
- DamageMapper damageMapper;
-
- @Autowired
+ @Resource
EngineeringMapper engineeringMapper;
- @Autowired
- GlassInfoMapper glassInfoMapper;
+ @Resource
+ OptimizeHeatDetailMapper optimizeHeatDetailMapper;
+
+ @Resource
+ EdgStorageCageMapper edgStorageCageMapper;
+
+ @Resource
+ GlassInfoService glassInfoService;
@Autowired
TaskCacheService taskCacheService;
@@ -74,157 +77,128 @@
@Autowired
DamageService damageService;
+ @Resource
+ UpPattenUsageMapper upPattenUsageMapper;
- /**
- * 璇嗗埆 鎷胯蛋:200/鐮存崯:201
- *
- * @param arguments
- * @return
- */
+ @Autowired
+ EdgGlassTaskInfoService edgGlassTaskInfoService;
+
@Override
- public boolean identWorn(Map<String,Object> arguments) {
- String glassId=arguments.get("glassId").toString();
- int state=arguments.get("state").toString().isEmpty()?0:Integer.parseInt(arguments.get("state").toString());
- int line=arguments.get("line").toString().isEmpty()?0:Integer.parseInt(arguments.get("line").toString());
- String workingProcedure=arguments.get("workingProcedure").toString();
- if(state==0||line==0||workingProcedure==null||glassId==null||glassId.isEmpty()){
- log.info("鍓嶇浼犻�掓暟鎹笉鍏�:{}",arguments);
- return false;
+ public JSONObject queryCurrentCutDrawing(int deviceId, int stationCell) {
+// 鑾峰彇鏈潯绾垮綋鍓嶆鍦ㄦ墽琛岀殑宸ョ▼
+ Engineering engineering = engineeringMapper.selectOne(new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getState, 1).eq(Engineering::getStationCell, stationCell));
+ if (null == engineering) {
+ log.info("褰撳墠绾胯矾娌℃湁闇�瑕佹墽琛岀殑宸ョ▼");
+ return null;
}
- List<GlassInfo> GlassInfos = glassInfoMapper.selectList(new MPJLambdaQueryWrapper<GlassInfo>()
- .selectAll(GlassInfo.class)
- .eq(GlassInfo::getGlassId, glassId));
- if (GlassInfos.size() == 1) {
- Damage damage =new Damage();
- damage.setGlassId(glassId);
- damage.setLine(line);
- damage.setWorkingProcedure(workingProcedure);
- damage.setRemark("");
- damage.setStatus(state);//8鐮存崯锛�9鎷胯蛋
- damageService.insertDamage(damage);
- }else{
- return false;
- }
- List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
- .selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getGlassId, glassId));
- if (edgStorageCageDetails.size() == 1) {
- EdgStorageCageDetails item = edgStorageCageDetails.get(0);
- item.setState(state);
- baseMapper.update(item, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
- }
- return true;
- }
-
- /**
- * 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
- *
- * @return
- */
- @Override
- public List<Map<String, Object>> selectCutTerritory() {
- List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
- .selectAll(UpPattenUsage.class)
- .innerJoin(Engineering.class, on -> on
- .eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
- .eq(Engineering::getState,1)
- .orderByDesc(UpPattenUsage::getState)
- .orderByDesc(UpPattenUsage::getId)
- );
- if (!upPattenUsage.isEmpty()) {
- UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
- List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
- .selectAll(OptimizeDetail.class)
- .selectAs(OptimizeLayout::getWidth, "olWidth")
- .selectAs(OptimizeLayout::getHeight, "olHeight")
- .leftJoin(OptimizeLayout.class, on -> on
- .eq(OptimizeLayout::getProjectNo, OptimizeDetail::getProjectNo)
- .eq(OptimizeLayout::getStockId, OptimizeDetail::getStockId))
- .eq(OptimizeDetail::getProjectNo, upPattenUsage1.getEngineeringId())
- .eq(OptimizeDetail::getStockId, upPattenUsage1.getLayoutSequence())
- );
- Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
- .selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getEngineerId,upPattenUsage1.getEngineeringId())
- .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
- ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails));
-
- Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
- .selectAll(Damage.class)
- .eq(Damage::getEngineerId,upPattenUsage1.getEngineeringId())
- ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage));
-
- List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
- for (Map<String, Object> cutTerritory : cutTerritorys) {
-// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
- if(cutTerritory.get("glass_id")==null||"".equals(cutTerritory.get("glass_id"))){
- log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritorys);
- return new ArrayList<>();
- }else if(edgMaps.get(cutTerritory.get("glass_id"))!=null){
- cutTerritory.put("glass_state",edgMaps.get(cutTerritory.get("glass_id")).getState());
- }else if(damageMaps.get(cutTerritory.get("glass_id"))!=null){
- //log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
- cutTerritory.put("glass_state",damageMaps.get(cutTerritory.get("glass_id")).getStatus());
- }else{
- cutTerritory.put("glass_state",0);
- }
- resultCutTerritory.add(cutTerritory);
+ List<EdgStorageCageDetails> edgStorageCageDetailsList = this.list(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getDeviceId, deviceId)
+ .eq(EdgStorageCageDetails::getEngineerId, engineering.getEngineerId())
+ .orderByDesc(EdgStorageCageDetails::getId));
+ //鎸夌収褰撳墠宸ョ▼鍘荤悊鐗囩鎼滄渶鍚庝竴鍧楃幓鐠� 鑾峰彇宸ョ▼鍙� 鐗堝浘鍙� 娌℃湁鐩存帴鏄剧ず绗竴寮犵増鍥�
+ int patternSequence = 0;
+ if (CollectionUtil.isEmpty(edgStorageCageDetailsList)) {
+ patternSequence = 1;
+ } else {
+ EdgStorageCageDetails lastGlass = edgStorageCageDetailsList.get(0);
+ log.info("鑾峰彇鏈�鍚庝竴鍧楄繘绗肩殑鐜荤拑涓猴細{}", lastGlass);
+ List<CutDrawingVO> drawingVOList = baseMapper.queryCutDrawingByEngineerId(lastGlass.getEngineerId(), lastGlass.getPatternSequence(), 1);
+ if (CollectionUtil.isEmpty(drawingVOList)) {
+ //鏃犲墿浣� 鏄剧ず褰撳墠鐗堝浘鍔�1鐨勫叏閲忕増鍥�
+ patternSequence = lastGlass.getPatternSequence() + 1;
+ } else {
+ //褰撳墠鐗堝浘鏄惁鏈夊墿浣欙紝鏈夊墿浣欐樉绀哄綋鍓嶇増鍥�
+ patternSequence = lastGlass.getPatternSequence();
}
- return resultCutTerritory;
}
- return null;
+ JSONObject jsonObject = new JSONObject();
+ List<CutDrawingVO> currentCutDrawings = baseMapper.queryCutDrawingByEngineerId(engineering.getEngineerId(), patternSequence, 0);
+ jsonObject.append("currentCutTerritory", currentCutDrawings);
+ if (CollectionUtil.isNotEmpty(currentCutDrawings)) {
+ jsonObject.append("engineer", engineering.getEngineerId());
+ jsonObject.append("sequence", patternSequence);
+ UpPattenUsage upPattenUsage = upPattenUsageMapper.selectOne(new LambdaQueryWrapper<UpPattenUsage>()
+ .eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId())
+ .eq(UpPattenUsage::getLayoutSequence, patternSequence));
+ jsonObject.append("upPattenUsage", upPattenUsage);
+ }
+ return jsonObject;
}
+ @Override
+ public Map<String, Object> queryCutDrawingByEngineerId(String engineerId, int patternSequence) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("currentCutDrawing", baseMapper.queryCutDrawingByEngineerId(engineerId, patternSequence, 0));
+ List<GlassInfo> glassInfoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getEngineerId, engineerId));
+ long totalPatternSequence = glassInfoList.stream().map(GlassInfo::getPatternSequence).distinct().count();
+ map.put("totalPatternSequence", totalPatternSequence);
+ UpPattenUsage upPattenUsage = upPattenUsageMapper.selectOne(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId)
+ .eq(UpPattenUsage::getLayoutSequence, patternSequence));
+ map.put("upPattenUsage", upPattenUsage);
+ return map;
+
+ }
+
+
/**
- * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ * 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘
*
* @param current
* @return
*/
@Override
- public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
- //缁撴灉
- List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
+ public List<Map<String, Object>> selectTemperingTerritory(String current) {
//姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
- List<Map<String, Object>> cutTerritory=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
- .selectAll(OptimizeDetail.class)
- .selectAs(OptimizeLayout::getWidth, "olWidth")
- .selectAs(OptimizeLayout::getHeight, "olHeight")
- .leftJoin(OptimizeLayout.class, on -> on
- .eq(OptimizeLayout::getProjectNo, OptimizeDetail::getProjectNo)
- .eq(OptimizeLayout::getStockId, OptimizeDetail::getStockId))
- .eq(OptimizeDetail::getProjectNo, current)
+ List<Map<String, Object>> resultCutTerritory = optimizeHeatDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeHeatDetail.class)
+ .selectAll(OptimizeHeatDetail.class)
+ .selectAs(OptimizeProject::getLoadWidth, "olWidth")
+ .selectAs(OptimizeProject::getLoadLength, "olHeight")
+ .selectAs(OptimizeHeatLayout::getLayoutRate, "olLayoutRate")
+ .leftJoin(OptimizeHeatLayout.class, on -> on
+ .eq(OptimizeHeatLayout::getProjectNo, OptimizeHeatDetail::getProjectNo)
+ .eq(OptimizeHeatLayout::getLayoutId, OptimizeHeatDetail::getLayoutId))
+ .leftJoin(OptimizeProject.class, on -> on
+ .eq(OptimizeProject::getProjectNo, OptimizeHeatLayout::getProjectNo))
+ .eq(OptimizeHeatDetail::getProjectNo, current)
+ .gt(OptimizeHeatDetail::getLayoutId, 0)
);
+ //杩欓噷灏辨槸 鎸夌増鍥惧彿鍒嗙粍 [{layout_id:"1",width:200,height:300...},{layout_id:"2",width:300,height:300...}]
+ Map<String, List<Map<String, Object>>> groupBy = resultCutTerritory.stream().collect(Collectors.groupingBy(item -> item.get("layout_id").toString()));
+ //鎸夌増鍥惧彿鎺掑簭
- Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
- .selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getEngineerId,current)
- .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
- ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails));
+ List<Map<String, Object>> result = new ArrayList<>();//杩斿洖缁撴灉
+ for (int i = 1; i <= groupBy.keySet().size(); i++) {
+ String key = i + "";
+ if (key != null) {
+ List<Map<String, Object>> galssInfo = groupBy.get(key);//褰撳墠閽㈠寲鐗堝浘鍐呯幓鐠冨皬鐗囬泦鍚�
+ if (!galssInfo.isEmpty()) {
+ Map<String, Object> item = new HashMap<>();//鏂版牸寮忕紪鎺�
+ //浠ヤ笅涓哄悓灞� {key:"groupBy.get(key)",olLayoutRate:"灏忕墖闆嗗悎"}
+ // {key:"groupBy.get(key)",olLayoutRate:[{},{},{},{}]}
- Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
- .selectAll(Damage.class)
- .eq(Damage::getEngineerId,current)
- ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage));
- for (Map<String, Object> item : cutTerritory) {
-// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
- if(item.get("glass_id")==null||"".equals(item.get("glass_id"))){
- log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritory);
- return new ArrayList<>();
- }else if(edgMaps.get(item.get("glass_id"))!=null){
- item.put("glass_state",edgMaps.get(item.get("glass_id")).getState());
- }else if(damageMaps.get(item.get("glass_id"))!=null){
- //log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
- item.put("glass_state",damageMaps.get(item.get("glass_id")).getStatus());
- }else{
- item.put("glass_state",0);
+ item.put("listGlass", groupBy.get(key));
+ item.put("LayoutId", key);
+ item.put("olWidth", galssInfo.get(0).get("olWidth").toString());
+ item.put("olHeight", galssInfo.get(0).get("olHeight").toString());
+ item.put("olLayoutRate", galssInfo.get(0).get("olLayoutRate").toString());
+ result.add(item);
+ } else {
+ log.info("褰撳墠閽㈠寲鐗堝浘涓嶅瓨鍦ㄥ皬鐗囨暟鎹妫�鏌ワ紝鐗堝浘鍙�:{}" + key);
+ return null;
+ }
}
- resultCutTerritory.add(item);
}
- Map<String, List<Map<String, Object>>> groupBy=resultCutTerritory.stream().collect(Collectors.groupingBy(item->item.get("stock_id").toString()));
-// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
- return new ArrayList<>(groupBy.values());
+// List<List<Map<String, Object>>> result = new ArrayList<>();//杩斿洖缁撴灉
+//
+// for (int i = 1; i <= groupBy.keySet().size(); i++) {
+// String key = i + "";
+// if (key != null) {
+// result.add(groupBy.get(key));
+// }
+// }
+ return result;
}
/**
@@ -315,22 +289,95 @@
EdgStorageCageDetails outEdgStorageCageDetails = null;
// if (queryMaxMinDiff(threshold))
- //todo:閫昏緫1锛氳幏鍙栦袱鏉＄嚎宸插嚭鏈�鍚庝竴鍧楃幓鐠冨湪绗煎唴鐩稿悓灏哄鎵�鍓╂暟閲忥紝浼樺厛璧版暟閲忓皯鐨勭嚎
- //todo:闇�瑕佸湪鍗у紡鐞嗙墖绗艰鎯呰〃涓柊澧炵姸鎬侊紝鐢ㄦ潵琛ㄧず鐜荤拑杩涘嚭鐞嗙墖绗兼儏鍐�
- if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {
- log.info("鎸夌収涓婁竴鐗囧凡鍑虹幓鐠冨搴}锛岄珮搴}锛屽強鐗堝浘id鍖洪棿{}鍒皗}鑾峰彇鍑虹墖浠诲姟鐜荤拑淇℃伅", oldEdgStorageCageDetails.getWidth()
- , oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + threshold);
- outEdgStorageCageDetails = this.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
- .notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
- .eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())
- .eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())
- .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
- .last("limit 1"));
- log.info("鍑虹墖浠诲姟鐨勭幓鐠冧俊鎭細{}", outEdgStorageCageDetails);
- }
+ //todo:閫昏緫1锛氳幏鍙栦袱鏉＄嚎宸插嚭鏈�鍚庝竴鍧楃幓鐠冨湪绗煎唴鐩稿悓灏哄鎵�鍓╂暟閲忥紝浼樺厛璧版暟閲忓皯鐨勭嚎
+ //todo:闇�瑕佸湪鍗у紡鐞嗙墖绗艰鎯呰〃涓柊澧炵姸鎬侊紝鐢ㄦ潵琛ㄧず鐜荤拑杩涘嚭鐞嗙墖绗兼儏鍐�
+ if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {
+ log.info("鎸夌収涓婁竴鐗囧凡鍑虹幓鐠冨搴}锛岄珮搴}锛屽強鐗堝浘id鍖洪棿{}鍒皗}鑾峰彇鍑虹墖浠诲姟鐜荤拑淇℃伅", oldEdgStorageCageDetails.getWidth()
+ , oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + threshold);
+ outEdgStorageCageDetails = this.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
+ .eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())
+ .eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
+ .last("limit 1"));
+ log.info("鍑虹墖浠诲姟鐨勭幓鐠冧俊鎭細{}", outEdgStorageCageDetails);
+ }
if (outEdgStorageCageDetails == null) {
outEdgStorageCageDetails = minTemperingLayoutId;
}
return outEdgStorageCageDetails;
}
+
+
+ @Override
+ public String identControls(DamageRequest request) {
+ //灏嗚瘑鍒牬鎹熺殑鐜荤拑鐩存帴鍔犲叆鐮存崯琛�
+ damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "鎺扮墖璇嗗埆", request.getState());
+ return "success";
+ }
+
+ @Override
+ public String edgReportStatus(DamageRequest request) {
+ //灏嗙（杈归槦鍒楃牬鎹熺殑鐜荤拑鐩存帴鍔犲叆鐮存崯琛�
+ damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "纾ㄨ竟娓呮礂", request.getState());
+
+ //淇敼纾ㄨ竟闃熷垪鏁版嵁鐘舵��
+ edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
+ .set(EdgGlassTaskInfo::getState, request.getState()).eq(EdgGlassTaskInfo::getGlassId, request.getGlassId()));
+ return "success";
+ }
+
+ /**
+ * 杩涚墖 鎵爜ID楠岃瘉閲嶅
+ *
+ * @param glassId
+ * @return
+ */
+ @Override
+ public boolean inToVerify(String glassId) {
+ List<EdgStorageCageDetails> listEdgStorageCageDetails = baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getGlassId, glassId)
+ );
+ if (listEdgStorageCageDetails.isEmpty()) {
+ //璇存槑姝ょ幓鐠冩病鏈夎繘杩囩悊鐗�
+ return true;
+ } else {
+ List<Damage> damage = damageService.list(new LambdaQueryWrapper<Damage>()
+ .eq(Damage::getGlassId, glassId)
+ .and(wrapper -> wrapper.eq(Damage::getType, 8).or().eq(Damage::getType, 9))
+ );
+ if (!damage.isEmpty()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height, int cell, int maxThickness) {
+ return baseMapper.queryEdgStorageDetailsBySize(deviceId, currentSlot, width, height, cell, maxThickness);
+ }
+
+ @Override
+ public EdgStorageCageDetails queryEdgStorageDetailsByLimitSize(int deviceId, Integer currentCell, double width, double height, int cell, int minOneFirstLength, int minOneSecondLength, int maxTwoFirstLength, int maxTwoSecondLength, int maxThickness) {
+ return baseMapper.queryEdgStorageDetailsByLimitSize(deviceId, currentCell, width, height, cell, minOneFirstLength, minOneSecondLength, maxTwoFirstLength, maxTwoSecondLength, maxThickness);
+ }
+
+ @Override
+ public String edgDetailsOperate(DamageRequest request) {
+ //鍗у紡鐞嗙墖绗肩垎鐮存崯
+ damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "鍗у紡鐞嗙墖绗�", request.getState());
+ this.remove(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getGlassId, request.getGlassId()));
+ return "success";
+ }
+
+ @Override
+ public List<EdgSlotRemainVO> querySlotRemainWidth(int cellLength, int glassGap) {
+ return this.baseMapper.querySlotRemainWidth(cellLength, glassGap);
+ }
+
+ @Override
+ public List<PieChartVO> queryPieChart() {
+ return this.baseMapper.queryPieChart();
+ }
}
--
Gitblit v1.8.0