From 32483a44c0ee1c4d605730ef6f894d43f76b3048 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 21 三月 2024 08:18:34 +0800
Subject: [PATCH] 操作看板
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java | 9 +
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java | 2
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 13 ++
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 84 +++-------------
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 52 ++++++++++
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 105 ++++++++++++--------
jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml | 2
jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml | 2
jcdm-ui/src/api/main/da/paramCollection/paramCollection.js | 11 ++
9 files changed, 169 insertions(+), 111 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 2fb51e2..5548c31 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
@@ -9,6 +9,8 @@
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
+import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
+import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import org.aspectj.weaver.loadtime.Aj;
@@ -37,6 +39,9 @@
@Autowired
private MiloService miloService;
+
+ @Autowired
+ private DaPassingStationCollectionMapper daPassingStationCollectionMapper;
Map<String, Session> map = WebSocketUsers.getUsers();
@@ -151,8 +156,6 @@
bsFormulaChildInfo.setParamCode(bsFormulaChildInfos.get(0).getParamCode());
bsFormulaChildInfo.setSfcBarcode(bsFormulaChildInfo.getSfcBarcode());
addParameterCollection(bsFormulaChildInfo);
-// BsFormulaChildInfo count = bsFormulaChildInfoMapper.getCount(checkInfo);
-// Integer i = count.getCounts();
}else {
return AjaxResult.error("闈炴湰宸ヤ綅鐗╂枡锛岃閲嶆柊鎵弿");
}
@@ -198,6 +201,12 @@
// 鎵ц鎿嶄綔
if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){
try {
+// //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
+// DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
+// daPassingStationCollection.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
+// List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
+// daPassingStationCollections.get(0).setOutboundTime(new Date());
+// daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("OP."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build());
WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "OUT");
} catch (Exception 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 98ce7de..8976e8e 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
@@ -96,6 +96,15 @@
}
/**
+ * 鍑烘垬鏃堕棿鍙傛暟澧炲姞
+ */
+ @PostMapping("/saveCampaignTimeParameters")
+ public void saveCampaignTimeParameters(@RequestBody DaParamCollection daParamCollection)
+ {
+ daParamCollectionService.saveCampaignTimeParameters(daParamCollection);
+ }
+
+ /**
* 淇敼璁惧浜у搧杩囩▼鍙傛暟閲囬泦
*/
@PreAuthorize("@ss.hasPermi('main:paramCollection:edit')")
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 7488adb..5d3a333 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
@@ -63,4 +63,6 @@
void addBasicParameters(DaParamCollection daParamCollection);
void addTighteningParameters(DaParamCollection daParamCollection);
+
+ void saveCampaignTimeParameters(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 3310666..2b00023 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
@@ -9,6 +9,11 @@
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
+import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
+import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
+import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
+import com.kangaroohy.milo.model.ReadWriteEntity;
+import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -31,6 +36,12 @@
@Autowired
private BsFormulaChildInfoMapper bsFormulaChildInfoMapper;
+
+ @Autowired
+ private MiloService miloService;
+
+ @Autowired
+ private DaPassingStationCollectionMapper daPassingStationCollectionMapper;
/**
* 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦
@@ -151,4 +162,45 @@
daParamCollectionMapper.insertDaParamCollection(daParamCollection);
}
}
+
+ @Override
+ public void saveCampaignTimeParameters(DaParamCollection daParamCollection) {
+ BsFormulaChildInfo bsFormulaChildInfo = new BsFormulaChildInfo();
+ bsFormulaChildInfo.setProcessesCode(daParamCollection.getLocationCode());
+ bsFormulaChildInfo.setProductCode(daParamCollection.getProductCode());
+ bsFormulaChildInfo.setSpareField4("1");
+ List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(bsFormulaChildInfo);
+ String result = bsFormulaChildInfos.get(0).getResults();
+ if(result != null && !result.isEmpty()){
+ try {
+ //杩囩珯鍙傛暟閲囬泦璁板綍鍑虹珯鏃堕棿
+ 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());
+ List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
+ daPassingStationCollections.get(0).setOutboundTime(new Date());
+ int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
+
+ //缁檕pc鍙�21
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("OP."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
}
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 e8db617..f178415 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
@@ -16,15 +16,15 @@
import org.springframework.stereotype.Component;
import javax.websocket.Session;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@Component
public class OPCUaSubscription implements SubscriptionCallback {
+
+ //鑷姩宸ヤ綅
+ public List<String> automaticList = Arrays.asList("OP230","OP300","OP280", "OP320", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540");
public static MiloService miloService;
@@ -77,26 +77,32 @@
if("1".equals(tabVlaue)){
recordDataDoneValue = "11";
+ //鏍￠獙鍏ョ珯鏄惁鍙互宸ヤ綔
//杩涚珯淇濆瓨鏁版嵁
// inSaveDate(thoroughfare,device)
//璁板綍鏁版嵁瀹屾垚
-// String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
-// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(recordDataDoneValue).build());
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
- //缁欏墠绔彂宸ヤ欢鍒颁綅淇″彿
- WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
+ if(automaticList.stream().noneMatch(s -> s.equals(device))){
+ //缁欏墠绔彂宸ヤ欢鍒颁綅淇″彿
+ WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
+ }
//璇锋眰宸ュ崟
-
-
}else if("2".equals(tabVlaue)){
-
- //鍑虹珯淇濆瓨鏁版嵁
- recordDataDoneValue = outSaveDate(thoroughfare,device);
- //璁板綍鏁版嵁瀹屾垚
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(recordDataDoneValue).build());
+ if(automaticList.stream().anyMatch(s -> s.equals(device))){
+ //鑷姩宸ヤ綅
+ //鍑虹珯淇濆瓨鏁版嵁
+ recordDataDoneValue = outSaveDate(thoroughfare,device);
+ //璁板綍鏁版嵁瀹屾垚
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(RecordDataDoneAddress)).build());
+ }else {
+ //鎵嬪姩宸ヤ綅
+ WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
+ }
}else {
System.out.println("^");
}
@@ -104,15 +110,22 @@
//淇濆瓨鎷х揣鏁版嵁
else if (("AngleResult").equals(tab)) {
if("1".equals(tabVlaue)||"2".equals(tabVlaue)){
- String Torque = thoroughfare + "." + device + ".Torque";
- String Angle = thoroughfare + "." + device + ".Angle";
- String Result = thoroughfare + "." + device + ".Result";
- String Result1 = thoroughfare + "." + device + ".Result1";
- List<String> list = new ArrayList();
- list.add(Torque);
- list.add(Angle);
- list.add(Result);
- list.add(Result1);
+// String Torque = thoroughfare + "." + device + ".Torque";
+// String Angle = thoroughfare + "." + device + ".Angle";
+// String Result = thoroughfare + "." + device + ".Result";
+// String Result1 = thoroughfare + "." + device + ".Result1";
+// List<String> list = new ArrayList();
+// list.add(Torque);
+// list.add(Angle);
+// list.add(Result);
+// list.add(Result1);
+ List<String> list = new ArrayList<>();
+ String[] suffixes = {"Torque", "Angle", "Result", "Result1"};
+
+ for (String suffix : suffixes) {
+ String string = thoroughfare + "." + device + "." + suffix;
+ list.add(string);
+ }
List<ReadWriteEntity> list1 = miloService.readFromOpcUa(list);
List<Object> collect = list1.stream().map(ReadWriteEntity::getValue).collect(Collectors.toList());
String joinedString = String.join(",", collect.toString());
@@ -143,18 +156,18 @@
String result = "";
try {
//璇诲彇SNCode
- String SNCodeAddress = thoroughfare + "." + device + ".SNCode";
- Object SNCodeObject = miloService.readFromOpcUa(SNCodeAddress).getValue();
- if(null == SNCodeObject || "".equals(SNCodeObject)){
+ String PACKCode = thoroughfare + "." + device + ".PACKCode";
+ Object PACKCodeObject = miloService.readFromOpcUa(PACKCode).getValue();
+ if(null == PACKCodeObject || "".equals(PACKCodeObject)){
result = "22";
}else{
- String SNCode = SNCodeObject.toString();
+ String PACKCodeParam = PACKCodeObject.toString();
//1銆佹洿鏂板伐鍗曚俊鎭�
//updateOrderInfo();
//2銆佷繚瀛樿繃绔欓噰闆嗘暟鎹�
- saveStationInfo(SNCode,thoroughfare,device);
+ saveStationInfo(PACKCodeParam,thoroughfare,device);
//3銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
- SaveParamData(SNCode,thoroughfare,device);
+ SaveParamData(PACKCodeParam,thoroughfare,device);
result = "21";
@@ -169,16 +182,23 @@
/**
* 淇濆瓨杩囩珯閲囬泦
*/
- public void saveStationInfo(String SNCode,String thoroughfare,String device){
+ public void saveStationInfo(String packCode,String thoroughfare,String device) throws Exception {
+ String prefix = thoroughfare+"."+device+".";
+ String workOrderNo = miloService.readFromOpcUa(prefix + "WorkOrderNumber").getValue().toString();
+ String startTime = miloService.readFromOpcUa(prefix + "StartTime").getValue().toString();
+ String stopTime = miloService.readFromOpcUa(prefix + "StopTime").getValue().toString();
+ String stationStatus = miloService.readFromOpcUa(prefix + "StationStatus").getValue().toString();
+
DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
- daPassingStationCollection.setSfcCode(SNCode);
- //daPassingStationCollection.setInboundTime();//鍏ョ珯鏃堕棿
- daPassingStationCollection.setOutboundTime(new Date());//鍑虹珯鏃堕棿
- //daPassingStationCollection.setOutRsSign();//鍑虹珯鏄惁鍚堟牸
+ daPassingStationCollection.setSfcCode(packCode);
+ daPassingStationCollection.setWorkOrderNo(workOrderNo);
+// daPassingStationCollection.setInboundTime(startTime);//鍏ョ珯鏃堕棿
+// daPassingStationCollection.setOutboundTime(stopTime);//鍑虹珯鏃堕棿
+ daPassingStationCollection.setOutRsSign(stationStatus);//鍑虹珯鏄惁鍚堟牸
daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection);
}
- public void SaveParamData(String SNCode,String thoroughfare,String device) throws Exception {
+ public void SaveParamData(String packCode,String thoroughfare,String device) throws Exception {
List<DaCollectionParamConf> list;
DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
daCollectionParamConf.setGatherAddress(thoroughfare+ "." + device);
@@ -193,12 +213,13 @@
List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(nodeIdList);
List<DaParamCollection> daParamCollectionlist = new ArrayList<>();
for(int i=0;i<nodeIdList.size();i++){
- DaParamCollection ParamCollection = new DaParamCollection();
if(!readWriteEntityList.get(i).getValue().toString().equals("0.0")){
- ParamCollection.setParamCode(readWriteEntityList.get(i).getIdentifier().toString().split("[.]")[2]);
+ DaParamCollection ParamCollection = new DaParamCollection();
+// ParamCollection.setParamCode(readWriteEntityList.get(i).getIdentifier().toString().split("[.]")[2]);
+ ParamCollection.setParamCode(list.get(i).getCollectParameterId());
ParamCollection.setLocationCode(device);
ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
- ParamCollection.setSfcCode(SNCode);
+ ParamCollection.setSfcCode(packCode);
ParamCollection.setParamName(list.get(i).getCollectParameterName());
ParamCollection.setParamUpper(list.get(i).getParamUpper());
ParamCollection.setParamLower(list.get(i).getParamLower());
@@ -206,10 +227,10 @@
//ParamCollection.setState("鍚堟牸");
ParamCollection.setType(list.get(i).getCollectParameterType());
ParamCollection.setCollectionTime(new Date());
- daParamCollectionlist.add(ParamCollection);
+ daParamCollectionService.insertDaParamCollection(ParamCollection);
}
}
- //daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
+ // daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
}
}
diff --git a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
index e274ea8..fa1dd2a 100644
--- a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
@@ -50,6 +50,8 @@
<if test="results != null and result != ''"> and result = #{results}</if>
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
<if test="paramCode != null and paramCode != ''"> and param_code = #{paramCode}</if>
+ <if test="spareField4 != null and spareField4 != ''"> and spare_field_4 = #{spareField4}</if>
+
</where>
diff --git a/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml b/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
index d5d1775..40659c3 100644
--- a/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
@@ -58,6 +58,8 @@
<if test="contrastParameterFlag != null and contrastParameterFlag != ''"> and contrast_parameter_flag like concat('%', #{contrastParameterFlag}, '%')</if>
<if test="collectParameterType != null and collectParameterType != ''"> and collect_parameter_type like concat('%', #{collectParameterType}, '%')</if>
<if test="productCode != null and productCode != ''"> and product_code like concat('%', #{productCode}, '%')</if>
+ <if test="gatherAddress != null and gatherAddress != ''"> and gather_address like concat('%', #{gatherAddress}, '%')</if>
+
</where>
</select>
diff --git a/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js b/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
index 911a5ba..d16d5e0 100644
--- a/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
+++ b/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
@@ -35,7 +35,16 @@
})
}
-// 鏂板璁惧浜у搧杩囩▼鍙傛暟閲囬泦
+// 鏂板璁惧浜у搧杩囩▼鍙傛暟閲囬泦 saveCampaignTimeParameters
+export function saveCampaignTimeParameters(data) {
+ return request({
+ url: '/main/paramCollection/saveCampaignTimeParameters',
+ method: 'post',
+ data: data
+ })
+}
+
+// 鏂板璁惧浜у搧杩囩▼鍙傛暟閲囬泦 saveCampaignTimeParameters
export function addTighteningParameters(data) {
return request({
url: '/main/paramCollection/addTighteningParameters',
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 7e19145..21e7cd1 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -306,7 +306,8 @@
import {
addBasicParameters,
addParamCollection,
- addTighteningParameters
+ addTighteningParameters,
+ saveCampaignTimeParameters
} from "@/api/main/da/paramCollection/paramCollection";
export default {
@@ -541,52 +542,12 @@
locationCode: this.headContent.processesCode,
model: this.workpieceInformation.productModel,
productBarcode: this.headContent.sfcCode,
+ sfcCode: this.headContent.sfcCode,
inboundTime: new Date()
}
addPassingStationCollection(this.passingStationForm).then(response => {});
addBasicParameters(this.passingStationForm).then(response => {});
},
- allowRelease(){
- clearInterval(this.timer);
- this.$message('淇濆瓨鑺傛媿涓�'+this.workpieceInformation.beat+'绉�');
- },
- /** 鏌ヨ宸ヤ綅缁堢閰嶇疆鍒楄〃 */
- // async getStationConfList() {
- // await getIpv4().then(response => {
- // this.StationConfQueryParams.ipAddress = response.msg
- // console.log('鏌ヨ鍒版湰宸ヤ綅IP涓�'+this.StationConfQueryParams.ipAddress)
- // });
- // listStationConf(this.StationConfQueryParams).then(response => {
- // let rows = response.rows[0]
- // if(response.rows.length===0){
- // this.$message('璇ュ伐浣嶆病鏈夐厤缃甀P锛岃鑱旂郴绠＄悊鍛橀厤缃甀P');
- // return
- // }
- // this.headContent.processesName = rows.processesName
- // this.headContent.processesCode = rows.processesCode
- // console.log('璁剧疆宸ヤ綅缂栫爜'+this.headContent.processesCode)
- //
- // });
- // },
- // connectWebsocket() {
- // console.log('websocket杩炴帴宸ヤ綅涓�'+this.headContent.processesCode)
- // const wsuri = this.url + this.headContent.processesCode;
- // this.ws = new WebSocket(wsuri);
- // const self = this;
- // this.ws.onopen = function (event) {
- // // self.text_content = self.text_content + "宸茬粡鎵撳紑杩炴帴!" + "\n";
- // this.$message('websocket杩炴帴鎴愬姛锛�');
- // };
- // this.ws.onmessage = function (event) {
- // self.text_content = event.data + "\n";
- // console.log(event.data)
- // if(event.data === "IN"){
- // self.cakeLamp.InPlace = "1"
- // }else if(event.data === "OUT"){
- // self.cakeLamp.outRsSign = "1"
- // }
- // };
- // },
exit() {
if (this.ws) {
this.ws.close();
@@ -631,16 +592,15 @@
self.cakeLamp.InPlace = 0;
} else if (event.data === "OUT") {
self.cakeLamp.release = 1;
- // setTimeout(() => {
- // self.cakeLamp.InPlace = 0;
- // self.cakeLamp.release = 0;
- // self.cakeLamp.startWork = 0;
- // self.cakeLamp.scanFinish = 0;
- // self.Release();
- // }, DELAY_TIME);
- } else if (event.data === "TIGHTEN") {
- this.formulaChildList = [];
- self.getListFormulaChild();
+ } else if (event.data === "END") {
+ const param = {
+ workOrderNo: self.workpieceInformation.workOrderNo,
+ productCode: self.workpieceInformation.productCode,
+ locationCode: self.headContent.processesCode,
+ productBarcode: self.headContent.sfcCode,
+ }
+ saveCampaignTimeParameters(param).then(response => {});
+
} else if (event.data.includes("[")) {
let formulaChilds = "";
self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
@@ -654,16 +614,6 @@
break;
}
}
- // self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
- // self.formulaChildList.forEach((formulaChild) => {
- // let operationType = formulaChild.operationType;
- // let results = formulaChild.results;
- // if(operationType === '1' && (results === '' || results === null || results === 'NG')){
- // formulaChilds = formulaChild;
- // return; // 浣跨敤return浠ｆ浛break
- // }
- // // 鎵ц鍏朵粬鎿嶄綔
- // });
const param = {
tightenTheArray: event.data,
paramCode: formulaChilds.paramCode,
@@ -674,6 +624,8 @@
}
addTighteningParameters(param).then(response => {});
updateTighteningFormula(param).then(response => {
+ self.getListFormulaChild()
+ }).catch(error =>{
self.getListFormulaChild()
});
}
@@ -686,7 +638,7 @@
else {
const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
- if(this.cakeLamp.InPlace=== 1){
+ // if(this.cakeLamp.InPlace=== 1){
if(this.headContent.sfcCode !== ''){
console.log(scanValue)
this.serialPortMethod(scanValue)
@@ -698,9 +650,9 @@
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
}
- }else {
- this.$message('宸ヤ欢鏈埌浣嶇姝㈡壂鐮侊紒');
- }
+ // }else {
+ // this.$message('宸ヤ欢鏈埌浣嶇姝㈡壂鐮侊紒');
+ // }
}
},
clearHistory() {
--
Gitblit v1.9.3