From b46393eb6df477a5185e7c2a32c4b55f2bba327f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 13 三月 2025 09:58:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 7ab8534..78ec958 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
@@ -2,6 +2,7 @@
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;
@@ -18,6 +19,7 @@
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;
@@ -77,7 +79,7 @@
EdgGlassTaskInfoService edgGlassTaskInfoService;
@Override
- public List<CutDrawingVO> queryCurrentCutDrawing(int deviceId, int stationCell) {
+ public JSONObject queryCurrentCutDrawing(int deviceId, int stationCell) {
// 鑾峰彇鏈潯绾垮綋鍓嶆鍦ㄦ墽琛岀殑宸ョ▼
Engineering engineering = engineeringMapper.selectOne(new LambdaQueryWrapper<Engineering>()
.eq(Engineering::getState, 1).eq(Engineering::getStationCell, stationCell));
@@ -102,9 +104,15 @@
patternSequence = lastGlass.getPatternSequence() + 1;
} else {
//褰撳墠鐗堝浘鏄惁鏈夊墿浣欙紝鏈夊墿浣欐樉绀哄綋鍓嶇増鍥�
- patternSequence = lastGlass.getPatternSequence(); }
+ patternSequence = lastGlass.getPatternSequence();
+ }
}
- return baseMapper.queryCutDrawingByEngineerId(engineering.getEngineerId(), patternSequence, 0);
+ JSONObject jsonObject = new JSONObject();
+ List<CutDrawingVO> currentCutDrawings = baseMapper.queryCutDrawingByEngineerId(engineering.getEngineerId(), patternSequence, 0);
+ jsonObject.append("currentCutTerritory", currentCutDrawings);
+ jsonObject.append("engineer", engineering.getEngineerId());
+ jsonObject.append("sequence", patternSequence);
+ return jsonObject;
}
@Override
@@ -340,7 +348,12 @@
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()));
+ 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);
+ }
}
--
Gitblit v1.8.0