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 | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index e55811e..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>-->
@@ -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 = {
@@ -804,7 +821,12 @@
});
}
}else if(event.data.includes("productNum")){
- self.headContent.sfcCode = event.data.split(',')[1];
+ let productNum = event.data.split(',')[1];
+ self.headContent.sfcCode = productNum;
+ self.queryParams.productNum = productNum;
+ self.getList()
+ self.cakeLamp.scanFinish = 1
+ self.cakeLamp.startWork = 1
}
};
},
--
Gitblit v1.9.3