From 1405923e6301e3bb19c786733066dc3d25f4a39c Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 12 八月 2024 18:47:19 +0800
Subject: [PATCH] 优化
---
jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue | 421 +++--------------------------------------
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 72 ------
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 105 ++++-----
3 files changed, 86 insertions(+), 512 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 5ab1ba3..aa89119 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
@@ -220,30 +220,11 @@
public AjaxResult yzUpdateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo) {
Boolean b = true;
String result = "1";
-// BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo();
-// getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
-// getMaterTwo.setOperationType("2");
-// List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo);
-// List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList());
-// for (String s : collect) {
-// if(s.equals("")){
-//// return AjaxResult.success("鎵弿鏈畬鎴愶紝绂佹鎷х揣鎿嶄綔锛�");
-// }
-// }
-// BsFormulaChildInfo listQuery = new BsFormulaChildInfo();
-// listQuery.setParamCode(bsFormulaChildInfo.getParamCode());
-// listQuery.setProcessesCode(bsFormulaChildInfo.getLocationCode());
String paramData = bsFormulaChildInfo.getTightenTheArray();
if(paramData.contains("N")){
result = "3";
-// List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
-// bsFormulaChildInfos.get(0).setResults("NG");
-// bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
-// bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
this.updateTighteningData(bsFormulaChildInfo,"NG",paramData);
-// return AjaxResult.success("鎵弿缁撴灉NG,璇烽噸鏂版壂鎻忥紒");
}else {
-// List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
if(bsFormulaChildInfo.getSpareField2()!=null&&bsFormulaChildInfo.getSpareField3()!=null){
String tightenArray = bsFormulaChildInfo.getTightenTheArray().replace("[", "").replace("]", "").replace(" ", "");
String[] tightenDataParts = tightenArray.split(",");
@@ -251,15 +232,11 @@
}
if(b){
result = "3";
-// bsFormulaChildInfos.get(0).setResults("OK");
-// bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
-// bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
this.updateTighteningData(bsFormulaChildInfo,"OK",paramData);
-// logger.info("yzUpdateTighteningFormula--鏌ヨ鏉′欢鍙傛暟锛�"+listQuery);
-// logger.info("yzUpdateTighteningFormula--鏌ヨ缁撴灉锛�"+bsFormulaChildInfos.get(0));
Integer stepNumber = Integer.valueOf(bsFormulaChildInfo.getStepSort());
try {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".MStepNumber").value(stepNumber+1).build());
+ String thoroughfare = Constants.thoroughfareMap.get(bsFormulaChildInfo.getLocationCode());//鑾峰彇閫氶亾
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare+"."+bsFormulaChildInfo.getLocationCode()+".MESScrew").value(stepNumber+1).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -269,7 +246,6 @@
// 鎵ц鎿嶄綔
if(bsFormulaChildInfo.getSpareField4().equals("1")){
try {
-// WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "OUT");
result = "2";
} catch (Exception e) {
throw new RuntimeException(e);
@@ -278,14 +254,8 @@
}
}else {
result = "3";
-// List<BsFormulaChildInfo> bsFormulaChildInfos1 = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
-// bsFormulaChildInfos1.get(0).setResults("NG");
-// String originalString = bsFormulaChildInfo.getTightenTheArray();
String modifiedString = paramData.replaceFirst("OK", "NG");
-// bsFormulaChildInfos1.get(0).setCollectData(modifiedString);
-// bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos1.get(0));
this.updateTighteningData(bsFormulaChildInfo,"NG",modifiedString);
-// return AjaxResult.success("鎵弿缁撴灉NG,璇烽噸鏂版壂鎻忥紒");
}
}
return AjaxResult.success(result);
@@ -354,13 +324,6 @@
@Override
public AjaxResult jrmWorkpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) {
this.clearCollectDataAndResultsByProcessesCode(bsFormulaChildInfo);
-// List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
-// .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
-// .eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode()));
-// for (BsFormulaChildInfo info : list) {
-// info.setCollectData("");
-// info.setResults("");
-// bsFormulaChildInfoService.saveOrUpdate(info);
// }
String[] split = bsFormulaChildInfo.getProductBarcode().split(",");
try {
@@ -555,35 +518,8 @@
@Override
public AjaxResult workpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) {
this.clearCollectDataAndResultsByProcessesCode(bsFormulaChildInfo);
-// List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
-// .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
-// .eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode()));
-// for (BsFormulaChildInfo info : list) {
-// info.setCollectData("");
-// info.setResults("");
-// bsFormulaChildInfoService.saveOrUpdate(info);
-// }
try {
daParamCollectionService.pushGeelycvMesFeedback(bsFormulaChildInfo.getProductBarcode(), bsFormulaChildInfo.getLocationCode());
-// String barCode = bsFormulaChildInfo.getProductBarcode();
-// String locationCode = bsFormulaChildInfo.getLocationCode();
-//
-// if(StringUtils.isNotBlank(locationCode)&&StringUtils.isNotBlank(barCode)){
-// DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
-// daPassingStationCollection.setOutRsSign("1");
-// daPassingStationCollection.setOutboundTime(new Date());
-// daPassingStationCollection.setSfcCode(barCode);
-// daPassingStationCollection.setLocationCode(locationCode);
-// int updateDaPassingStation = daPassingStationCollectionService.updateDaPassingStationCollectionBySfcCodeAndLocationCode(daPassingStationCollection);
-// logger.info("鏅�氫汉宸ュ伐浣嶆洿鏂拌繃绔欒褰晆pdateDaPassingStationCollectionBySfcCodeAndLocationCode:鏇存柊浜唟}鏉℃暟鎹�-鏇存柊鏉′欢pack鐮亄}-宸ヤ綅{}",updateDaPassingStation,barCode,locationCode);
-// }
-
-// DaPassingStationCollection passingStationCollectionOne = daPassingStationCollectionService.getOne(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getSfcCode, barCode).eq(DaPassingStationCollection::getLocationCode, locationCode));
-// if (passingStationCollectionOne != null) {
-// passingStationCollectionOne.setOutRsSign("1");
-// passingStationCollectionOne.setOutboundTime(new Date());
-// daPassingStationCollectionService.saveOrUpdate(passingStationCollectionOne);
-// }
}catch (Exception e){
}
return AjaxResult.success();
@@ -636,8 +572,8 @@
bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
Integer stepNumber = Integer.valueOf(bsFormulaChildInfo.getStepSort());
+ String thoroughfare = Constants.thoroughfareMap.get(bsFormulaChildInfo.getLocationCode());//鑾峰彇閫氶亾
try {
- String thoroughfare = Constants.thoroughfareMap.get(bsFormulaChildInfo.getLocationCode());//鑾峰彇閫氶亾
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare+"."+bsFormulaChildInfo.getLocationCode()+".MESScrew").value(stepNumber+1).build());
} catch (Exception e) {
throw new RuntimeException(e);
@@ -654,7 +590,7 @@
// List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
// daPassingStationCollections.get(0).setOutboundTime(new Date());
// daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
-// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare +"."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build());
WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "OUT");
} catch (Exception e) {
throw new RuntimeException(e);
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 0921ff4..27bfb2b 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
@@ -561,43 +561,32 @@
for (DaParamCollectionTemp daParamCollection : paramList) {
ChildVO childVO = new ChildVO();
childVO.setItemCode(daParamCollection.getParamCode());
-// BsFormulaChildInfo childOne = bsFormulaChildInfoService.getOne(new LambdaQueryWrapper<BsFormulaChildInfo>().eq(BsFormulaChildInfo::getParamCode, daParamCollection.getParamCode()));
-// DaCollectionParamConf paramConfOne = daCollectionParamConfService.getOne(new LambdaQueryWrapper<DaCollectionParamConf>().eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode()));
List<DaCollectionParamConf> paramConfOneList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
.eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode())
.eq(DaCollectionParamConf::getProcessesCode,stationCode));
DaCollectionParamConf paramConfOne = paramConfOneList.get(0);
-// if(childOne!=null){
-// String operationType = childOne.getOperationType();
-// if(operationType.equals("1")){
-// childVO.setItemType("2");
-// }else if(operationType.equals("2")){
-// childVO.setItemType("1");
-// }
-// }else {
-// childVO.setItemType("3");
-// }
- if(paramConfOne!=null){
- childVO.setItemType(paramConfOne.getItemType());
- childVO.setItemText(paramConfOne.getCollectParameterName());
- }else {
- childVO.setItemType("3");
- childVO.setItemText("");
- }
- childVO.setItemValue(daParamCollection.getParamValue());
+ if(!paramConfOneList.isEmpty()){
+ if(paramConfOne!=null){
+ childVO.setItemType(paramConfOne.getItemType());
+ childVO.setItemText(paramConfOne.getCollectParameterName());
+ }else {
+ childVO.setItemType("3");
+ childVO.setItemText("");
+ }
+ childVO.setItemValue(daParamCollection.getParamValue());
- if(daParamCollection.getParamValue().equals("1")){
- childVO.setCheckResult("1");
- }else if(daParamCollection.getParamValue().equals("2")){
- childVO.setCheckResult("0");
- parentVO.setTotalResult("0");
- totalResult = "1";
- }else {
- childVO.setCheckResult("1");
+ if(daParamCollection.getParamValue().equals("1")){
+ childVO.setCheckResult("1");
+ }else if(daParamCollection.getParamValue().equals("2")){
+ childVO.setCheckResult("0");
+ parentVO.setTotalResult("0");
+ totalResult = "1";
+ }else {
+ childVO.setCheckResult("1");
+ }
+ childVO.setCheckTime(format.format(daParamCollection.getCollectionTime()));
+ listChildVo.add(childVO);
}
- childVO.setCheckTime(format.format(daParamCollection.getCollectionTime()));
- listChildVo.add(childVO);
-
}
parentVO.setCheckList(listChildVo);
try{
@@ -763,32 +752,34 @@
@Override
public void manualWorkstationsAddBasicParameters(DaParamCollection daParamCollection) {
// 鍋囪杩欐槸浠庢暟鎹簱鎴栧叾浠栧湴鏂硅幏鍙栫殑鍙傛暟鏁版嵁
- Map<String, String> map = new HashMap<>();
- map.put("GC", "鍗楁禂宸ュ巶");
- map.put("CXBH", "Pack绾�");
- map.put("SBBH", "璁惧001");
- map.put("YGBH", SecurityUtils.getUsername());
- map.put("GDBH", daParamCollection.getWorkOrderNo());
- map.put("CPXH", daParamCollection.getProductCode());
- map.put("INT", format.format(daParamCollection.getInboundTime()));
- map.put("OUTT",format.format(new Date()));
-
- map.forEach((key, value) -> {
- DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
- daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
- daCollectionParamConf.setCollectParameterId(key);
- 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(value);
- daParamCollectionMapper.insertDaParamCollection(saveData);
- });
+// Map<String, String> map = new HashMap<>();
+// map.put("GC", "鍗楁禂宸ュ巶");
+// map.put("CXBH", "Pack绾�");
+// map.put("SBBH", "璁惧001");
+// map.put("YGBH", SecurityUtils.getUsername());
+// map.put("GDBH", daParamCollection.getWorkOrderNo());
+// map.put("CPXH", daParamCollection.getProductCode());
+// map.put("INT", format.format(daParamCollection.getInboundTime()));
+// map.put("OUTT",format.format(new Date()));
+//
+// map.forEach((key, value) -> {
+// DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
+// daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
+// daCollectionParamConf.setCollectParameterId(key);
+// 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());
+// if(daCollectionParamConfs.isEmpty()){
+// saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
+// saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
+// }
+// saveData.setCollectionTime(new Date());
+// saveData.setParamValue(value);
+// daParamCollectionMapper.insertDaParamCollection(saveData);
+// });
}
@Override
diff --git a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
index b6332cb..10734ec 100644
--- a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
@@ -2,22 +2,20 @@
<div class="app-container">
<el-row :gutter="5">
<el-col :span="7">
- <el-card shadow="never">
+ <el-card style="height: 72px;padding-top: 9px" shadow="never">
<span class="head-font">宸ヤ綅缂栧彿 : {{headContent.processesCode}}</span>
<span hidden>{{headContent.inboundTime}}</span>
</el-card>
</el-col>
<el-col :span="7">
<el-card shadow="never">
- <span class="head-font">宸ヤ綅鍚嶇О : {{headContent.processesName}}</span>
+ <span class="head-font">鐗╂枡缂栫爜 : </span>
+ <el-input style="width: 70%" ref="inputData" v-model="materialCode" @change="materialCodeHandleEnter" placeholder="璇锋壂鎻忔�绘垚搴忓垪鍙�"></el-input>
</el-card>
</el-col>
<el-col :span="10">
- <el-card shadow="never">
+ <el-card style="height: 72px;padding-top: 9px" 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>
@@ -48,143 +46,6 @@
</el-tabs>
</el-col>
</el-row>
- <el-dialog v-dialogpop-up :title="title" :visible.sync="open1" width="1000" append-to-body>
- <el-row
- type="flex"
- class="row-bg"
- justify="center"
- v-show="portsList.length === 0"
- >
- <el-col :span="7">
- <div style="margin-top: 400px">
- <span style="display: block">
- 浠呮敮鎸丆hrome 89+鎴栬�匛dge 89+娴忚鍣�(瀹夊叏涓婁笅鏂囷紙HTTPS锛変腑鍙敤)
- </span>
- <el-button type="primary" @click="obtainAuthorization">鎺堟潈</el-button>
- </div>
- </el-col>
- </el-row>
- <el-form
- v-show="portsList.length > 0"
- ref="form1"
- :model="form1"
- label-width="100px">
- <el-row>
- <el-col :span="24"
- ><div>
- <el-form-item label="涓插彛">
- <el-select
- v-model="form1.port"
- filterable
- placeholder="璇烽�夋嫨涓插彛"
- :disabled="isDisable"
- >
- <el-option
- v-for="item in portsList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="娉㈢壒鐜�">
- <el-autocomplete
- popper-class="my-autocomplete"
- v-model="form1.baudRate"
- :fetch-suggestions="querySearch"
- placeholder="璇疯緭鍏ユ尝鐗圭巼"
- :disabled="isDisable"
- >
- <i class="el-icon-edit el-input__icon" slot="suffix"> </i>
- <template slot-scope="{ item }">
- <div class="name">{{ item.value }}</div>
- <span class="addr">{{ item.address }}</span>
- </template>
- </el-autocomplete>
- </el-form-item>
- <el-form-item label="鏁版嵁浣�">
- <el-select
- v-model="form1.dataBits"
- placeholder="璇烽�夋嫨鏁版嵁浣�"
- :disabled="isDisable"
- >
- <el-option label="7" value="7"></el-option>
- <el-option label="8" value="8"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍋滄浣�">
- <el-select
- v-model="form1.stopBits"
- placeholder="璇烽�夋嫨鍋滄浣�"
- :disabled="isDisable"
- >
- <el-option label="1" value="1"></el-option>
- <el-option label="2" value="2"></el-option>
- </el-select>
- </el-form-item>
-
- <el-form-item label="鏍￠獙浣�">
- <el-select
- v-model="form1.parity"
- placeholder="璇烽�夋嫨鏍￠獙浣�"
- :disabled="isDisable"
- >
- <el-option label="None" value="none"></el-option>
- <el-option label="Even" value="even"></el-option>
- <el-option label="Odd" value="odd"></el-option>
- </el-select>
- </el-form-item>
-
- <el-form-item label="娴佹帶鍒�">
- <el-select
- v-model="form1.flowControl"
- placeholder="璇烽�夋嫨娴佹帶鍒�"
- :disabled="isDisable"
- >
- <el-option label="None" value="none"></el-option>
- <el-option label="HardWare" value="hardware"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鏄剧ず鍘嗗彶">
- <el-switch
- v-model="form1.isShowHistory"
- @change="loadHistory"
- ></el-switch>
- <el-button
- type="danger"
- icon="el-icon-delete"
- circle
- title="娓呯┖鍘嗗彶"
- @click="clearHistory"
- ></el-button>
- </el-form-item>
- <el-form-item label="鍙戦�佸尯璁剧疆" v-show="isShowSendArea">
- <el-form-item label="鍙戦�佹牸寮�">
- <el-radio-group v-model="form1.type">
- <el-radio label="1">ASCII</el-radio>
- <el-radio label="2">HEX</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鍙戦�佷俊鎭�">
- <el-input type="textarea" v-model="form1.sendMsg"></el-input>
- </el-form-item>
- <el-button type="primary" @click="sendCommon">鍙戦��</el-button>
- </el-form-item>
-
- <el-form-item>
- <el-button :type="btnType" @click="connectBtn">{{
- btnText
- }}</el-button>
- <el-button type="info" @click="obtainAuthorization"
- >鏂板鎺堟潈</el-button
- >
- </el-form-item>
- </div>
- </el-col>
- </el-row>
- </el-form>
- </el-dialog>
</div>
</template>
<script>
@@ -291,42 +152,32 @@
passingStationForm: {},
originalArray: [],
+ materialCode: '',
}
- },
- beforeDestroy() {
- this.exit();
},
created() {
- this.initStation();
- // this.getStationConfList();
- // setTimeout(() => {
- // this.connectWebsocket();
- // }, 3000);
- },
- mounted() {
- if ("serial" in navigator) {
- this.myserialport = new MySerialPort();
- this.getPorts();
- navigator.serial.addEventListener("connect", (e) => {
- this.$message.success("璁惧宸茶繛鎺�");
- this.getPorts();
- });
- navigator.serial.addEventListener("disconnect", (e) => {
- this.$message.error("璁惧宸叉柇寮�");
- });
- this.restaurants = this.loadAll();
- } else {
- this.$message.error(
- "褰撳墠涓篐TTP妯″紡鎴栬�呮祻瑙堝櫒鐗堟湰杩囦綆锛屼笉鏀寔缃戦〉杩炴帴涓插彛"
- );
- }
- },
- computed: {
- isDisable() {
- return this.btnType === "danger";
- },
+ this.setFocus()
+ this.initStation()
},
methods: {
+
+ materialCodeHandleEnter() {
+ if(!this.headContent.sfcCode){
+ this.headContent.sfcCode = this.materialCode
+ this.headContent.inboundTime = this.getCurrentTime();
+ this.getList()
+ }else {
+ this.serialPortMethod(this.materialCode);
+ this.$message("鎵弿鐗╂枡缂栫爜"+this.materialCode);
+ this.setFocus();
+ this.materialCode = '';
+ }
+ },
+ setFocus(){
+ this.$nextTick(()=>{
+ this.$refs.inputData.focus()
+ })
+ },
serialLink() {
this.open1 = true
},
@@ -359,8 +210,8 @@
let formulaChildParams = {
scanBarcode: value,
sfcBarcode: this.headContent.sfcCode,
- workOrderNo: this.workpieceInformation.workOrderNo,
- productCode: "1P102S",
+ workOrderNo: '-',
+ productCode: "9900200461",
locationCode: this.headContent.processesCode,
collectionTime: new Date()
}
@@ -378,7 +229,7 @@
},
/** 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */
getListFormulaChild() {
- this.formulaChildParams.productCode = "1P102S"
+ this.formulaChildParams.productCode = "9900200461"
this.formulaChildParams.processesCode = this.headContent.processesCode
console.log(this.formulaChildParams)
noPageListFormulaChild(this.formulaChildParams).then(response => {
@@ -418,7 +269,9 @@
clearWorkpieceRelease(param).then(response => {});
this.headContent.sfcCode = ''
this.formulaChildList = [];
+ this.materialCode = ''
this.$message('娓呴櫎鎴愬姛锛�');
+ this.setFocus()
},
scanCompleted(){
this.$message('鎵爜瀹屾垚'+this.content);
@@ -435,7 +288,7 @@
const param = {
processesCode: this.headContent.processesCode,
}
- fistSetpNumber(param).then(response => {});
+ // fistSetpNumber(param).then(response => {});
this.getListFormulaChild()
// this.addOverStationCollection()
},
@@ -485,13 +338,12 @@
console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
});
- this.conCom()
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) {
- this.$message('websocket杩炴帴鎴愬姛锛�');
+ self.$message('websocket杩炴帴鎴愬姛锛�');
};
this.ws.onmessage = function (event) {
if(event.data.includes("[")) {
@@ -510,8 +362,8 @@
const param = {
tightenTheArray: event.data,
paramCode: formulaChilds.paramCode,
- // workOrderNo: self.workpieceInformation.workOrderNo,
- // productCode: "1P102S",
+ workOrderNo: '-',
+ productCode: "9900200461",
locationCode: self.headContent.processesCode,
productBarcode: self.headContent.sfcCode,
spareField2: formulaChilds.spareField2,
@@ -554,9 +406,6 @@
}
};
},
-
-
-
//鎺ュ彈鏁版嵁鐨勫洖璋�
callBack(value) {
if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
@@ -573,209 +422,7 @@
this.headContent.inboundTime = this.getCurrentTime();
this.getList()
}
-
}
- },
- clearHistory() {
- this.form1.desc = "";
- this.myserialport.state.readValue = [];
- },
- loadHistory() {
- if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
- else {
- let temp = this.readLi();
- if (temp.length > 0) this.form1.desc = temp[temp.length - 1].join("");
- }
- },
- readLi() {
- let readType = this.readType;
- return this.myserialport.state.readValue.map((items, index) => {
- const item = items.value;
- const type = items.type; // 1鎺ユ敹锛�2鍙戦��
- let body = [];
- if (item !== undefined) {
- let strArr = [];
- for (let hex of Array.from(item)) {
- strArr.push(hex.toString(16).toLocaleUpperCase());
- }
- if (strArr.includes("D") && strArr.includes("A")) {
- if (strArr.indexOf("A") - strArr.indexOf("D") === 1) {
- strArr.splice(strArr.indexOf("D"), 1);
- strArr.splice(strArr.indexOf("A"), 1, <br key={0} />);
- }
- }
- strArr = strArr.map((item) => {
- if (typeof item === "string") {
- if (readType === 1) {
- return this.myserialport.hex2a(parseInt(item, 16));
- } else if (readType === 2) {
- return item + " ";
- }
- }
- return item;
- });
- if (typeof strArr[strArr.length - 1] === "string") {
- strArr.push("\r\n");
- }
- body.push(strArr.join(""));
- }
- return body;
- });
- },
- conCom(){
- try {
- this.myserialport.state.baudRate = this.form1.baudRate;
- this.myserialport.state.dataBits = this.form1.dataBits;
- this.myserialport.state.stopBits = this.form1.stopBits;
- this.myserialport.state.parity = this.form1.parity;
- this.myserialport.state.flowControl = this.form1.flowControl;
- this.myserialport.openPort(0, true, this.callBack);
- console.log(this.form1.port)
- } catch (error) {
- this.$message.error("涓插彛杩炴帴澶辫触锛佽妫�鏌ヤ覆鍙ｆ槸鍚﹀凡琚崰鐢�");
- }
- if (this.myserialport.state.isOpen) {
- this.$message.success("涓插彛杩炴帴鎴愬姛");
- }
- },
- //杩炴帴
- async connectBtn() {
- if (this.btnType === "primary") {
- try {
- this.myserialport.state.baudRate = this.form1.baudRate;
- this.myserialport.state.dataBits = this.form1.dataBits;
- this.myserialport.state.stopBits = this.form1.stopBits;
- this.myserialport.state.parity = this.form1.parity;
- this.myserialport.state.flowControl = this.form1.flowControl;
- await this.myserialport.openPort(this.form1.port, true, this.callBack);
- console.log(this.form1.port)
- } catch (error) {
- this.$message.error("涓插彛杩炴帴澶辫触锛佽妫�鏌ヤ覆鍙ｆ槸鍚﹀凡琚崰鐢�");
- }
- if (this.myserialport.state.isOpen) {
- this.$message.success("涓插彛杩炴帴鎴愬姛");
- this.open1 = false
- this.btnType = "danger";
- this.btnText = "鍏抽棴涓插彛";
- }
- } else {
- this.myserialport.openPort(this.form1.port, false, this.callBack);
- this.$message.success("涓插彛鍏抽棴鎴愬姛");
- this.btnType = "primary";
- this.btnText = "杩炴帴涓插彛";
- }
- },
- //鎺堟潈
- async obtainAuthorization() {
- if ("serial" in navigator) {
- console.log("The Web Serial API is supported.");
- if (!this.myserialport) this.myserialport = new MySerialPort();
- try {
- await this.myserialport.handleRequestPort();
- this.$message.success("涓插彛鎺堟潈鎴愬姛");
- this.getPortInfo(this.myserialport.state.ports);
- } catch (error) {
- this.$message.warning("鏈�夋嫨鏂颁覆鍙ｆ巿鏉冿紒");
- }
- } else {
- this.$message.error(
- "褰撳墠涓篐TTP妯″紡鎴栬�呮祻瑙堝櫒鐗堟湰杩囦綆锛屼笉鏀寔缃戦〉杩炴帴涓插彛"
- );
- }
- },
- //涓插彛鍒楄〃鍒濆鍖�
- getPortInfo(portList) {
- this.portsList = [];
- portList.map((port, index) => {
- const { usbProductId, usbVendorId } = port.getInfo();
- if (usbProductId === undefined || usbVendorId === undefined) {
- this.portsList.push({ label: "鏈煡璁惧" + index, value: index });
- } else {
- const usbVendor = USBDevice.filter(
- (item) => parseInt(item.vendor, 16) === usbVendorId
- );
- let usbProduct = [];
- if (usbVendor.length === 1) {
- usbProduct = usbVendor[0].devices.filter(
- (item) => parseInt(item.devid, 16) === usbProductId
- );
- }
- this.portsList.push({ label: usbProduct[0].devname, value: index });
- }
- });
- },
- // 鍙戦��
- async sendCommon() {
- if (this.myserialport.state.isOpen) {
- if (this.form1.sendMsg.length !== 0) {
- const writeType = this.form1.type;
- let value = this.form1.sendMsg;
- let arr = [];
- if (writeType === 1) {
- // ASCII
- for (let i = 0; i < value.length; i++) {
- arr.push(this.myserialport.a2hex(value[i]));
- }
- } else if (writeType === 2) {
- // HEX
- if (/^[0-9A-Fa-f]+$/.test(value) && value.length % 2 === 0) {
- for (let i = 0; i < value.length; i = i + 2) {
- arr.push(parseInt(value.substring(i, i + 2), 16));
- }
- } else {
- this.$message.error("鏍煎紡閿欒");
- return;
- }
- }
- this.myserialport.writeText(arr);
- } else {
- this.$message.warning("璇疯緭鍏ュ彂閫佺殑淇℃伅");
- }
- } else {
- this.$message.warning("涓插彛澶勪簬鍏抽棴鐘舵�侊紝璇疯繛鎺ヤ覆鍙�");
- }
- },
- async getPorts() {
- await this.myserialport.getPorts();
- this.getPortInfo(this.myserialport.state.ports);
- },
- querySearch(queryString, cb) {
- var restaurants = this.restaurants;
- var results = queryString
- ? restaurants.filter(this.createFilter(queryString))
- : restaurants;
- // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
- cb(results);
- },
- createFilter(queryString) {
- return (restaurant) => {
- return (
- restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
- 0
- );
- };
- },
- loadAll() {
- return [
- { value: "110" },
- { value: "300" },
- { value: "600" },
- { value: "1200" },
- { value: "2400" },
- { value: "4800" },
- { value: "7200" },
- { value: "9600" },
- { value: "14400" },
- { value: "19200" },
- { value: "28800" },
- { value: "38400" },
- { value: "56000" },
- { value: "57600" },
- { value: "76800" },
- { value: "115200" },
- { value: "230400" },
- { value: "460800" },
- ];
},
}
}
--
Gitblit v1.9.3