From 01beb5de6b270341bf1ffd7a4319035ebbff31a0 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 23 七月 2024 20:27:18 +0800
Subject: [PATCH] -拧紧返修功能
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java | 9
jcdm-ui/src/views/main/cfkb/repairAndTighten/index.vue | 862 ++++++++++++++++++++++++++++++++++++++++++++++++++
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java | 2
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java | 15
jcdm-admin/src/main/resources/application-druid.yml | 4
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 101 +++++
jcdm-ui/src/api/main/da/paramCollection/paramCollection.js | 8
7 files changed, 999 insertions(+), 2 deletions(-)
diff --git a/jcdm-admin/src/main/resources/application-druid.yml b/jcdm-admin/src/main/resources/application-druid.yml
index 70f56ed..51f6d02 100644
--- a/jcdm-admin/src/main/resources/application-druid.yml
+++ b/jcdm-admin/src/main/resources/application-druid.yml
@@ -21,8 +21,8 @@
url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm042-Mes
username: sa
# password: JCDM@2023
-# password: admin@123
- password: 1!deshine
+ password: admin@123
+# password: 1!deshine
# password: 123456
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 dcd6c74..c087a8d 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
@@ -125,6 +125,15 @@
/**
* 鍑烘垬鏃堕棿鍙傛暟澧炲姞
*/
+ @PostMapping("/addRepairTighteningData")
+ public AjaxResult addRepairTighteningData(@RequestBody DaParamCollection daParamCollection)
+ {
+ return daParamCollectionService.addRepairTighteningData(daParamCollection);
+ }
+
+ /**
+ * 鍑烘垬鏃堕棿鍙傛暟澧炲姞
+ */
@PostMapping("/preInstallOut")
public void preInstallOut(@RequestBody DaParamCollection daParamCollection)
{
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
index d87839c..80fd26c 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
@@ -130,6 +130,21 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date outboundTime;
+ @TableField(exist = false)
+ private String screwNumber;
+
+ @TableField(exist = false)
+ private String torque;
+
+ @TableField(exist = false)
+ private String angle;
+
+ @TableField(exist = false)
+ private String torqueResult;
+
+ @TableField(exist = false)
+ private String angleResult;
+
public Date getInboundTime() {
return inboundTime;
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 b486d42..82d3e06 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
@@ -90,4 +90,6 @@
void manualWorkstationsAddBasicParameters(DaParamCollection daParamCollection);
void preInstallOut(DaParamCollection daParamCollection);
+
+ AjaxResult addRepairTighteningData(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 68de0e9..3b51f16 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
@@ -754,4 +754,105 @@
}
}
+ @Override
+ public AjaxResult addRepairTighteningData(DaParamCollection daParamCollection) {
+ try {
+// String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+ String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+ String processesCode = daParamCollection.getLocationCode();
+
+ long timestampMillis = Instant.now().toEpochMilli();
+ ParentVO parentVO = new ParentVO();
+ List<ChildVO> childVOList = new ArrayList<>();
+ parentVO.setSiteCode("3983");
+ parentVO.setRecordId(""+timestampMillis);
+ parentVO.setStationCode(processesCode);
+ parentVO.setProductNum(daParamCollection.getSfcCode());
+ parentVO.setTotalResult("1");
+ parentVO.setCheckList(childVOList);
+
+ String screwNumber = daParamCollection.getScrewNumber();
+ String torque = daParamCollection.getTorque();
+ String angle = daParamCollection.getAngle();
+ String torqueResult = daParamCollection.getTorqueResult();
+ String angleResult = daParamCollection.getAngleResult();
+
+ Map<String, String> map = new HashMap<>();
+ map.put("POP320","妯＄粍");
+ map.put("POP400","绠辩洊");
+
+ List<String> nameLikeString = new ArrayList<>();
+ nameLikeString.add(map.get(processesCode)+"鎷х揣鏈�缁堟壄鐭�");
+ nameLikeString.add(map.get(processesCode)+"鎷х揣鏈�缁堣搴�");
+ nameLikeString.add(map.get(processesCode)+"鎷х揣鏈�缁堟壄鐭╂槸鍚﹀湪鑼冨洿鍐�");
+ nameLikeString.add(map.get(processesCode)+"鎷х揣鏈�缁堣搴︽槸鍚﹀湪鑼冨洿鍐�");
+
+ if(screwNumber.contains("锛�")){
+ String[] screwNumberSplit = screwNumber.split("锛�");
+ String[] torqueSplit = torque.split("锛�");
+ String[] angleSplit = angle.split("锛�");
+ String[] torqueResultSplit = torqueResult.split("锛�");
+ String[] angleResultSplit = angleResult.split("锛�");
+
+ List<String[]> dataList = new ArrayList<String[]>();
+ dataList.add(torqueSplit);
+ dataList.add(angleSplit);
+ dataList.add(torqueResultSplit);
+ dataList.add(angleResultSplit);
+
+ for (int k = 0; k < nameLikeString.size(); k++) {
+ for (int i = 0; i < screwNumberSplit.length; i++) {
+ String s1 = nameLikeString.get(k)+screwNumberSplit[i];
+ List<DaCollectionParamConf> confList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
+ .eq(DaCollectionParamConf::getProcessesCode, processesCode)
+ .eq(DaCollectionParamConf::getCollectParameterName, s1)
+ );
+ DaCollectionParamConf daCollectionParamConf = confList.get(0);
+ ChildVO childVO = new ChildVO();
+ childVO.setItemCode(daCollectionParamConf.getCollectParameterId());
+ childVO.setItemType(daCollectionParamConf.getSpareField1());
+ childVO.setItemText(daCollectionParamConf.getCollectParameterName());
+ String itemValue = dataList.get(k)[i];
+ childVO.setItemValue(itemValue);
+ childVO.setCheckTime(format.format(new Date()));
+ childVO.setCheckResult("1");
+ childVOList.add(childVO);
+ }
+ }
+ }else {
+ List<String> dataList = new ArrayList<>();
+ dataList.add(torque);
+ dataList.add(angle);
+ dataList.add(torqueResult);
+ dataList.add(angleResult);
+ for (int k = 0; k < nameLikeString.size(); k++) {
+ String collectParameterName = nameLikeString.get(k)+screwNumber;
+ List<DaCollectionParamConf> confList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
+ .eq(DaCollectionParamConf::getProcessesCode, processesCode)
+ .eq(DaCollectionParamConf::getCollectParameterName, collectParameterName)
+ );
+ DaCollectionParamConf daCollectionParamConf = confList.get(0);
+ ChildVO childVO = new ChildVO();
+ childVO.setItemCode(daCollectionParamConf.getCollectParameterId());
+ childVO.setItemType(daCollectionParamConf.getSpareField1());
+ childVO.setItemText(daCollectionParamConf.getCollectParameterName());
+ String itemValue = dataList.get(k);
+ childVO.setItemValue(itemValue);
+ childVO.setCheckTime(format.format(new Date()));
+ childVO.setCheckResult("1");
+ childVOList.add(childVO);
+ }
+ }
+
+ System.out.println(childVOList);
+ logger.info("宸ヤ綅{}-----------杩斾慨鏁版嵁涓婁紶鍏ュ弬vo锛歿}",processesCode,new Gson().toJson(parentVO));
+ HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+ logger.info("宸ヤ綅{}-----------杩斾慨鏁版嵁涓婁紶缁撴灉锛歿}",processesCode,execute.body());
+ return AjaxResult.success("涓婁紶鎴愬姛");
+ }catch (Exception e){
+ return AjaxResult.error("涓婁紶澶辫触锛屽弬鏁颁笉瀵硅妫�鏌ワ紒");
+ }
+ }
+
+
}
diff --git a/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js b/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
index f77c8db..beb6a8a 100644
--- a/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
+++ b/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
@@ -71,6 +71,14 @@
})
}
+export function addRepairTighteningData(data) {
+ return request({
+ url: '/main/paramCollection/addRepairTighteningData',
+ method: 'post',
+ data: data
+ })
+}
+
export function preInstallOut(data) {
return request({
url: '/main/paramCollection/preInstallOut',
diff --git a/jcdm-ui/src/views/main/cfkb/repairAndTighten/index.vue b/jcdm-ui/src/views/main/cfkb/repairAndTighten/index.vue
new file mode 100644
index 0000000..df0d4b3
--- /dev/null
+++ b/jcdm-ui/src/views/main/cfkb/repairAndTighten/index.vue
@@ -0,0 +1,862 @@
+<template>
+ <div class="app-container">
+ <el-row :gutter="5">
+ <el-col :span="12">
+ <el-card shadow="never">
+ <span class="head-font">鎷х揣杩斾慨</span>
+ </el-card>
+ </el-col>
+ <el-col :span="12">
+ <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">
+ <el-col :span="24">
+ <el-tabs type="border-card" style="height: 600px" v-model="activeName" @tab-click="changeMenu">
+ <el-tab-pane name="first">
+ <span slot="label"> <a class="el-icon-date"></a>棣栭〉</span>
+ <el-col :span="24">
+ <el-form ref="form" :model="form" label-width="80px">
+ <el-form-item label="宸ヤ綅" prop="locationCode">
+<!-- <el-input v-model="form.locationCode" placeholder="璇疯緭鍏ュ伐浣�" />-->
+ <el-select style="width: 100%" v-model="form.locationCode" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="铻轰笣鍙�" prop="screwNumber">
+ <el-input v-model="form.screwNumber" placeholder="璇疯緭鍏ヨ灪涓濆彿" />
+ </el-form-item>
+ <el-form-item label="鎵煩" prop="torque">
+ <el-input v-model="form.torque" placeholder="璇疯緭鍏ユ壄鐭�" />
+ </el-form-item>
+ <el-form-item label="瑙掑害" prop="angle">
+ <el-input v-model="form.angle" placeholder="璇疯緭鍏ヨ搴�" />
+ </el-form-item>
+ <el-form-item label="鎵煩缁撴灉" prop="torqueResult">
+ <el-input v-model="form.torqueResult" placeholder="璇疯緭鍏ユ壄鐭╃粨鏋�" />
+ </el-form-item>
+ <el-form-item label="瑙掑害缁撴灉" prop="angleResult">
+ <el-input v-model="form.angleResult" placeholder="璇疯緭鍏ヨ搴︾粨鏋�" />
+ </el-form-item>
+ </el-form>
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </el-col>
+ </el-tab-pane>
+ </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>
+import {getIpv4, listStationConf} from "@/api/main/sc/stationConf";
+import {
+ noPageListFormulaChild,
+ workpieceRelease,
+ yzUpdateResults,
+ yzUpdateTighteningFormula
+} from "@/api/main/bs/formulaChild/formulaChild";
+import MySerialPort from "@/utils/MySerialPort";
+import USBDevice from "@/utils/usb.json";
+import {addPassingStationCollection} from "@/api/main/da/passingStationCollection/passingStationCollection";
+import {
+ addRepairTighteningData,
+ addTighteningParameters, enterWeighing,
+ replaceAssemblyCode,
+ saveCampaignTimeParameters,
+ yzAddBasicParameters,
+} from "@/api/main/da/paramCollection/paramCollection";
+import QRCode from "qrcodejs2";
+import {addWorkshop, updateWorkshop} from "@/api/main/bs/workshop/workshop";
+
+export default {
+ name: "stationTerminal",
+ data() {
+ return {
+ options: [{
+ value: 'POP320',
+ label: '妯＄粍鎷х揣'
+ }, {
+ value: 'POP400',
+ label: '绠辩洊鎷х揣'
+ }],
+ weightValue: '',
+ showInput: true,
+ serialPortContent: '',
+ // 鏌ヨ鍙傛暟
+ formulaChildParams: {
+ pageNum: 1,
+ pageSize: 10,
+ productCode: null,
+ processesCode: null,
+ },
+ // 閰嶆柟閰嶇疆瀛愪俊鎭〃鏍兼暟鎹�
+ formulaChildList: [],
+ ipAddress: '',
+ imgSrc: '',
+ headContent: {
+ processesCode: 'OP520',
+ processesName: '鎴愬搧涓嬬嚎',
+ sfcCode: '',
+ yzSfcCode: '',
+ },
+ workpieceInformation: {
+ workOrderNo: null,
+ productCode: null,
+ productModel: null,
+ productName: null,
+ beat: null,
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ sfcCode: null,
+ },
+ // 鏌ヨ鍙傛暟
+ StationConfQueryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ ipAddress: null,
+ },
+ cakeLamp: {
+ plcState: 1, //plc
+ scannerState: 1, //鎵爜鏋�
+ InPlace: 0, //宸ヤ欢鍒颁綅
+ scanFinish: 0,
+ startWork: 0,
+ release: 0 //鍏佽鏀捐
+ },
+ content: '',
+ activeName: 'first',
+ url: "ws://192.168.2.76:8080/websocket/message/",
+ message: "",
+ text_content: "",
+ ws: null,
+ inputValue: '9',
+
+ open1: false,
+ input: "",
+ keepReading: true,
+ form1: {
+ baudRate: "115200",
+ dataBits: "8",
+ stopBits: "1",
+ parity: "none",
+ flowControl: "none",
+ desc: "",
+ type: "1",
+ isShowHistory: false,
+ },
+ btnType: "primary",
+ btnText: "杩炴帴涓插彛",
+ restaurants: [],
+ portsList: [],
+ isShowSendArea: false,
+ readType: 1,
+ title: "",
+
+ passingStationForm: {},
+ originalArray: [],
+ text1: '',
+ }
+ },
+ 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";
+ },
+ },
+ methods: {
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ screwNumber: null,
+ torque: null,
+ angle: null,
+ torqueResult: null,
+ angleResult: null,
+ locationCode : null,
+ sfcCode: null,
+ };
+ this.resetForm("form");
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.reset();
+ },
+ /** 鎻愪氦鎸夐挳 */
+ submitForm() {
+ this.form.sfcCode = this.headContent.sfcCode
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ console.log(this.form)
+ addRepairTighteningData(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.getList();
+ this.reset();
+ });
+ }
+ });
+ },
+ serialLink() {
+ this.open1 = true
+ },
+ bindYzSfc(){
+ if(this.headContent.sfcCode!==""&&this.headContent.yzSfcCode!==""){
+ let param = {
+ sfcCode: this.headContent.sfcCode,
+ locationCode: this.headContent.processesCode,
+ yzSfcCode: this.headContent.yzSfcCode
+ }
+ this.$message('鍙互缁戝畾锛�');
+ replaceAssemblyCode(param).then(response => {
+
+ });
+ }
+ },
+
+ Release(){
+ // this.$message('portsList锛�'+this.portsList.length);
+ if(this.btnType === "danger"){
+ this.$message('杩炴帴浜�!锛�');
+
+ }else {
+ this.$message('mei杩炴帴浜嗭紒');
+
+ }
+
+ },
+ serialPortMethod(value){
+ let formulaChildParams = {
+ scanBarcode: value,
+ sfcBarcode: this.headContent.sfcCode,
+ workOrderNo: this.workpieceInformation.workOrderNo,
+ productCode: "1P102S",
+ locationCode: this.headContent.processesCode,
+ collectionTime: new Date()
+ }
+ yzUpdateResults(formulaChildParams).then(response => {
+ this.getListFormulaChild()
+ });
+ },
+ rowStyle({ row }) {
+ if (row.results === 'OK') {
+ return 'background-color: PaleGreen';
+ } else if (row.results === 'NG') {
+ return 'background-color: LightSalmon';
+ }
+ return '';
+ },
+ /** 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */
+ getListFormulaChild() {
+ this.formulaChildParams.productCode = "1P102S"
+ this.formulaChildParams.processesCode = this.headContent.processesCode
+ console.log(this.formulaChildParams)
+ noPageListFormulaChild(this.formulaChildParams).then(response => {
+ this.formulaChildList = response.rows;
+ if (this.formulaChildList.length >0){
+ let pos = 0
+ const tempArr = this.formulaChildList.filter(x=> 'OK' === x.results)
+ if (tempArr.length>0){
+ pos = tempArr.length
+ this.$nextTick(() => {
+ let temp33 = document.getElementsByClassName('el-table__row')
+ console.log('temp33',temp33)
+ console.log('len',temp33.item(pos))
+ if (temp33.length > 0){
+ console.log('1111111111111111')
+ let arr = temp33[pos-1]
+ console.log('srr',arr)
+ arr.scrollIntoView({ block: 'center' })
+ }
+ })
+ }
+
+ }
+ });
+ },
+ endClear(){
+
+ },
+ changeMenu(tab, event) {
+ console.log(tab, event);
+ },
+ clearClick(){
+ this.$message('杩欐槸涓�鏉℃竻闄ゆ秷鎭彁绀�');
+ this.headContent.sfcCode = null
+ },
+ scanCompleted(){
+ this.$message('鎵爜瀹屾垚'+this.content);
+ this.headContent.sfcCode = this.content
+ this.queryParams.sfcCode = this.content
+ this.getList()
+ this.getListFormulaChild()
+ this.cakeLamp.scanFinish = 1
+ this.cakeLamp.startWork = 1
+
+ },
+
+ /** 鍏ョ珯澧炲姞杩囩珯閲囬泦璁板綍 **/
+ addOverStationCollection(){
+ this.passingStationForm = {
+ id: null,
+ // workOrderNo: this.workpieceInformation.workOrderNo,
+ productCode: "1P102S",
+ locationCode: this.headContent.processesCode,
+ // model: this.workpieceInformation.productModel,
+ productBarcode: this.headContent.sfcCode,
+ sfcCode: this.headContent.sfcCode,
+ inboundTime: new Date()
+ }
+ addPassingStationCollection(this.passingStationForm).then(response => {});
+ yzAddBasicParameters(this.passingStationForm).then(response => {});
+ },
+ exit() {
+ if (this.ws) {
+ this.ws.close();
+ this.ws = null;
+ }
+ },
+ send() {
+ if (this.ws) {
+ this.ws.send(this.message);
+ } else {
+ alert("鏈繛鎺ュ埌鏈嶅姟鍣�");
+ }
+ },
+
+ initStation: async function () {
+ await getIpv4().then(response => {
+ this.StationConfQueryParams.ipAddress = response.msg
+ console.log('鏌ヨ鍒版湰宸ヤ綅IP涓�' + this.StationConfQueryParams.ipAddress)
+ });
+ await 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)
+
+ });
+ 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杩炴帴鎴愬姛锛�');
+ };
+ this.ws.onmessage = function (event) {
+ if (event.data === "IN") {
+ self.cakeLamp.InPlace = 1;
+ } else if (event.data === "IN0") {
+ self.cakeLamp.InPlace = 0;
+ } else if (event.data === "OUT") {
+ console.log("out")
+
+ const param = {
+ workOrderNo: self.workpieceInformation.workOrderNo,
+ productCode: "1P102S",
+ locationCode: self.headContent.processesCode,
+ productBarcode: self.headContent.sfcCode,
+ }
+ // saveCampaignTimeParameters(param).then(response => {});
+ // self.cakeLamp.release = 1;
+ workpieceRelease(param).then(response => {});
+ self.formulaChildList = [];
+ self.headContent.sfcCode = '';
+ console.log(self.formulaChildList)
+ } 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 => {});
+ // self.endClear()
+ // workpieceRelease(param).then(response => {});
+ } else if (event.data.includes("[")) {
+ let formulaChilds = "";
+ self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
+ self.formulaChildList
+ .filter((formulaChild) => formulaChild.operationType === '1');
+ for (let i = 0; i < self.formulaChildList.length; i++) {
+ let formulaChild = self.formulaChildList[i];
+ let results = formulaChild.results;
+ if (results === '' || results === null || results === 'NG') {
+ formulaChilds = formulaChild;
+ break;
+ }
+ }
+ const param = {
+ tightenTheArray: event.data,
+ paramCode: formulaChilds.paramCode,
+ // workOrderNo: self.workpieceInformation.workOrderNo,
+ productCode: "1P102S",
+ locationCode: self.headContent.processesCode,
+ productBarcode: self.headContent.sfcCode,
+ }
+ addTighteningParameters(param).then(response => {});
+ yzUpdateTighteningFormula(param).then(response => {
+ console.log(response.msg)
+ if(response.msg === "1"){
+ self.getListFormulaChild()
+
+ }else {
+ const param = {
+ workOrderNo: self.workpieceInformation.workOrderNo,
+ productCode: "1P102S",
+ locationCode: self.headContent.processesCode,
+ productBarcode: self.headContent.sfcCode,
+ }
+ saveCampaignTimeParameters(param).then(response => {});
+ workpieceRelease(param).then(response => {});
+ self.formulaChildList = [];
+ self.headContent.sfcCode = '';
+ }
+ });
+ }
+ };
+ },
+
+
+
+ //鎺ュ彈鏁版嵁鐨勫洖璋�
+ callBack(value) {
+ if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
+ else {
+ const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
+ this.headContent.sfcCode = scanValue
+
+ }
+ },
+ 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" },
+ ];
+ },
+ }
+}
+
+</script>
+<style scoped>
+.bottom-card{
+ height: 600px;
+}
+.circle-button{
+ height: 30px;
+ width: 30px;
+}
+.circle-red {
+ background-color: #e01a4f;
+}
+.circle-green {
+ background-color: green;
+}
+.circle-green-animate {
+ background-color: green;
+ animation: circle-green-animate 2s infinite;
+}
+@keyframes circle-green-animate {
+ 50% {
+ opacity: 0.6;
+ }
+ 0% {
+ opacity: 0.2;
+ }
+}
+.head-font{
+ /*font-weight: bold;*/
+ /*font-size: 25px;*/
+}
+span{
+ font-size: 15px;
+}
+.el-table .warning-row {
+ background: oldlace;
+}
+
+.el-table .success-row {
+ background: #f0f9eb;
+}
+</style>
+
--
Gitblit v1.9.3