From f2a9635e45fe206c0cd92f08bdb271c019c53eca Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 16 八月 2024 11:05:33 +0800
Subject: [PATCH] 修改采集参数
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 5 ++++-
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 5 +++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
index ce5def6..57c57c9 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
@@ -116,9 +116,10 @@
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String currentDate = dateFormat.format(new Date());
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + bsFormulaChildInfo.getProcessesCode() + ".StartTime").value(currentDate).build());
- Integer recordDataDone = 11;
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + bsFormulaChildInfo.getProcessesCode() + ".SNCode").value(bsFormulaChildInfo.getSfcBarcode()).build());
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + bsFormulaChildInfo.getProcessesCode() + ".RecordDataDone").value(recordDataDone).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + bsFormulaChildInfo.getProcessesCode() + ".RecordDataDone").value(11).build());
+ }else if(bsFormulaChildInfo.getProcessesCode().equals("OP220")){
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + bsFormulaChildInfo.getProcessesCode() + ".RecordDataDone").value(11).build());
}
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(stepNumber).build());
} catch (Exception e) {
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 1026a18..a33ec89 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -370,13 +370,14 @@
console.log(tab, event);
},
handleEnter() {
+ console.log("鐗╂枡鐮�:"+this.materialCode);
if(this.materialCode.includes("9900200461") || this.materialCode.includes("9900207783")){
if(this.headContent.processesCode === "OP170" || this.headContent.processesCode === "OP180" ||
this.headContent.processesCode === "OP190" || this.headContent.processesCode === "OP200" ||
this.headContent.processesCode === "OP210" || this.headContent.processesCode === "OP220" ||
this.headContent.processesCode === "OP230"
){
- if(this.materialCode.length>30){
+ if(this.materialCode.length>25){
let code = this.materialCode.substring(13,26);
this.headContent.sfcCode = code;
this.queryParams.productNum = code;
@@ -397,6 +398,8 @@
this.setFocus();
}else{
this.$message("鎵弿鐗╂枡缂栫爜閿欒锛�"+this.materialCode);
+ this.materialCode="";
+ this.setFocus();
}
}
--
Gitblit v1.9.3