From 889ff0512bc68be0f5d231a524bf97c9488ec37f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 16 五月 2024 16:13:20 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 407 ++++++++++++---------------------------------------------
1 files changed, 87 insertions(+), 320 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 de2da46..e580072 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,8 +1,10 @@
package com.mes.downstorage.service.impl;
-import com.github.yulichang.query.MPJQueryWrapper;
-import com.mes.common.PLCAutoMes;
-import com.mes.common.S7control;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+
import com.mes.device.PlcParameterObject;
import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.service.DownGlassTaskService;
@@ -15,8 +17,9 @@
import com.mes.downstorage.service.DownStorageCageService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.tools.WebSocketServer;
+import com.mes.pp.entity.OptimizeDetail;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,7 +28,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -34,7 +37,7 @@
@Slf4j
@Service
public class DownStorageCageServiceImpl extends ServiceImpl<DownStorageCageMapper, DownStorageCage> implements DownStorageCageService {
- @Autowired
+ @Autowired(required = false)
private DownStorageCageMapper downStorageCageMapper;
@Autowired
@@ -44,349 +47,113 @@
private DownGlassTaskService downGlassTaskService;
@Autowired
private DownStorageCageDetailsService downStorageCageDetailsService;
- @Override
- public List<Map> gettask(){
- downStorageCageMapper.selectList(null);
-// downStorageCageMapper.selectJoin();
- return null;
- };
-
-
+ @Autowired
+ private DownStorageCageDetailsMapper downStorageCageDetailsMapper;
@Override
- public List<DownStorageCageDetails> getCacheLeisure() {
- log.info(" 鏌ヨ绗煎瓙鍐呯┖闂�");
- List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
- DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNull("escd.slot")
- .orderByAsc("escd.slot")
- );
- return list;
- }
-
-
- @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<DownStorageCageDetails> getCacheOut(int start, int end) {
- 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")
- .leftJoin("glass_info gi on dw.flow_card_id = gi.flowcard_id and gi.flowcard_id=escd.flow_card_id ")
- .isNotNull("escd.slot")
- .between("dw.workstation_id", start, end)
- .orderByDesc("escd.width")
- .orderByDesc("escd.height")
- );
- }
-
-
-
-
-
- @Override
- public List<Map> getCacheInfo() {
- log.info(" 鏌ヨ绗煎瓙鍐呬俊鎭�");
- return downStorageCageMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .orderByAsc("t.slot")
- );
-
- }
-
-
-
- @Override
- public List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width) {
- log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸");
- List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
- DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNotNull("escd.slot")
- .eq("escd.tempering_layout_id", tempering_layout_id)
- .lt("escd.tempering_feed_sequence", tempering_feed_sequence)
- .gt("t.remain_width", width)
- .orderByAsc("escd.tempering_feed_sequence")
- );
- return list;
- }
-
-
-
-
-
-
-
- @Override
- public List<DownStorageCageDetails> IsExistIntoCacheByflowcardid(String flowcardid, double width) {
- log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
- return downStorageCageMapper.selectJoinList(
- DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNotNull("escd.slot")
- .lt("escd.flow_card_id", flowcardid)
- // 鏉′欢 t.remain_width - width > 0
- .apply("t.remain_width - " + width + " > 0")
- .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
- );
-
- }
-
-
- @Override
- public List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width) {
- log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
- return downStorageCageMapper.selectJoinList(
- DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNotNull("escd.slot")
- .lt("escd.tempering_layout_id", tempering_layout_id)
- // 鏉′欢 t.remain_width - width > 0
- .apply("t.remain_width - " + width + " > 0")
- .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
- );
-
- }
-
-
-
-
-
-
-
- @Override
- public List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width) {
- log.info(" 鍗曠墖鎯呭喌 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓娴佺▼鍗″彿鐨勭┖鏍�");
-
- return downStorageCageMapper.selectJoinList(
- DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNotNull("escd.slot")
- .eq("escd.flow_card_id", flowcardid)
- .gt("t.remain_width", width)
- .orderByAsc("escd.sequence")
- );
-
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- public DownGlassTask createDownGlassTask(GlassInfo glassInfo, String startCell, String endCell,String taskType ) {
+ public DownGlassTask createDownGlassTask(GlassInfo glassInfo, String startCell, String endCell, String taskType) {
DownGlassTask downGlassTask = new DownGlassTask();
- downGlassTask.setId(glassInfo.getId());
+
+ BeanUtils.copyProperties(glassInfo, downGlassTask);
+
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 DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, String startCell, String endCell, String taskType) {
+ DownGlassTask downGlassTask = new DownGlassTask();
+
+ BeanUtils.copyProperties(glassInfo, downGlassTask);
+ downGlassTask.setStartCell(startCell);
+ downGlassTask.setTaskType(taskType);
+ downGlassTask.setEndCell(endCell);
return downGlassTask;
}
- 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 List<DownStorageCageDetails> selectCacheEmpty() {
+ return baseMapper.selectJoinList(DownStorageCageDetails.class,
+ JoinWrappers.lambda(DownStorageCage.class)
+ .selectAll(DownStorageCage.class)
+ .select(DownStorageCageDetails::getWidth, DownStorageCageDetails::getHeight, DownStorageCageDetails::getGlassId)
+ .leftJoin(DownStorageCageDetails.class, on -> on
+ .eq(DownStorageCageDetails::getDeviceId, DownStorageCage::getDeviceId)
+ .eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot))
+ .isNull(DownStorageCageDetails::getSlot)
+ );
}
+
+
+
+
@Override
- public boolean processInto(String Number) {
+ public List<Map<String, Object>> selectDownStorageCages() {
+ return baseMapper.selectJoinMaps(JoinWrappers.lambda(DownStorageCage.class)
+ .selectAll(DownStorageCage.class)
+ .selectAs(DownStorageCageDetails::getId, "esdId")
+ .select(DownStorageCageDetails::getGlassId, DownStorageCageDetails::getWidth, DownStorageCageDetails::getHeight, DownStorageCageDetails::getId)
+ .leftJoin(DownStorageCageDetails.class, on -> on
+ .eq(DownStorageCageDetails::getDeviceId, DownStorageCage::getDeviceId)
+ .eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot))
+ );
- //鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
- PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
- //瀛樺湪姝ょ幓鐠冪紪鍙�
- 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) {
- //瀛樺湪绌烘牸
- //1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
- //2.鍥炲 1杩涚墖
- DownStorageCageDetails item = list.get(0);
-
- //selectInfo.insertCacheTask(GlassInfo.getId() + "", "0", item.getSlot() + "", "1", GlassInfo.getWidth(), GlassInfo.getHeight(), GlassInfo.getFilmsid(), GlassInfo.getThickness(), GlassInfo.getFlowcardId());
-
- DownGlassTask downGlassTask = createDownGlassTask(GlassInfo,"0",item.getSlot()+"","1");
-
- downGlassTaskService.insertCacheTask(downGlassTask);
-
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
-
-
- //瀹屾垚鍚庢彃鍏ュ皬鐗囨暟鎹埌缂撳瓨琛�
- return true;
- }
-
- } else {
- // ID缂栧彿涓嶅瓨鍦� 涓嶅鐞�/鍥炲PLC 杩涜鎶ヨ鎻愮ず
- }
- //杩斿洖缁撴灉
- return false;
}
-
/**
- * 鐞嗙墖 鍑�
+ * 淇敼鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愬惎鐢�/绂佺敤銆�
+ *
+ * @param downStorageCage
* @return
*/
- //
@Override
- public boolean processOut() {
- // 鏌ヨ浠诲姟
+ public boolean updateDownStorageCage(DownStorageCage downStorageCage) {
+ DownStorageCage downItem = baseMapper.selectById(downStorageCage.getId());
+ downItem.setEnableState(downStorageCage.getEnableState());
+ baseMapper.updateById(downItem);
+ return true;
+ }
-
- 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);
- //鑷姩缁戝畾鏋跺瓙
-
-
-
-
- // 浼樺厛 瓒呭嚭灏哄浼樺厛浜哄伐鍑虹墖 浜哄伐澶勭悊
-
- if (!list3.isEmpty()) {
- DownStorageCageDetails item3 = list3.get(0);
- if (item3.getHeight() >= 1 && item3.getWidth() >= 1) {
-
- String endcell = "13";
- 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");
-
- downGlassTaskService.insertCacheTask(downGlassTask);
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
+ /**
+ * 淇敼鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
+ *
+ * @param downStorageCageId
+ * @param downStorageCageDetails
+ * @return
+ */
+ @Override
+ public boolean updateDownStorageCageDetails(int downStorageCageId, DownStorageCageDetails downStorageCageDetails) {
+ DownStorageCage downItem = baseMapper.selectById(downStorageCageId);
+ log.info("姝ｅ父" + downItem);
+ if (downStorageCageDetails != null) {
+ DownStorageCageDetails edgDItem = downStorageCageDetailsMapper.selectById(downStorageCageDetails.getId());
+ //娣诲姞
+ if (edgDItem != null) {
+ //鍙紶鏍煎瓙 锛氱Щ闄ょ幓鐠�
+ DownStorageCageDetails newresult = downStorageCageDetailsMapper.selectById(downStorageCageDetails.getId());
+ newresult.setSlot(downItem.getSlot());
+ downStorageCageDetailsMapper.updateById(newresult);
}
}
-
- //濡傛灉鍚屾椂鍓嶅悗绔兘绌洪棽 浼樺厛鍚庣鍑虹墖骞朵笖浼樺厛婊℃灦
- else if (!list2.isEmpty()) {
-
- DownStorageCageDetails item3 = list2.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");
- downGlassTaskService.insertCacheTask(downGlassTask);
-
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
+ if (downItem != null) {
+ //绉婚櫎
+ DownStorageCageDetails result = downStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<DownStorageCageDetails>().eq(DownStorageCageDetails::getSlot, downStorageCageId));
+ if (result != null) {
+ result.setSlot(0);
+ downStorageCageDetailsMapper.updateById(result);
+ }
}
- // 鎸夌収澶у皬绗﹀悎鍓嶇鍑虹墖
- else if (!list.isEmpty()) {
- DownStorageCageDetails item = list.get(0);
-
- // 鍑哄埌 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");
- 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");
- downGlassTaskService.insertCacheTask(downGlassTask);
-
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "2");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
-
-
- }
-
-
-
- // 杩斿洖缁撴灉
- return false;
+ return true;
}
-
-
-
-
-
}
--
Gitblit v1.8.0