From ad28331c1e3ed456b72765874b41b83b49dc279f Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期四, 18 四月 2024 14:44:11 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 155 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java new file mode 100644 index 0000000..12efb2c --- /dev/null +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java @@ -0,0 +1,155 @@ +package com.mes.downworkstation.service; + +import com.mes.common.PLCAutoMes; +import com.mes.device.PlcParameterObject; +import com.mes.downglassinfo.entity.DownGlassInfo; +import com.mes.downglassinfo.entity.DownGlassTask; +import com.mes.downglassinfo.mapper.DownGlassInfoMapper; +import com.mes.downglassinfo.service.DownGlassInfoService; +import com.mes.downglassinfo.service.DownGlassTaskService; +import com.mes.downstorage.entity.DownStorageCageDetails; +import com.mes.downworkstation.entity.DownWorkstation; +import com.mes.downworkstation.mapper.DownWorkstationMapper; +import com.mes.tools.WebSocketServer; +import lombok.Data; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Data +@Service +public class DownGlassLogic { + @Autowired + private DownGlassInfo downGlassInfo; + private DownWorkstation downWorkstation; + private DownGlassInfoMapper downGlassInfoMapper; + private DownGlassInfoService downGlassInfoService; + private DownGlassTaskService downGlassTaskService; + private DownWorkstationMapper downWorkstationMapper; + private DownWorkstationService downWorkstationService; + private DownWorkstationTaskService downWorkstationTaskService; + PlcParameterObject plcread = PLCAutoMes.PlcReadObject; + /** + * // 鏈烘鎵�1PLC璇锋眰瀛� + */ + String robot1PLCrequestword = plcread.getPlcParameter("A01Position").getValue(); + /** + * // 鏈烘鎵�2PLC璇锋眰瀛� + */ + String robot2PLCrequestword = plcread.getPlcParameter("A01Position").getValue(); + /** + * // 鐜荤拑id + */ + String glassID = plcread.getPlcParameter("A01Position").getValue(); + String glasswidth = plcread.getPlcParameter("A01Position").getValue(); + String glassheight = plcread.getPlcParameter("A01Position").getValue(); + // + String glassthickness = plcread.getPlcParameter("A01Position").getValue(); + String pLcwancheng = plcread.getPlcParameter("A01Position").getValue(); + + /** + * // 瀛樻斁寰呭鐞嗙殑鐜荤拑淇℃伅 + */ + private List<DownGlassInfo> glassList; + /** + * 瀛樻斁鐜荤拑鏀剧疆鍦ㄧ紦瀛樼涓殑璇︾粏淇℃伅 + */ + private List<DownStorageCageDetails> cageDetailsList; + + /** + * //褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃 + */ + + public void insertdownglassinfo() { + + + downWorkstationMapper = WebSocketServer.applicationContext.getBean(DownWorkstationMapper.class); + downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class); + downWorkstationTaskService = WebSocketServer.applicationContext.getBean(DownWorkstationTaskService.class); + downGlassInfoService = WebSocketServer.applicationContext.getBean(DownGlassInfoService.class); + downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class); + downGlassTaskService = WebSocketServer.applicationContext.getBean(DownGlassTaskService.class); + List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState(); +// + + + if (taskdownGlassInf != null && !taskdownGlassInf.isEmpty()) { + +// + + for (DownGlassTask downGlassInfo : taskdownGlassInf) { + // 鍒涘缓鏂扮殑 DownGlassInfo 瀵硅薄骞惰缃浉鍏冲睘鎬� + DownGlassInfo newdownGlassInfo = new DownGlassInfo(); + + newdownGlassInfo.setFlowCardId(downGlassInfo.getFlowCardId()); + Integer maxSequence = downGlassInfoService.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId()); + // 鍒濆鍖栭『搴忓瓧娈靛�� + int sequence = maxSequence != null ? maxSequence + 1 : 1; + + newdownGlassInfo.setWidth(downGlassInfo.getWidth()); + newdownGlassInfo.setHeight(downGlassInfo.getHeight()); + newdownGlassInfo.setThickness(downGlassInfo.getThickness()); + newdownGlassInfo.setFilmsid(downGlassInfo.getFilmsid()); + // 璁剧疆椤哄簭瀛楁鍊� + newdownGlassInfo.setSequence(sequence); + + // 鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃 + downGlassInfoService.insertDownGlassInfo(newdownGlassInfo); + //鎻掑叆鏁版嵁鍒版満姊版墜浠诲姟琛� + + downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo); + //鏇存柊涓嬬墖浠诲姟琛ㄧ姸鎬佷负0 + downGlassTaskService.updateTaskStateToZero(downGlassInfo.getFlowCardId()); + + sequence++; // 閫掑椤哄簭瀛楁鍊� + + + } + } + } + + + /** + * //褰撴満姊版墜浠诲姟琛ㄤ腑鐘舵�佷负1锛屽伐浣嶈〃娴佺▼鍗$粦瀹氫簡鏋跺瓙 鏇存柊宸茬粡钀芥灦鏁伴噺锛屽苟涓旀妸涓嬬墖浠诲姟琛ㄧ殑瀵瑰簲璁板綍鍒犳帀 + */ + + public void downWorkstation() { + + + try { + //鏌ヨ涓嬬墖宸ヤ綅琛ㄤ腑鏋跺瓙鏄惁缁戝畾浜嗘祦绋嬪崱鍙� 宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲� + List<DownWorkstation> taskdownWorkstation = downWorkstationMapper.selectdownWorkstationstate(); + if (taskdownWorkstation != null && !taskdownWorkstation.isEmpty()) { + //锛屽鏋滃凡缁忕粦瀹氬垯鏇存柊宸茶惤鏋舵暟閲�,骞朵笖鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰� + for (DownWorkstation downWorkstation : taskdownWorkstation) { + //鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲� + downWorkstationService.updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1); + //鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0 + downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getFlowCardId()); + //鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰� + downGlassTaskService.deleteTask(downWorkstation.getFlowCardId()); + + } + } + } catch (Exception e) { + // 鎵撳嵃寮傚父淇℃伅 + e.printStackTrace(); + // 鎴栬�呭彲浠ヨ繘琛屽叾浠栧紓甯稿鐞嗭紝姣斿璁板綍鏃ュ織鎴栬�呰繑鍥炵壒瀹氱殑閿欒淇℃伅 + } + + + } + + + /** + * @param downWorkstation // 婊℃灦鎷夎蛋 娓呴櫎娴佺▼鍗′俊鎭� + */ + +// public void clearFlowCardId(DownWorkstation downWorkstation) { +// +// downWorkstationMapper.clearFlowCardId(downWorkstation); +// } + + +} \ No newline at end of file -- Gitblit v1.8.0