From e0699feb382ad3c01040f135f53698ac5c6ec84e Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 四月 2024 10:42:24 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 62 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 21 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 5925f22..c9df250 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,10 +1,9 @@
package com.mes.edgstoragecage.service.impl;
-import com.github.yulichang.query.MPJQueryWrapper;
-import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper;
-import com.mes.edgstoragecage.entity.EdgStorageCage;
-import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.taskcache.mapper.HangzhouMesMapper;
@@ -15,7 +14,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -25,26 +24,47 @@
public class EdgStorageCageDetailsServiceImpl extends ServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
//鑾峰彇鍏ㄩ儴鏁版嵁
@Autowired
- private HangzhouMesMapper hangzhouMesMapper;
- @Autowired
private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
- //鑾峰彇纾ㄨ竟鍓嶇紦瀛樼悊鐗囩淇℃伅
- @Override
- public List<Map> getEdgStorageInfos(){
- List<Map> map=edgStorageCageDetailsMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
- .select("a.c","a.d")
- .leftJoin("ab a on t.id=a.id")
- .le("a.id","1")
- );
- return map;
- };
+ //璇嗗埆 鐮存崯/鎷胯蛋
+ public boolean identWorn(String glassid, int ControlsId) {
+ List<EdgStorageCageDetails> edgStorageCageDetails = edgStorageCageDetailsMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ if (edgStorageCageDetails.size() == 1) {
+ edgStorageCageDetailsMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ return true;
+ }
+ return false;
+ }
+ //鑾峰彇 鍒囧壊褰撳墠鐗堝浘
@Override
- public List<Map> setEdgStorageInfos(){
- return hangzhouMesMapper.selectCachInfo();
- };
+ public List<Map> selectCutTerritory() {
+ List<Map> list = edgStorageCageDetailsMapper.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("state", 1)
+ .orderByAsc("t.layout_sequence")
+ );
+ return list;
+ }
+
+ //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ @Override
+ public List<Map> selectCurrentCutTerritory(String current) {
+ List<Map> list = edgStorageCageDetailsMapper.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;
+ }
+
+ ;
}
--
Gitblit v1.8.0