jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -277,10 +277,12 @@ if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){ try { result = "3"; String strA = bsFormulaChildInfo.getLocationCode() + "A"; String strB = bsFormulaChildInfo.getLocationCode() + "B"; miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strA+".RecordDataDone").value(21).build()); miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strB+".RecordDataDone").value(21).build()); // String strA = bsFormulaChildInfo.getLocationCode() + "A"; // String strB = bsFormulaChildInfo.getLocationCode() + "B"; // miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strA+".RecordDataDone").value(21).build()); // miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strB+".RecordDataDone").value(21).build()); String locationCode = bsFormulaChildInfo.getLocationCode(); miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+locationCode+".RecordDataDone").value(21).build()); } catch (Exception e) { throw new RuntimeException(e); } jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -360,10 +360,8 @@ //给opc发21 try { // miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build()); String strA = daParamCollection.getLocationCode() + "A"; String strB = daParamCollection.getLocationCode() + "B"; String strA = daParamCollection.getLocationCode(); miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strA+".RecordDataDone").value(21).build()); miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strB+".RecordDataDone").value(21).build()); } catch (Exception e) { throw new RuntimeException(e); } jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -4,6 +4,7 @@ import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService; import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService; import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService; import com.jcdm.main.da.testDeviceInterface.service.IDaTestDeviceInterfaceService; import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService; import com.jcdm.main.plcserver.conf.OPCElement; import com.jcdm.main.plcserver.sub.OPCUaSubscription; @@ -37,6 +38,9 @@ @Autowired private IOmProductionOrdeInfoService omProductionOrdeInfoService; @Autowired private IDaTestDeviceInterfaceService daTestDeviceInterfaceService; @Override public void run(ApplicationArguments args) throws Exception { @@ -45,11 +49,12 @@ daPassingStationCollectionService, collectionParamConfService, daParamCollectionService, omProductionOrdeInfoService); omProductionOrdeInfoService, daTestDeviceInterfaceService); List<String> lists = getSubList(); System.out.println("订阅内容："+lists); miloService.subscriptionFromOpcUa(lists,opcUaSubscription); miloService.subscriptionFromOpcUa(lists,100,opcUaSubscription); } @@ -75,7 +80,7 @@ lists.add(OPCElement.PACK_OP300B_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP310A_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP310B_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP330A_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP330_RecordData);//请求记录数据 // lists.add(OPCElement.PACK_OP330B_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP380_RecordData);//请求记录数据 lists.add(OPCElement.PACK_OP380_AngleResult);//请求记录数据 jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
@@ -77,9 +77,9 @@ /** * OP330 */ public static final String PACK_OP330A_RecordData = "PACK.OP330A.RecordData";//请求记录数据 public static final String PACK_OP330_RecordData = "PACK.OP330.RecordData";//请求记录数据 public static final String PACK_OP330B_RecordData = "PACK.OP330B.RecordData";//请求记录数据 // public static final String PACK_OP330B_RecordData = "PACK.OP330B.RecordData";//请求记录数据 /** * OP380 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -3,6 +3,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,6 +17,8 @@ import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService; import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection; import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService; import com.jcdm.main.da.testDeviceInterface.domain.DaTestDeviceInterface; import com.jcdm.main.da.testDeviceInterface.service.IDaTestDeviceInterfaceService; import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo; import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService; import com.jcdm.main.plcserver.conf.OPCElement; @@ -74,16 +77,21 @@ public static IOmProductionOrdeInfoService omProductionOrdeInfoService; private static IDaTestDeviceInterfaceService daTestDeviceInterfaceService; public OPCUaSubscription(MiloService miloService, IDaPassingStationCollectionService daPassingStationCollectionService, IDaCollectionParamConfService collectionParamConfService, IDaParamCollectionService daParamCollectionService, IOmProductionOrdeInfoService omProductionOrdeInfoService) { IOmProductionOrdeInfoService omProductionOrdeInfoService, IDaTestDeviceInterfaceService daTestDeviceInterfaceService) { OPCUaSubscription.miloService = miloService; this.daPassingStationCollectionService = daPassingStationCollectionService; OPCUaSubscription.collectionParamConfService = collectionParamConfService; OPCUaSubscription.daParamCollectionService = daParamCollectionService; OPCUaSubscription.omProductionOrdeInfoService = omProductionOrdeInfoService; OPCUaSubscription.daTestDeviceInterfaceService = daTestDeviceInterfaceService; } @@ -189,8 +197,25 @@ } if(testList.stream().anyMatch(s -> s.equals(device))){ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone"; miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build()); // Object packCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue(); // DaTestDeviceInterface deviceInterfaceOne = null; // // if (ObjectUtil.isNotNull(packCodeObject)) { // String modelCode = packCodeObject.toString(); // deviceInterfaceOne = daTestDeviceInterfaceService.getOne(new LambdaQueryWrapper<DaTestDeviceInterface>() // .eq(DaTestDeviceInterface::getProductNum, modelCode) // .eq(DaTestDeviceInterface::getStationCode, device)); // } // // if (deviceInterfaceOne != null && "1".equals(deviceInterfaceOne.getTotalResult())) { // writeToOpc(RecordDataDoneAddress, (short) 21); // } else { // writeToOpc(RecordDataDoneAddress, (short) 22); // } writeToOpc(RecordDataDoneAddress, (short) 21); } } }else { System.out.println("^"); @@ -543,4 +568,12 @@ return; } private static void writeToOpc(String identifier, short value) { try { miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(identifier).value(value).build()); } catch (Exception e) { throw new RuntimeException(e); } } } jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
@@ -9,6 +9,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.jcdm.common.core.domain.AjaxResult; import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo; import com.jcdm.main.bs.formulaChild.service.IBsFormulaChildInfoService; import com.jcdm.main.constant.Constants; import com.jcdm.main.da.paramCollection.domain.DaParamCollection; import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService; @@ -21,19 +23,15 @@ import com.jcdm.main.restful.qingYan.doman.ChildVO; import com.jcdm.main.restful.qingYan.doman.ParentVO; import com.jcdm.main.restful.qingYan.doman.PostEntity; import org.aspectj.weaver.loadtime.Aj; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.lang.reflect.Field; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.*; import java.util.stream.Collectors; @RestController @@ -49,6 +47,13 @@ @Autowired private IOmProductionOrdeInfoService productionOrdeInfoService; @Autowired private IOmProductionOrdeInfoService omProductionOrdeInfoService; @Autowired private IBsFormulaChildInfoService bsFormulaChildInfoService; String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback"; @@ -147,6 +152,27 @@ return AjaxResult.success(execute.body()); } @GetMapping("/productionWorkOrderRequest") public AjaxResult productionWorkOrderRequest(){ List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(); return AjaxResult.success(list); } @GetMapping("/productionOrderComponentRequest") public AjaxResult productionOrderComponentRequest(BsFormulaChildInfo bsFormulaChildInfo){ Map<String,List<String>> map = new HashMap<>(); List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>() .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getProcessesCode()) .eq(BsFormulaChildInfo::getOperationType, "2") ); List<String> materialCode = list.stream().map(BsFormulaChildInfo::getMaterialCode).collect(Collectors.toList()); List<String> operationSteps = list.stream().map(BsFormulaChildInfo::getOperationSteps).collect(Collectors.toList()); map.put("materialCode",materialCode); map.put("operationSteps",operationSteps); return AjaxResult.success(map); } @PostMapping("/pushParamData") public void receivingData(@RequestBody PostEntity postEntity) throws JsonProcessingException { jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
@@ -511,6 +511,8 @@ this.workpieceInformation.productModel = null; this.workpieceInformation.productName = null; this.headContent.sfcCode = ''; this.headContent.moduleB = ''; this.headContent.moduleA = ''; }, changeMenu(tab, event) { console.log(tab, event);
