billion-main/src/main/java/com/billion/main/da/service/impl/DaStationCollectionServiceImpl.java
@@ -1,11 +1,7 @@ package com.billion.main.da.service.impl; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.billion.common.utils.http.HttpUtils; import com.billion.main.da.domain.DaStationCollection; import com.billion.main.da.domain.EngineData; import com.billion.main.da.mapper.DaStationCollectionMapper; import com.billion.main.da.service.IDaStationCollectionService; import org.springframework.beans.factory.annotation.Autowired; @@ -58,9 +54,9 @@ @Override public int insertDaStationCollection(DaStationCollection daStationCollection) { EngineData engineData = new EngineData(); engineData.setEngineType("1"); String s = HttpUtils.sendPost("http://172.40.161.71:8080/prod-api/CollectTrack", JSONUtil.toJsonStr(engineData)); // EngineData engineData = new EngineData(); // engineData.setEngineType("1"); // String s = HttpUtils.sendPost("http://172.40.161.71:8080/prod-api/CollectTrack", JSONUtil.toJsonStr(engineData)); return daStationCollectionMapper.insertDaStationCollection(daStationCollection); }
@@ -56,7 +56,7 @@ public int insertOmOrderScheduling(OmOrderScheduling omOrderScheduling) { omOrderScheduling.setUpdateTime(DateUtils.getNowDate()); return omOrderSchedulingMapper.updateOmOrderScheduling(omOrderScheduling); return omOrderSchedulingMapper.insertOmOrderScheduling(omOrderScheduling); // List<OmOrderScheduling> list = this.list(new LambdaQueryWrapper<OmOrderScheduling>().eq(OmOrderScheduling::getSfcCode, omOrderScheduling.getSfcCode())); // if (CollUtil.isNotEmpty(list)){ // throw new ServiceException(MessageFormat.format("已存在总成序列号为{0}的数据",omOrderScheduling.getSfcCode())); billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
@@ -99,7 +99,6 @@ Constants.PLC3.add(Constants.OP290_2); Constants.PLC3.add(Constants.OP295); Constants.PLC3.add(Constants.OP300); Constants.PLC3.add(Constants.OP310); //PLC4//排查上下线 Constants.PLC4.add(Constants.C040); Constants.PLC4.add(Constants.OP030); @@ -112,7 +111,7 @@ Constants.ONLINE.add(Constants.OP005); //下线工位 Constants.OFFLINE.add(Constants.C060); Constants.OFFLINE.add(Constants.OP310); Constants.OFFLINE.add(Constants.OP300);
@@ -186,7 +186,7 @@ updateWrapper.set("head_status", "2"); omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper); } } else if (Constants.OP310.equals(device)) { } else if (Constants.OP300.equals(device)) { omOrderScheduling.setRemarks("Body"); omOrderScheduling.setSfcCode(SFCCode.toString()); List<OmOrderScheduling> omOrderSchedulingList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling); @@ -221,7 +221,6 @@ updateWrapper.set("pre_status", "2"); omProductionOrderInfoService.update(new OmProductionOrderInfo(),updateWrapper); } sysCountService.updatePreNumber(); omProductionOrderInfoService.updatePreStatus1(); OmProductionOrderInfo getPreOrder2 = omProductionOrderInfoService.getPreOrder(); @@ -236,7 +235,6 @@ List<DaCollectionParamConf> daCollectionParamConfList1 = daCollectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf1); for (DaCollectionParamConf conf : daCollectionParamConfList1) { String gatherAddress = conf.getGatherAddress(); String valueObj = null; ReadWriteEntity entity = miloService.readFromOpcUa(gatherAddress); if (entity != null) {
