From 48be263891d34bfac0417c1e8d047fef673f0900 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 28 四月 2024 14:17:42 +0800
Subject: [PATCH] Merge branch 'security_20240424'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 176 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 94 insertions(+), 82 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index b432ec6..958affc 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -1,7 +1,6 @@
package com.mes.downstorage.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.common.PLCAutoMes;
import com.mes.common.S7control;
import com.mes.device.PlcParameterObject;
@@ -10,7 +9,6 @@
import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.mapper.DownStorageCageMapper;
-import com.mes.downstorage.service.DownStorageCageDetailsService;
import com.mes.downstorage.service.DownStorageCageService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
@@ -32,19 +30,16 @@
@Slf4j
@Service
public class DownStorageCageServiceImpl extends ServiceImpl<DownStorageCageMapper, DownStorageCage> implements DownStorageCageService {
- @Autowired
- private DownStorageCageMapper downStorageCageMapper;
@Autowired
private GlassInfoService glassInfoService;
-
+ @Autowired
+ private DownStorageCageService downStorageCageService;
@Autowired
private DownGlassTaskService downGlassTaskService;
- @Autowired
- private DownStorageCageDetailsService downStorageCageDetailsService;
@Override
public List<Map> gettask(){
- downStorageCageMapper.selectList(null);
+ baseMapper.selectList(null);
// downStorageCageMapper.selectJoin();
return null;
};
@@ -54,8 +49,10 @@
@Override
public List<DownStorageCageDetails> getCacheLeisure() {
log.info(" 鏌ヨ绗煎瓙鍐呯┖闂�");
-// List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
-// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// MPJLambdaWrapper<DownStorageCageDetails> wrapper = new MPJLambdaWrapper<>();
+// wrapper.selectAll(DownStorageCageDetails.class)
+// List<DownStorageCageDetails> list = baseMapper.selectJoinList(
+// DownStorageCageDetails.class,Wrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
// .isNull("escd.slot")
@@ -66,17 +63,20 @@
}
- @Override
- public List<Map> selectCacheEmpty(){
- return baseMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<DownStorageCage>().selectAll(DownStorageCage.class)
- .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
- .leftJoin("down_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
- .isNull("escd.slot")
- );
- }
-
-
+// @Override
+// public List<Map> getCacheOut(int start, int end) {
+// log.info(" 鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�");
+// List<Map> map = downStorageCageMapper.selectJoinList(
+// Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id")
+// .isNotNull("escd.slot")
+// .between("dw.workstation_id", start, end)
+// .orderByAsc("escd.tempering_layout_id, escd.tempering_feed_sequence")
+// );
+// return map;
+// }
@@ -85,7 +85,7 @@
@Override
public List<DownStorageCageDetails> getCacheOut(int start, int end) {
log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�");
-// return downStorageCageMapper.selectJoinList(
+// return baseMapper.selectJoinList(
// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -106,7 +106,7 @@
@Override
public List<Map> getCacheInfo() {
log.info(" 鏌ヨ绗煎瓙鍐呬俊鎭�");
-// return downStorageCageMapper.selectJoinList(
+// return baseMapper.selectJoinList(
// Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -121,7 +121,7 @@
@Override
public List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width) {
log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸");
-// List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
+// List<DownStorageCageDetails> list = baseMapper.selectJoinList(
// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -144,7 +144,7 @@
@Override
public List<DownStorageCageDetails> IsExistIntoCacheByflowcardid(String flowcardid, double width) {
log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
-// return downStorageCageMapper.selectJoinList(
+// return baseMapper.selectJoinList(
// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -155,13 +155,14 @@
// .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
// );
return null;
+
}
@Override
public List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width) {
- log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
-// return downStorageCageMapper.selectJoinList(
+// log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
+// return baseMapper.selectJoinList(
// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -184,7 +185,7 @@
public List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width) {
log.info(" 鍗曠墖鎯呭喌 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓娴佺▼鍗″彿鐨勭┖鏍�");
-// return downStorageCageMapper.selectJoinList(
+// return baseMapper.selectJoinList(
// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
// .select("escd.*")
// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -198,24 +199,22 @@
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// @Override
+// public List<DownStorageCageDetails> Out() {
+// log.info("鍗曠墖鎯呭喌 鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓уぇ灏忓嚭鐗囩殑灏忕墖");
+//
+//
+// return downStorageCageMapper.selectJoinList(
+// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id")
+// .isNotNull("escd.slot")
+//
+// .orderByDesc("escd.width")
+// .orderByDesc("escd.height")
+// );
+// }
@@ -239,21 +238,6 @@
}
- public DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, String startCell, String endCell,String taskType ) {
- DownGlassTask downGlassTask = new DownGlassTask();
- downGlassTask.setId(glassInfo.getId());
- downGlassTask.setStartCell(startCell);
- downGlassTask.setTaskType(taskType);
- downGlassTask.setEndCell(endCell);
- downGlassTask.setWidth(glassInfo.getWidth());
- downGlassTask.setHeight(glassInfo.getHeight());
- downGlassTask.setFilmsid(String.valueOf(glassInfo.getFilmsid()));
- downGlassTask.setThickness(glassInfo.getThickness());
- downGlassTask.setFlowCardId(glassInfo.getFlowCardId());
-
- return downGlassTask;
- }
-
@Override
public boolean processInto(String Number) {
@@ -265,12 +249,7 @@
if (GlassInfo != null) {
//鍚屾壘鍒板悓娴佺▼鍗￠檮杩戠┖鏍�
List<DownStorageCageDetails> list = getIsExistIntoCacheByflowcardid(GlassInfo.getFlowcardId(), GlassInfo.getWidth());
-
- List<Map> selectCacheEmpty=selectCacheEmpty();
-
- // list<Map> list=selectCacheEmpty();
-// list<Map> = downStorageCageService.selectCacheEmpty();
- if (selectCacheEmpty.size() > 0) {
+ if (list.size() > 0) {
//瀛樺湪绌烘牸
//1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
//2.鍥炲 1杩涚墖
@@ -309,11 +288,10 @@
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
- List<DownStorageCageDetails> list = downStorageCageDetailsService.CacheOut(1, 5);
- List<DownStorageCageDetails> list2 = downStorageCageDetailsService.CacheOut(6, 10);
- List<DownStorageCageDetails> list3 = downStorageCageDetailsService.CacheOut(1, 10);
+ List<DownStorageCageDetails> list = getCacheOut(1, 5);
+ List<DownStorageCageDetails> list2 = getCacheOut(6, 10);
+ List<DownStorageCageDetails> list3 = getCacheOut(1, 10);
//鑷姩缁戝畾鏋跺瓙
-
@@ -328,8 +306,16 @@
// selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
- DownGlassTask downGlassTask =createDownGlassTask(item3,"0",endcell,"2");
-
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(item3.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setEndCell(endcell);
+ downGlassTask.setTaskType("2");
+ downGlassTask.setWidth(item3.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(item3.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(item3.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(item3.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(item3.getFlowCardId()); // 璁剧疆娴佺▼鍗″彿
downGlassTaskService.insertCacheTask(downGlassTask);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
@@ -338,14 +324,22 @@
}
- //濡傛灉鍚屾椂鍓嶅悗绔兘绌洪棽 浼樺厛鍚庣鍑虹墖骞朵笖浼樺厛婊℃灦
- else if (!list2.isEmpty()) {
-
- DownStorageCageDetails item3 = list2.get(0);
+ //鍚屾椂璇锋眰 浼樺厛鍚庣鍑虹墖
+ else if (!list3.isEmpty()) {
+ DownStorageCageDetails item3 = list3.get(0);
String endcell = "11";
String SendEndcell = "1";
// selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
- DownGlassTask downGlassTask =createDownGlassTask(item3,"0",endcell,"2");
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(item3.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setEndCell(endcell);
+ downGlassTask.setTaskType("2");
+ downGlassTask.setWidth(item3.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(item3.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(item3.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(item3.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(item3.getFlowCardId()); // 璁剧疆娴佺▼鍗″彿
downGlassTaskService.insertCacheTask(downGlassTask);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
@@ -359,19 +353,37 @@
// 鍑哄埌 G06
//selectInfo.insertCacheTask(item.getGlassId() + "", "0", "06", "2", item.getWidth(), item.getHeight(), item.getFilmsid(), item.getThickness(), item.getFlowCardId());
-
- DownGlassTask downGlassTask =createDownGlassTask(item,"0","06","2");
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(item.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setEndCell("06");
+ downGlassTask.setTaskType("2");
+ downGlassTask.setWidth(item.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(item.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(item.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(item.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(item.getFlowCardId()); // 璁剧疆娴佺▼鍗″彿
+ downGlassTaskService.insertCacheTask(downGlassTask);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "1");
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
- // 鎸夌収澶у皬绗﹀悎鍚庣鍑虹墖
+ // 鎸夌収椤哄簭绗﹀悎鍚庣鍑虹墖
} else if (!list2.isEmpty()) {
DownStorageCageDetails item2 = list2.get(0);
// 鍑哄埌 G11
// selectInfo.insertCacheTask(item2.getGlassId() + "", "0", "11", "2", item2.getWidth(), item2.getHeight(), item2.getFilmsid(), item2.getThickness(), item2.getFlowCardId());
- DownGlassTask downGlassTask =createDownGlassTask(item2,"0","11","2");
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(item2.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setStartCell("0");
+ downGlassTask.setEndCell("11");
+ downGlassTask.setTaskType("2");
+ downGlassTask.setWidth(item2.getWidth()); // 璁剧疆鐜荤拑瀹藉害
+ downGlassTask.setHeight(item2.getHeight()); // 璁剧疆鐜荤拑楂樺害
+ downGlassTask.setFilmsid(item2.getFilmsid()+""); // 璁剧疆鑶淚D
+ downGlassTask.setThickness(item2.getThickness()); // 璁剧疆鐜荤拑鍘氬害
+ downGlassTask.setFlowCardId(item2.getFlowCardId()); // 璁剧疆娴佺▼鍗″彿
downGlassTaskService.insertCacheTask(downGlassTask);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "2");
--
Gitblit v1.8.0