hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -20,7 +20,6 @@ import com.mes.work_assignment.mapper.WorkAssignmentMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -54,8 +53,8 @@ @Resource WorkAssignmentMapper workAssignmentMapper; @Value("${mes.glassGap}") private String erpUrl; private final static String ERP_URL = "http://192.168.2.100:8086"; /** @@ -308,7 +307,7 @@ log.info("报工数据reportingWork：{}，reportingWorkDetails：{}", reportingWork, reportingWorkDetails); try { // 目标系统的API URL String url = erpUrl + "/reportingWork/mesReportingWork"; String url = ERP_URL + "/reportingWork/mesReportingWork"; URL obj = new URL(url); HttpURLConnection con = (HttpURLConnection) obj.openConnection();
@@ -6,5 +6,3 @@ logic-delete-field: deleted logic-delete-value: 1 logic-not-delete-value: 0 mes: erpUrl: http://192.168.2.100:8086 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -1,6 +1,5 @@ package com.mes; import com.mes.common.S7object; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; @@ -17,7 +16,7 @@ public void run(ApplicationArguments args) throws Exception { // TODO Auto-generated method stub log.info("启动完成"); S7object.getinstance().start(); // S7object.getinstance().start(); } } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -1,6 +1,5 @@ package com.mes; import com.mes.common.S7object; import com.mes.job.PlcStorageCageTask; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; @@ -23,7 +22,7 @@ @Override public void run(ApplicationArguments args) throws Exception { log.info("启动完成"); S7object.getinstance().start(); // S7object.getinstance().start(); } } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -1,6 +1,5 @@ package com.mes; import com.mes.common.S7object; import com.mes.job.PlcLoadGlassTask; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; @@ -23,7 +22,6 @@ @Override public void run(ApplicationArguments args) throws Exception { log.info("启动完成"); S7object.getinstance().start(); // S7object.getinstance().start(); } } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -1,7 +1,6 @@ package com.mes; import com.mes.common.S7object; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; @@ -20,6 +19,6 @@ @Override public void run(ApplicationArguments args) throws Exception { log.info("启动完成"); S7object.getinstance().start(); // S7object.getinstance().start(); } } hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
@@ -56,7 +56,7 @@ return; } ReadWriteEntity glassIdEntity = miloService.readFromOpcUa(cell + "glassId"); if (StringUtils.isBlank(glassIdEntity.getValue() + "")) { if (null == glassIdEntity.getValue() || StringUtils.isBlank(glassIdEntity.getValue() + "")) { log.info("当前未收到玻璃id数据，结束任务"); return; } @@ -68,27 +68,29 @@ } //按照任务id获取对应的配方信息 List<ReadWriteEntity> list = new ArrayList<>(); List<ReadWriteEntity> ualist = new ArrayList<>(); List<ReadWriteEntity> wordlist = new ArrayList<>(); if (detailsVO.getFilmRemove() != 0) { if (detailsVO.getFilmRemove() == 0) { // 10111011 int sendId = request & 273; sendId = sendId + 4; list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId)); wordlist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId)); } else { // 先将对应的位置为0，获得请求的玻璃数据， 然后将对应位值 110111011 int sendId = request & 273; sendId = sendId + 4 + 64; list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId)); list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassTop", detailsVO.getTopRemove())); list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassBottom", detailsVO.getBottomRemove())); list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassLeft", detailsVO.getLeftRemove())); list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassRight", detailsVO.getRightRemove())); wordlist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId)); ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassTop", detailsVO.getTopRemove())); ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassBottom", detailsVO.getBottomRemove())); ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassLeft", detailsVO.getLeftRemove())); ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassRight", detailsVO.getRightRemove())); } list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "thickness", detailsVO.getThickness())); list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "firstLength", Math.max(detailsVO.getWidth(), detailsVO.getHeight()))); list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "secondLength", Math.min(detailsVO.getWidth(), detailsVO.getHeight()))); miloService.writeToOpcWord(list); ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "thickness", (int) (detailsVO.getThickness() * 10))); ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "firstLength", (int) (Math.max(detailsVO.getWidth(), detailsVO.getHeight())) * 10)); ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "secondLength", (int) (Math.min(detailsVO.getWidth(), detailsVO.getHeight())) * 10)); miloService.writeToOpcWord(wordlist); miloService.writeToOpcUa(ualist); return; }
@@ -42,7 +42,7 @@ inner join glass_info t2 on t1.glass_id = t2.glass_id inner join hollow_formula_details t3 on t.formula_id = t3.id <where> t.state in (0,1,2) 1=1 <if test="glassId != null and glassId !=''"> and t1.glass_id = #{glassId} </if> @@ -52,7 +52,6 @@ <if test="cell != null and cell !=''"> and t.cell = #{cell} </if> </where> limit 1 </select>
