From efa1d4bc8ba02a6d3951c1c2850f9cb5aa6964e1 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 22 四月 2024 11:18:04 +0800
Subject: [PATCH] 前端交互数据更新，注释更新
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 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 e5339fb..cebe39d 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,15 +1,13 @@
package com.mes.edgstoragecage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
-import com.github.yulichang.wrapper.interfaces.LambdaJoin;
-import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
-import com.mes.taskcache.mapper.HangzhouMesMapper;
+import com.mes.pp.entity.OptimizeDetail;
+import com.mes.pp.mapper.OptimizeDetailMapper;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,44 +28,52 @@
@Autowired
UpPattenUsageMapper upPattenUsageMapper;
+ @Autowired
+ OptimizeDetailMapper optimizeDetailMapper;
- //璇嗗埆 鐮存崯/鎷胯蛋
- public boolean identWorn(String glassid, int ControlsId) {
- List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ /**
+ * 璇嗗埆 鎷胯蛋:200/鐮存崯:201
+ * @param glassId
+ * @param ControlsId
+ * @return
+ */
+ public boolean identWorn(String glassId, int ControlsId) {
+ List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glass_id", glassId));
if (edgStorageCageDetails.size() == 1) {
- baseMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ EdgStorageCageDetails item=edgStorageCageDetails.get(0);
+ item.setState(ControlsId);
+ baseMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glass_id", glassId));
return true;
}
return false;
}
- //鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ /**
+ * 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ * @return
+ */
@Override
- public List<Map> selectCutTerritory() {
- List<Map> list = upPattenUsageMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
- .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
- .select("gi.x_coordinate","gi.y_coordinate","gi.tempering_feed_sequence")
- .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
- .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
- .eq("t.state", 1)
- .orderByAsc("t.layout_sequence")
- );
- return list;
+ public List<OptimizeDetail> selectCutTerritory() {
+ List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectList(new QueryWrapper<UpPattenUsage>()
+ .eq("state", 1));
+ if(!upPattenUsage.isEmpty()){
+ UpPattenUsage upPattenUsage1=upPattenUsage.get(0);
+ return optimizeDetailMapper.selectList(new QueryWrapper<OptimizeDetail>()
+ .eq("project_no", upPattenUsage1.getEngineeringId())
+ .eq("stock_id",upPattenUsage1.getLayoutSequence())
+ );
+ }
+ return null;
}
- //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ /**
+ * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ * @param current
+ * @return
+ */
@Override
- public List<Map> selectCurrentCutTerritory(String current) {
- List<Map> list = baseMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
- .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
- .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
- .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
- .eq("t.engineering_id", current)
- .orderByAsc("t.layout_sequence")
- );
- return list;
+ public List<OptimizeDetail> selectCurrentCutTerritory(String current) {
+ return optimizeDetailMapper.selectList(new QueryWrapper<OptimizeDetail>().eq("project_no", current));
}
;
--
Gitblit v1.8.0