Merge remote-tracking branch 'origin/master'

cl

2024-08-13 db6ebb25325838edb5e8bb9c55388341935628b8

Merge remote-tracking branch 'origin/master'

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java

@@ -53,9 +53,11 @@
    @GetMapping("/unfinishedProcess")
    public AjaxResult unfinishedProcess(BsFormulaChildInfo bsFormulaChildInfo)
    {
        String thoroughfare = Constants.thoroughfareMap.get(bsFormulaChildInfo.getProcessesCode());//获取通道
        try {
            String str = "MOZU1."+bsFormulaChildInfo.getProcessesCode()+".RecordDataDone";
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(bsFormulaChildInfo.getRecordDataDone()).build());
//            String str = "MOZU1."+bsFormulaChildInfo.getProcessesCode()+".RecordDataDone";
//            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(bsFormulaChildInfo.getRecordDataDone()).build());
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare+"."+bsFormulaChildInfo.getProcessesCode()+".RecordDataDone").value(bsFormulaChildInfo.getRecordDataDone()).build());
        } catch (Exception e) {
            throw new RuntimeException(e);
        }

 jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java

@@ -100,7 +100,7 @@
        Constants.OP0170_OP230.add(Constants.OP200);
        Constants.OP0170_OP230.add(Constants.OP210);
        Constants.OP0170_OP230.add(Constants.OP220);
        Constants.OP0170_OP230.add(Constants.OP230);
//        Constants.OP0170_OP230.add(Constants.OP230);

        OPCUaSubscription opcUaSubscription = new OPCUaSubscription(
                miloService,

 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java

@@ -324,6 +324,8 @@
                    parentVO.setRecordId(UUID.randomUUID().toString());
                    if("2".equals(stationStatus)){//工站状态
                        parentVO.setTotalResult("0");
                    }else{
                        parentVO.setTotalResult("1");
                    }
                    parentVO.setProductNum(snCode);
                    parentVO.setCheckList(mesList);