From 5b544fc8d6029a71669b3992c5cfea9a044aaf3f Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期四, 04 七月 2024 16:39:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 130 ++++++++++++++++--------------------------
1 files changed, 50 insertions(+), 80 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index b64b35f..99bdc1e 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -86,11 +86,9 @@
<span style="display: none">{{cakeLamp.release}}</span>
<span> 鍏佽鏀捐</span>
</el-col>
-
</el-row>
- <el-row v-show="showInput" style="margin-top: 20px">
- <el-col></el-col>
- <span style="width: 130px;" class="head-font">棰勮鎬绘垚鍙� : {{headContent.yzSfcCode}}</span>
+ <el-row v-show="orderFlag" style="margin-top: 20px">
+ <el-button @click="getWorkOrders" type="warning" size="mini">鎺ユ敹宸ュ崟</el-button>
</el-row>
<!-- <el-row v-show="showInput" style="margin-top: 20px">-->
<!-- <el-button @click="bindYzSfc" type="primary">缁戝畾</el-button>-->
@@ -308,7 +306,7 @@
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
import {
clearWorkpieceRelease,
- fistSetpNumber,
+ fistSetpNumber, initializedData,
listFormulaChild,
noPageListFormulaChild,
releaseCheck,
@@ -322,7 +320,7 @@
bindYzSfcFlag,
checkCarCode, checkYzSfcCode,
findBytrolleyYardGetOne,
- listProductionOrde,
+ listProductionOrde, mozuReceivingWorkOrders,
receivingWorkOrders,
trolleyYardBinDing
} from "@/api/main/om/productionOrde/productionOrde";
@@ -334,6 +332,7 @@
saveCampaignTimeParameters,
replaceAssemblyCode, checkRecordDataDone,
} from "@/api/main/da/paramCollection/paramCollection";
+import {addFormula} from "@/api/main/bs/formula/formula";
export default {
name: "stationTerminal",
@@ -392,7 +391,7 @@
content: '',
activeName: 'first',
url: "ws://10.103.210.248:8080/websocket/message/",
- // url: "ws://192.168.2.76:8080/websocket/message/",
+ // url: "ws://192.168.10.100:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -423,6 +422,7 @@
originalArray: [],
yzSfcFlag: 1,
endYz: false,
+ orderFlag: true
}
},
beforeDestroy() {
@@ -459,6 +459,23 @@
},
},
methods: {
+ getWorkOrders(){
+ if(this.headContent.sfcCode === '' || this.headContent.sfcCode === null){
+ //鎺ユ敹宸ュ崟
+ const param = {
+ lineCode: this.headContent.processesCode
+ }
+ mozuReceivingWorkOrders(param).then(response => {
+ this.headContent.sfcCode = response.msg;
+ this.queryParams.productNum = response.msg;
+ this.getList()
+ this.cakeLamp.scanFinish = 1
+ this.cakeLamp.startWork = 1
+ });
+ }else {
+ this.$message.error("宸茬粡鏈夊伐鍗曚簡锛屼笉鑳芥帴鏀讹紒");
+ }
+ },
bindcardCode(scanValue){
// this.$message('缁戝畾鎴愬姛锛�');
let param = {
@@ -620,6 +637,21 @@
});
},
+ initializedData(){
+ const param = {
+ locationCode: this.headContent.processesCode,
+ }
+ initializedData(param).then(response => {
+ if(response.msg !== ''){
+ this.headContent.sfcCode = response.msg;
+ this.queryParams.productNum = response.msg;
+ this.getList()
+ this.cakeLamp.scanFinish = 1
+ this.cakeLamp.startWork = 1
+ }
+ });
+ },
+
getCurrentTime() {
const now = new Date();
const year = now.getFullYear();
@@ -679,14 +711,7 @@
}
this.headContent.processesName = rows.processesName
this.headContent.processesCode = rows.processesCode
- if(this.headContent.processesCode === 'OP240'){
- this.onLineBinDing = true
- }
- if(this.headContent.processesCode === 'OP260'){
- // this.showInput = true
- }
-
- console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
+ this.initializedData()
});
this.conCom()
@@ -698,6 +723,9 @@
this.$message('websocket杩炴帴鎴愬姛锛�');
};
+
+
+ //socket浠庡悗鍙板悜鍓嶅彴鎺ㄩ�佹暟鎹�
this.ws.onmessage = function (event) {
if (event.data === "IN") {
self.cakeLamp.InPlace = 1;
@@ -748,69 +776,6 @@
console.log("杩涘叆鏈�缁堟柟娉�")
self.endSaveData(param)
-
- // if(self.headContent.processesCode === "OP260"){
- // checkYzSfcCode(orderParam).then(response => {
- // if(response.data === 0){
- // self.$message('鏈粦瀹氭�绘垚鐮佺姝㈡斁琛�');
- // return;
- // }else {
- // self.endSaveData(param)
- // // saveCampaignTimeParameters(param).then(response => {
- // // self.cakeLamp.release = 1;
- // // self.endClear()
- // // workpieceRelease(param).then(response => {});});
- // }
- // })
- // }else {
- // self.endSaveData(param)
- // // saveCampaignTimeParameters(param).then(response => {
- // // self.cakeLamp.release = 1;
- // // self.endClear()
- // // workpieceRelease(param).then(response => {});
- // // });
- // }
-
- // checkCarCode(orderParam).then(response => {
- // console.log(response.data)
- // if(response.data === 1){
- // if(self.headContent.processesCode === "OP260"){
- // checkYzSfcCode(orderParam).then(response => {
- // if(response.data === 1){
- // saveCampaignTimeParameters(param).then(response => {
- // checkRecordDataDone(param).then(response => {
- // if(response.msg === "21"){
- // self.cakeLamp.release = 1;
- // self.endClear()
- // workpieceRelease(param).then(response => {});
- // }else {
- // self.$message('鏈仛瀹屽伐搴忕姝㈡斁琛�');
- // }
- // });
- // });
- // }else {
- // self.$message('璇峰厛缁戝畾棰勮鎬绘垚');
- // }
- // });
- // }else {
- // saveCampaignTimeParameters(param).then(response => {
- // checkRecordDataDone(param).then(response => {
- // if(response.msg === "21"){
- // self.cakeLamp.release = 1;
- // self.endClear()
- // workpieceRelease(param).then(response => {});
- // }else {
- // self.$message('鏈仛瀹屽伐搴忕姝㈡斁琛�');
- // }
- // });
- // });
- // }
- // }else {
- // self.$alert('<strong style="color: red;font-size: 30px">鏈壂鎻忓皬杞︾爜绂佹鏀捐</strong>', '鎻愮ず', {
- // dangerouslyUseHTMLString: true
- // });
- // }
- // });
} else if (event.data.includes("[")) {
let formulaChilds = "";
self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
@@ -855,6 +820,13 @@
self.getListFormulaChild()
});
}
+ }else if(event.data.includes("productNum")){
+ let productNum = event.data.split(',')[1];
+ self.headContent.sfcCode = productNum;
+ self.queryParams.productNum = productNum;
+ self.getList()
+ self.cakeLamp.scanFinish = 1
+ self.cakeLamp.startWork = 1
}
};
},
@@ -905,8 +877,6 @@
this.headContent.sfcCode = response.msg;
this.queryParams.productNum = response.msg;
this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
- // this.headContent.sfcCode = scanValue;
- // this.queryParams.productNum = scanValue;
this.getList()
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
--
Gitblit v1.9.3