UI-Project/config.js
@@ -1,10 +1,10 @@ export default { // serverUrl: "10.153.19.150:88/api", serverUrl: "192.168.1.199:88/api", // serverUrl: "127.0.0.1:88/api", // serverUrl: "192.168.1.199:88/api", serverUrl: "127.0.0.1:88/api", // serverUrl2: "10.153.19.150:88" serverUrl2: "192.168.1.199:88" // serverUrl2: "127.0.0.1:88" // serverUrl2: "192.168.1.199:88" serverUrl2: "127.0.0.1:88" //serverUrl:"res.abeim.cn" } UI-Project/src/utils/constants.js
@@ -1,4 +1,4 @@ export const WebSocketHost = "192.168.1.199"; // export const WebSocketHost = "192.168.1.199"; // export const WebSocketHost = "10.153.19.150"; // export const WebSocketHost = "127.0.0.1"; export const WebSocketHost = "127.0.0.1"; export const host = "88"; hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -100,7 +100,7 @@ public static String engineerId = ""; //@Scheduled(fixedDelay = 1000) @Scheduled(fixedDelay = 1000) public void plcHomeEdgTask() { Date startDate = new Date(); log.info("本次任务开始执行时间：{}", startDate); hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -92,7 +92,8 @@ @ApiOperation("指定钢化") @PostMapping("/TemperingGlass") public Result temperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) { boolean result = bigStorageCageDetailsService.temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId()); boolean result = bigStorageCageDetailsService .temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId(),bigStorageCageDetails.getTemperingFeedSequence().toString()); if (result == true) { return Result.build(200, "指定钢化成功", 1); } else { hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
@@ -69,7 +69,7 @@ */ List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId); boolean temperingGlass(String temperingLayoutId, String engineerId); boolean temperingGlass(String temperingLayoutId, String engineerId, String temperingFeedSequence); List<Map<String, Object>> selectTemperingGlass();
@@ -27,6 +27,7 @@ import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.mapper.GlassInfoMapper; import com.mes.glassinfo.service.GlassInfoService; import com.mes.job.PlcStorageCageTask; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.mapper.TemperingGlassInfoMapper; import com.mes.temperingglass.service.TemperingGlassInfoService; @@ -36,10 +37,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.*; import java.util.stream.Collectors; /** @@ -70,6 +68,9 @@ @Resource private TemperingGlassInfoService temperingGlassInfoService; @Resource private PlcStorageCageTask plcStorageCageTask; @Resource private DamageService damageService; @@ -188,7 +189,7 @@ LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper<>(); bigStorageCageDetailsWrapper .eq(BigStorageCageDetails::getGlassId, glassId) .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_IN); .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN); BigStorageCageDetails bigStorageCageDetails = baseMapper.selectOne(bigStorageCageDetailsWrapper); if (temperingGlassInfo != null) { @@ -221,7 +222,7 @@ @Override public List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId) { LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>(); List<BigStorageCageDetails> bigStorageCageDetailsList=new ArrayList<>(); List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>(); glassInfoWrapper.eq(GlassInfo::getGlassId, glassId); GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper); BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails(); @@ -276,8 +277,8 @@ .gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight())) .last("limit 1"); if (glassInfo.getTemperingLayoutId() == 0) { wrapper.eq(BigStorageCageDetails::getFlowCardId,glassInfo.getFlowCardId()) .eq(BigStorageCageDetails::getLayer,glassInfo.getLayer()); wrapper.eq(BigStorageCageDetails::getFlowCardId, glassInfo.getFlowCardId()) .eq(BigStorageCageDetails::getLayer, glassInfo.getLayer()); // wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight()); } else { wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1); @@ -363,7 +364,7 @@ } @Override public boolean temperingGlass(String temperingLayoutId, String engineerId) { public boolean temperingGlass(String temperingLayoutId, String engineerId, String temperingFeedSequence) { LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); temperingGlassInfoLambdaQueryWrapper .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW); @@ -380,11 +381,17 @@ .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN) .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)); if (CollectionUtils.isNotEmpty(temperingGlassInfos)) { temperingGlassInfoService.saveBatch(temperingGlassInfos); if ("0".equals(temperingFeedSequence)){ if (CollectionUtils.isNotEmpty(temperingGlassInfos)) { plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfos, Boolean.FALSE, ""); } }else{ temperingGlassInfoService.saveBatch(temperingGlassInfos); } return true; } } return false; return false; } @@ -406,7 +413,7 @@ } @Override public void appointEngineerId(String engineerId){ public void appointEngineerId(String engineerId) { redisUtil.setCacheObject("temperingengineerId", engineerId); } } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring: profiles: active: dev active: cz application: name: cacheVerticalGlass liquibase: @@ -22,7 +22,7 @@ order: false minCount: 20 carWidth: 5000 #大车宽度 slotWidth: 5000 #大车宽度 slotWidth: 5500 #大车宽度 inCarMaxSize: 2 #进片大车最大存放玻璃数量 outCarMaxSize: 3 #出片大车最大存放玻璃数量 glassGap: 350 #玻璃间距 hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
@@ -9,7 +9,15 @@ enabled: false mybatis-plus: mapper-locations: classpath*:mapper/*.xml configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImplkangaroohy: # configuration: # log-impl: org.apache.ibatis.logging.stdout.StdOutImplkangaroohy: kangaroohy: milo: enabled: false enabled: false primary: default config: default: endpoint: opc.tcp://zidonghua:49320 security-policy: basic256sha256 username: zsh password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,7 +2,7 @@ port: 8084 spring: profiles: active: dev active: cz application: name: temperingGlass liquibase:
