From 1c84aef7b3d88ce9f2ac5d3173f892a1cd727800 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 10 五月 2024 18:52:27 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java | 10 +++++
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java | 2 +
jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue | 30 ++++++++------
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 5 ++
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 2
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java | 4 +-
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 39 +++++++++++++++++++
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 7 +++
jcdm-ui/src/api/main/da/paramCollection/paramCollection.js | 8 ++++
9 files changed, 89 insertions(+), 18 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
index 7aa2cdf..a555451 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -269,7 +269,10 @@
if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){
try {
result = "3";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".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());
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java
index 1856c50..ba74362 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java
@@ -114,6 +114,16 @@
}
/**
+ * 鍑烘垬鏃堕棿鍙傛暟澧炲姞
+ */
+ @PostMapping("/jrmSaveCampaignTimeParameters")
+ public void jrmSaveCampaignTimeParameters(@RequestBody DaParamCollection daParamCollection)
+ {
+ daParamCollectionService.jrmSaveCampaignTimeParameters(daParamCollection);
+ }
+
+
+ /**
* 鏇存崲鎬绘垚鍙�
*/
@PostMapping("/replaceAssemblyCode")
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
index c98f873..e9069f6 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
@@ -74,4 +74,6 @@
void replaceAssemblyCode(DaParamCollection daParamCollection);
void yzAddBasicParameters(DaParamCollection daParamCollection);
+
+ void jrmSaveCampaignTimeParameters(DaParamCollection daParamCollection);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
index 4e182b7..b32ca5d 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -313,4 +313,43 @@
daParamCollectionMapper.insertDaParamCollection(saveData);
});
}
+
+ @Override
+ public void jrmSaveCampaignTimeParameters(DaParamCollection daParamCollection) {
+ DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
+ daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
+ daCollectionParamConf.setCollectParameterId("OUTT");
+ List<DaCollectionParamConf> daCollectionParamConfs = daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf);
+ DaParamCollection saveData = new DaParamCollection();
+ saveData.setWorkOrderNo(daParamCollection.getWorkOrderNo());
+ saveData.setProductCode(daParamCollection.getProductCode());
+ saveData.setLocationCode(daParamCollection.getLocationCode());
+ saveData.setSfcCode(daParamCollection.getProductBarcode());
+ saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
+ saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
+ saveData.setCollectionTime(new Date());
+ saveData.setParamValue(DateUtil.formatDateTime(new Date()));
+ daParamCollectionMapper.insertDaParamCollection(saveData);
+
+ //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
+ DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
+ daPassingStationCollection.setWorkOrderNo(daParamCollection.getWorkOrderNo());
+ daPassingStationCollection.setLocationCode(daParamCollection.getLocationCode());
+ List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
+ daPassingStationCollections.get(0).setOutboundTime(new Date());
+ int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
+
+// OPCUaSubscription.SaveParamData(daParamCollection.getProductBarcode(),"OP",daParamCollection.getLocationCode(),daParamCollection.getWorkOrderNo(),daParamCollection.getProductCode());
+
+ //缁檕pc鍙�21
+ try {
+// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
+ String strA = daParamCollection.getLocationCode() + "A";
+ String strB = daParamCollection.getLocationCode() + "B";
+ 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);
+ }
+ }
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
index 0ec6bee..7b64a28 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
@@ -153,8 +153,8 @@
public int jrmAddPassingStationCollection(DaPassingStationCollection daPassingStationCollection) {
for (String model : daPassingStationCollection.getSfcCode().split(",")) {
daPassingStationCollection.setSfcCode(model);
- daPassingStationCollectionService.save(daPassingStationCollection);
+ boolean save = daPassingStationCollectionService.save(daPassingStationCollection);
}
- return 0;
+ return 1;
}
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index c9bdf04..38049d5 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -76,7 +76,7 @@
lists.add(OPCElement.PACK_OP310A_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP310B_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP330A_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP330B_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP330B_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP380_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP380_AngleResult);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP400_RecordData);//璇锋眰璁板綍鏁版嵁
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index dbe46e9..12af80d 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -176,7 +176,12 @@
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(recordDataDoneValue)).build());
}else {
//鎵嬪姩宸ヤ綅
- WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
+ if(device.contains("OP330")){
+ String str = device.substring(0,5);
+ WebSocketUsers.sendMessageToUserByText(map.get(str), "END");
+ }else {
+ WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
+ }
}
}else {
System.out.println("^");
diff --git a/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js b/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
index 4d88e83..2b3e096 100644
--- a/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
+++ b/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
@@ -62,6 +62,14 @@
})
}
+export function jrmSaveCampaignTimeParameters(data) {
+ return request({
+ url: '/main/paramCollection/jrmSaveCampaignTimeParameters',
+ method: 'post',
+ data: data
+ })
+}
+
// 鏂板璁惧浜у搧杩囩▼鍙傛暟閲囬泦 saveCampaignTimeParameters
export function addTighteningParameters(data) {
return request({
diff --git a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
index 243a025..02f712a 100644
--- a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
@@ -6,20 +6,22 @@
<span class="head-font">宸ヤ綅缂栧彿 : {{headContent.processesCode}}</span>
</el-card>
</el-col>
- <el-col :span="7">
+ <el-col :span="17">
<el-card shadow="never">
<span class="head-font">宸ヤ綅鍚嶇О : {{headContent.processesName}}</span>
- </el-card>
- </el-col>
- <el-col :span="10">
- <el-card shadow="never">
- <span class="head-font">浜у搧搴忓垪鍙� : {{headContent.sfcCode}}</span>
-<!-- <el-input v-model="content" style="float: right;width: 150px;" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>-->
-<!-- <el-button @click="scanCompleted" style="float: right" type="primary">鎵爜瀹屾垚</el-button>-->
<el-button type="primary" style="float: right" icon="el-icon-search" size="mini" @click="serialLink">涓插彛杩炴帴</el-button>
<el-button @click="clearClick" style="float: right" type="danger" size="mini">娓呴櫎</el-button>
</el-card>
</el-col>
+<!-- <el-col :span="10">-->
+<!-- <el-card shadow="never">-->
+<!-- <span class="head-font">浜у搧搴忓垪鍙� : {{headContent.sfcCode}}</span>-->
+<!--<!– <el-input v-model="content" style="float: right;width: 150px;" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>–>-->
+<!--<!– <el-button @click="scanCompleted" style="float: right" type="primary">鎵爜瀹屾垚</el-button>–>-->
+<!-- <el-button type="primary" style="float: right" icon="el-icon-search" size="mini" @click="serialLink">涓插彛杩炴帴</el-button>-->
+<!-- <el-button @click="clearClick" style="float: right" type="danger" size="mini">娓呴櫎</el-button>-->
+<!-- </el-card>-->
+<!-- </el-col>-->
</el-row>
<el-row :gutter="5" style="margin-top: 5px">
@@ -268,7 +270,7 @@
addParamCollection,
addTighteningParameters,
saveCampaignTimeParameters,
- replaceAssemblyCode,
+ replaceAssemblyCode, jrmSaveCampaignTimeParameters,
} from "@/api/main/da/paramCollection/paramCollection";
export default {
@@ -457,6 +459,7 @@
},
/** 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */
getListFormulaChild() {
+ console.log('getListFormulaChild')
// this.formulaChildList = []
this.formulaChildParams.productCode = '1P102S'
this.formulaChildParams.processesCode = this.headContent.processesCode
@@ -464,6 +467,7 @@
noPageListFormulaChild(this.formulaChildParams).then(response => {
this.formulaChildList = response.rows;
});
+ console.log('success_getListFormulaChild')
},
endClear(){
this.cakeLamp.InPlace= 0 //宸ヤ欢鍒颁綅
@@ -503,6 +507,7 @@
/** 鍏ョ珯澧炲姞杩囩珯閲囬泦璁板綍 **/
addOverStationCollection(){
+ console.log('addOverStationCollection')
this.passingStationForm = {
id: null,
// workOrderNo: this.workpieceInformation.workOrderNo,
@@ -513,7 +518,6 @@
sfcCode: this.headContent.moduleA+','+this.headContent.moduleB,
inboundTime: new Date()
}
- // addPassingStationCollection(this.passingStationForm).then(response => {});
jrmAddPassingStationCollection(this.passingStationForm).then(response => {});
// addBasicParameters(this.passingStationForm).then(response => {});
},
@@ -575,7 +579,7 @@
locationCode: self.headContent.processesCode,
productBarcode: self.headContent.sfcCode,
}
- saveCampaignTimeParameters(param).then(response => {});
+ jrmSaveCampaignTimeParameters(param).then(response => {});
self.cakeLamp.release = 1;
self.endClear()
workpieceRelease(param).then(response => {});
@@ -595,8 +599,8 @@
const param = {
tightenTheArray: event.data,
paramCode: formulaChilds.paramCode,
- workOrderNo: self.workpieceInformation.workOrderNo,
- productCode: self.workpieceInformation.productCode,
+ // workOrderNo: self.workpieceInformation.workOrderNo,
+ productCode: '1P102S',
locationCode: self.headContent.processesCode,
productBarcode: self.headContent.sfcCode,
}
--
Gitblit v1.9.3