OPC
懒羊羊
2024-03-12 7bff2912d690c89523bce2a001ea1dd4931e14f7
OPC
已修改4个文件
76 ■■■■■ 文件已修改
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/da/collectionParamConf/index.vue 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -50,8 +50,8 @@
    public List<String> getSubList(){
        List<String> lists = new ArrayList<>();
        lists.add(OPCElement.OP_OP010_RecordSN);//请求下发SN号
        lists.add(OPCElement.OP_OP010_RecordData);//请求记录数据
        lists.add(OPCElement.OP_OP020_RecordData);//请求记录数据
        lists.add(OPCElement.OP_OP230_RecordData);//请求记录数据
        lists.add(OPCElement.OP_OP240_RecordData);//请求记录数据
        return lists;
    }
}
jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
@@ -11,12 +11,12 @@
     * OP010
     */
    public static final String OP_OP010_RecordSN = "TestOP.OP1010.RecordSN";//请求下发SN号
    public static final String OP_OP010_RecordData = "TestOP.OP1010.RecordData";//请求记录数据
    public static final String OP_OP230_RecordData = "TestOP.OP1010.RecordData";//请求记录数据
    /**
     * OP020
     */
    public static final String OP_OP020_RecordData = "TestOP.OP2020.RecordData";//请求记录数据
    public static final String OP_OP240_RecordData = "TestOP.OP2020.RecordData";//请求记录数据
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -74,10 +74,18 @@
                        recordDataDoneValue = "11";
                        //进站保存数据
                        //inSaveDate(thoroughfare,device)
//                        inSaveDate(thoroughfare,device)
                        //记录数据完成
                        String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(recordDataDoneValue).build());
                        //给前端发工件到位信号
                        //请求工单
                    }else if("2".equals(tabVlaue)){
                        //出站保存数据
jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -125,9 +125,19 @@
        <el-table border v-loading="loading" :data="collectionParamConfList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
<!--          <el-table-column label="主键id" align="center" prop="id" />-->
          <el-table-column label="产品编码" align="center" width="150" prop="productCode">
          </el-table-column>
<!--          <el-table-column label="产品编码" align="center" width="150" prop="productCode">-->
<!--          </el-table-column>-->
          <el-table-column label="工序编号" align="center" width="80" prop="processesCode">
          </el-table-column>
          <el-table-column label="工序名称" width="150" align="center" prop="processesName">
          </el-table-column>
          <el-table-column label="采集地址" align="center" width="180" prop="gatherAddress">
          </el-table-column>
          <el-table-column label="采集顺序" align="center" width="80" prop="gatherSequence">
          </el-table-column>
          <el-table-column label="设备" width="150" align="center" prop="device">
          </el-table-column>
          <el-table-column label="项目" align="center" prop="project">
          </el-table-column>
<!--          <el-table-column label="参数集编码" align="center" width="130" prop="parameterSetCode">-->
<!--          </el-table-column>-->
@@ -139,16 +149,16 @@
          </el-table-column>
<!--          <el-table-column label="是否作为对比参数" align="center" prop="contrastParameterFlag">-->
<!--          </el-table-column>-->
          <el-table-column label="采集地址" align="center" width="180" prop="gatherAddress">
          </el-table-column>
          <el-table-column label="采集顺序" align="center" width="80" prop="gatherSequence">
          </el-table-column>
          <el-table-column label="参数类型" align="center" width="130" prop="collectParameterType">
          </el-table-column>
          <el-table-column label="单位" align="center" width="80" prop="collectParameterUnit">
          </el-table-column>
          <el-table-column label="精度" align="center" prop="accuracy">
          </el-table-column>
          <el-table-column label="数组长度" align="center" prop="arrayLength">
          </el-table-column>
<!--          <el-table-column label="数据描述" align="center" width="160" prop="Descriptives">
          </el-table-column>-->
          <el-table-column label="上限值" align="center" prop="paramUpper">
@@ -157,16 +167,9 @@
          </el-table-column>
          <el-table-column label="中心值" align="center" prop="paramCentral">
          </el-table-column>
          <el-table-column label="工序名称" width="150" align="center" prop="processesName">
          </el-table-column>
          <el-table-column label="设备" width="150" align="center" prop="device">
          </el-table-column>
          <el-table-column label="项目" align="center" prop="project">
          </el-table-column>
          <el-table-column label="精度" align="center" prop="accuracy">
          </el-table-column>
          <el-table-column label="数组长度" align="center" prop="arrayLength">
          </el-table-column>
          <el-table-column label="采集频率" width="107" align="center" prop="acquisitionFrequency">
          </el-table-column>
          <el-table-column label="业务需求部门" width="155" align="center" prop="demandDepartment">
@@ -217,29 +220,26 @@
    />
    <!-- 添加或修改采集参数配置对话框 -->
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="700px" append-to-body>
    <el-dialog v-dialogpop-up  :title="title" :visible.sync="open" width="1100px" append-to-body>
      <span slot="title">
        <i class="el-icon-s-order"></i>
        {{titleName}}
      </span>
      <el-form ref="form" inline :model="form" :rules="rules" label-width="120px">
      <el-form ref="form" inline  :model="form" :rules="rules" label-width="120px">
        <el-form-item label="工序编号" prop="processesCode">
          <el-input v-model="form.processesCode" placeholder="请输入工序编号" />
        </el-form-item>
        <el-form-item label="参数集编码" prop="parameterSetCode">
          <el-input v-model="form.parameterSetCode" placeholder="请输入参数集编码" />
        </el-form-item>
        <el-form-item label="参数集名称" prop="parameterSetName">
          <el-input v-model="form.parameterSetName" placeholder="请输入参数集名称" />
        </el-form-item>
<!--        <el-form-item label="参数集编码" prop="parameterSetCode">-->
<!--          <el-input v-model="form.parameterSetCode" placeholder="请输入参数集编码" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="参数集名称" prop="parameterSetName">-->
<!--          <el-input v-model="form.parameterSetName" placeholder="请输入参数集名称" />-->
<!--        </el-form-item>-->
        <el-form-item label="采集参数ID" prop="collectParameterId">
          <el-input v-model="form.collectParameterId" placeholder="请输入采集参数ID" />
        </el-form-item>
        <el-form-item label="采集参数名称" prop="collectParameterName">
          <el-input v-model="form.collectParameterName" placeholder="请输入采集参数名称" />
        </el-form-item>
        <el-form-item label="是否作为对比参数" prop="contrastParameterFlag">
          <el-input v-model="form.contrastParameterFlag" placeholder="请输入是否作为对比参数" />
        </el-form-item>
<!--        <el-form-item label="采集参数类型" prop="collectParameterType">-->
<!--          <el-select v-model="form.collectParameterType" placeholder="请选择采集参数类型">-->