From b0cece854bfce6a0caaf22e73643830e8b8cf67d Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 15 十月 2024 10:40:02 +0800
Subject: [PATCH] 优化
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 197 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 148 insertions(+), 49 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 9c08027..8a97c53 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -80,25 +80,25 @@
<el-button id="print" v-print="'#printMe'" type="primary">鎵撳嵃</el-button>
<div style="display: none">
<div id="printMe">
- <div style="text-align: center;margin-top: 64px">
+ <div style="text-align: center;margin-top: 70px">
<span style="font-size: 29px;">鐢甸┍绯荤粺鎬绘垚</span>
</div>
- <div style="display: flex;margin-top: 2px;margin-left: 44px;font-size: 15px">
+ <div style="display: flex;margin-top: 2px;margin-left: 39px;font-size: 15px">
<div class="div1">
<div >
<span>鐢垫満鍨嬪彿锛�</span><span>TZ180XSDSZX01</span><br>
</div>
<div style="margin-top: 4px">
- <span>棰濆畾鍔熺巼锛�</span><span>30KW</span><br>
+ <span>棰濆畾鍔熺巼锛�</span><span>30kW</span><br>
</div>
<div style="margin-top: 4px">
<span>棰濆畾鎵煩锛�</span><span>70N.m</span><br>
</div>
<div style="margin-top: 4px">
- <span>棰濆畾鐢靛帇锛�</span><span>336VDS</span><br>
+ <span>棰濆畾鐢靛帇锛�</span><span>336VDC</span><br>
</div>
<div style="margin-top: 4px">
- <span>棰濆伐浣滃埗锛�</span><span>S9</span><br>
+ <span>宸ヤ綔鍒讹細</span><span>S9</span><br>
</div>
<div style="margin-top: 4px">
<span>鎸佺画宸ヤ綔鐢垫祦锛�</span><span>115A</span><br>
@@ -107,16 +107,16 @@
<span>鐩告暟锛�</span><span>3</span><br>
</div>
<div style="margin-top: 4px">
- <span>闆朵欢鍙凤細</span><span>9900200461</span><br>
+ <span>闆朵欢鍙凤細</span><span>{{printMaterialCode}}</span><br>
</div>
</div>
- <div class="div2" style="font-size: 15px;margin-left: 12px">
+ <div class="div2" style="font-size: 15px;margin-left: 4px">
<div>
<span>鎺у埗鍣ㄥ瀷鍙凤細</span><span>KTZ34X23SZX07</span><br>
</div>
<div style="margin-top: 4px">
- <span>宄板�煎姛鐜囷細</span><span>60KW</span><br>
+ <span>宄板�煎姛鐜囷細</span><span>60kW</span><br>
</div>
<div style="margin-top: 4px">
<span>宄板�艰浆鐭╋細</span><span>175N.m</span><br>
@@ -125,7 +125,7 @@
<span>鏈�楂樿浆閫燂細</span><span>12000rpm</span><br>
</div>
<div style="margin-top: 4px">
- <span>闃叉姢绛夌骇锛�</span><span>IP68</span><br>
+ <span>闃叉姢绛夌骇锛�</span><span>IP67</span><br>
</div>
<div style="margin-top: 4px">
<span>宄板�煎伐浣滅數娴侊細</span><span>230A</span><br>
@@ -134,17 +134,17 @@
<span>缁濈紭绛夌骇锛�</span><span>H</span><br>
</div>
<div style="margin-top: 4px">
- <span>鍑哄巶缂栧彿锛�</span><span>2407190000002</span><br>
+ <span>鍑哄巶缂栧彿锛�</span><span>{{headContent.sfcCode}}</span><br>
</div>
</div>
</div>
- <div style="margin-top: 2px;margin-left: 80px">
+ <div style="margin-top: 2px;margin-left: 70px">
<span style="font-size: 26px;">婀栧窞鏅鸿姱鍔ㄥ姏绯荤粺鍙戝睍鏈夐檺鍏徃</span>
</div>
<div style="text-align: center;margin-top: 101px;font-size: 20px">
- <div style="margin-top: 8px">
+ <div style="margin-top: 12px">
<span style="font-size: 22px">TZ180XSDSZX01</span><br>
</div>
@@ -153,52 +153,115 @@
</div>
<div style="margin-top: 4px">
- <span style="font-size: 22px">993083</span><br>
+ <span style="font-size: 22px">993983</span><br>
</div>
<div style="margin-top: 4px">
- <span style="font-size: 22px">9900166410</span><br>
+ <span style="font-size: 22px">{{printMaterialCode}}</span><br>
</div>
<div style="margin-top: 4px">
- <span style="font-size: 22px">2407190000002</span>
+ <span style="font-size: 22px">{{headContent.sfcCode}}</span>
</div>
</div>
- <div style="margin-top: 61px;display: flex;margin-left: 48px">
+ <div style="margin-top: 57px;display: flex;margin-left: 40px">
<div style="width: 30%;flex: 1">
<VueQr :size='80' :margin='0' :text='this.text'></VueQr>
</div>
- <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 23px">
- <span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
- P9900166410#T{{headContent.sfcCode}}
- </span><br>
- <span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
- #V993983#SSW002.005#HHW001.001#NMCU
- </span>
- <!-- <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P9900166410#T{{text1}}#V993983#SSW002.005#HHW001.001#NBMS#</span>-->
+ <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 29px">
+ <span style="margin-left: -122px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
+ P{{printMaterialCode}}
+ </span>
+ <span style="margin-left: -5px;font-size: 19px;font-family: FangSong;letter-spacing: -0.7px">
+ #
+ </span>
+ <span style="margin-left: -9px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
+ T{{headContent.sfcCode}}
+ </span><br>
+
+ <span style="margin-left: -122px;font-size: 19px;font-family: FangSong;letter-spacing: -0.7px">
+ #
+ </span>
+ <span style="margin-left: -9px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
+ V993983
+ </span>
+ <span style="margin-left: -4px;font-size: 19px;font-family: FangSong;letter-spacing: -0.7px">
+ #
+ </span>
+ <span style="margin-left: -10px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
+ SSW001.001
+ </span>
+ <span style="margin-left: -4px;font-size: 19px;font-family: FangSong;letter-spacing: -0.7px">
+ #
+ </span>
+ <span style="margin-left: -9px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
+ HHW001.001
+ </span>
+ <span style="margin-left: -6px;font-size: 19px;font-family: FangSong;letter-spacing: -0.7px">
+ #
+ </span>
+ <span style="margin-left: -9px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
+ NMCU
+ </span>
+<!-- <span style="margin-left: -80px;font-size: 19px;font-family: FZYaoti;letter-spacing: -0.8px;font-weight: 100">-->
+<!-- #V993983#SSW002.005#HHW001.001#NMCU-->
+<!-- </span>-->
</div>
</div>
- <div style="margin-top: 48px;display: flex;margin-left: 48px">
+ <div style="margin-top: 44px;display: flex;margin-left: 40px">
<div style="width: 30%;flex: 1">
<VueQr :size='80' :margin='0' :text='this.text'></VueQr>
</div>
- <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 23px">
- <span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
- P9900166410#T{{headContent.sfcCode}}
- </span><br>
- <span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
- #V993983#SSW002.005#HHW001.001#NMCU
- </span>
- <!-- <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P9900166410#T{{text1}}#V993983#SSW002.005#HHW001.001#NBMS#</span>-->
+ <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 29px">
+<!-- <span style="margin-left: -80px;font-size: 19px;font-family: FZYaoti;letter-spacing: -0.8px;font-weight: 100">-->
+<!-- P9900200461#T{{headContent.sfcCode}}-->
+<!-- </span><br>-->
+<!-- <span style="margin-left: -80px;font-size: 19px;font-family: FZYaoti ;letter-spacing: -0.8px;font-weight: 100">-->
+<!-- #V993983#SSW002.005#HHW001.001#NMCU-->
+<!-- </span>-->
+ <span style="margin-left: -122px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
+ P{{printMaterialCode}}
+ </span>
+ <span style="margin-left: -5px;font-size: 19px;font-family: FangSong;letter-spacing: -0.7px">
+ #
+ </span>
+ <span style="margin-left: -9px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
+ T{{headContent.sfcCode}}
+ </span><br>
+
+ <span style="margin-left: -122px;font-size: 19px;font-family: FangSong;letter-spacing: -0.7px">
+ #
+ </span>
+ <span style="margin-left: -9px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
+ V993983
+ </span>
+ <span style="margin-left: -4px;font-size: 19px;font-family: FangSong;letter-spacing: -0.7px">
+ #
+ </span>
+ <span style="margin-left: -10px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
+ SSW001.001
+ </span>
+ <span style="margin-left: -4px;font-size: 19px;font-family: FangSong;letter-spacing: -0.7px">
+ #
+ </span>
+ <span style="margin-left: -9px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
+ HHW001.001
+ </span>
+ <span style="margin-left: -6px;font-size: 19px;font-family: FangSong;letter-spacing: -0.7px">
+ #
+ </span>
+ <span style="margin-left: -9px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
+ NMCU
+ </span>
</div>
</div>
- <div style="text-align: center;margin-left: -190px;margin-top: 35px">
+ <div style="text-align: center;margin-left: -190px;margin-top: 31px">
<div style="margin-top: 4px">
- <span>9900200461</span><br>
+ <span>{{printMaterialCode}}</span><br>
</div>
<div style="margin-top: 8px">
<span>MCU</span><br>
@@ -266,7 +329,7 @@
bindYzSfcFlag,
checkCarCode, checkYzSfcCode,
findBytrolleyYardGetOne,
- listProductionOrde, mozuReceivingWorkOrders,
+ listProductionOrde, listProductionOrdeLoopLine, mozuReceivingWorkOrders,
receivingWorkOrders,
trolleyYardBinDing
} from "@/api/main/om/productionOrde/productionOrde";
@@ -289,7 +352,7 @@
name: "stationTerminal",
data() {
return {
- text: 'P9900200461#T2408170000004 #V993983#SSW001.001#HHW001.001#NMCU',
+ text: 'P9900200461#T2408170000004#V993983#SSW001.001#HHW001.001#NMCU',
materialCode: '', // 鐗╂枡缂栫爜
carCode: '',
showInput: false,
@@ -328,6 +391,7 @@
pageNum: 1,
pageSize: 10,
sfcCode: null,
+ productNum: '',
},
// 鏌ヨ鍙傛暟
StationConfQueryParams: {
@@ -344,7 +408,7 @@
release: 0 //鍏佽鏀捐
},
content: '',
- // url: "ws://10.103.210.248:8080/websocket/message/",
+ // url: "ws://10.103.214.26:8080/websocket/message/",
url: "ws://192.168.20.250:8080/websocket/message/",
passingStationForm: {},
@@ -352,6 +416,7 @@
orderFlag: true,
printFlag: false,
activeName: 'first',
+ printMaterialCode : '',
}
},
@@ -388,7 +453,7 @@
){
if(this.materialCode.length>25){
let code = this.materialCode.substring(13,26);
- this.headContent.sfcCode = code;
+ // this.headContent.sfcCode = code;
this.queryParams.productNum = code;
this.getList();
this.cakeLamp.scanFinish = 1
@@ -518,9 +583,21 @@
},
/** 鏌ヨ宸ュ崟鍒楄〃 */
async getList() {
- await listProductionOrde(this.queryParams).then(response => {
+ await listProductionOrdeLoopLine(this.queryParams).then(response => {
+ console.log('杩涘叆鍒濆鍖栧姞杞絣ist鏂规硶')
let rowsData = response.rows[0];
if(rowsData){
+ console.log('杩涘叆鍒濆鍖栧姞杞絣ist鏂规硶'+response.rows[0])
+ if(this.headContent.processesCode === 'OP170'
+ ||this.headContent.processesCode === 'OP180'||
+ this.headContent.processesCode === 'OP190'||
+ this.headContent.processesCode === 'OP200'||
+ this.headContent.processesCode === 'OP210'||
+ this.headContent.processesCode === 'OP220'||
+ this.headContent.processesCode === 'OP230'
+ ){
+ this.headContent.sfcCode = rowsData.productNum
+ }
this.workpieceInformation.workOrderNo = rowsData.workOrderNo;
this.workpieceInformation.productCode = rowsData.productCode;
this.workpieceInformation.materialCode = rowsData.materialCode;
@@ -528,6 +605,12 @@
this.headContent.cardCode = rowsData.trolleyYard;
this.getListFormulaChild()
this.workpieceInformation.inboundTime = this.getCurrentTime()
+ this.printMaterialCode = rowsData.productCode
+ console.log(rowsData.productCode)
+ console.log(this.printMaterialCode)
+ this.text = 'P'+this.printMaterialCode+'#T'+this.headContent.sfcCode+'#V993983#SSW001.001#HHW001.001#NMCU'
+ console.log(this.text)
+
}else {
this.$message.error('绯荤粺娌℃湁姝ゅ伐鍗曪紝璇烽噸鏂版壂鐮侊紒');
}
@@ -540,15 +623,18 @@
}
initializedData(param).then(response => {
if(response.msg !== ''){
- this.headContent.sfcCode = response.msg;
- this.queryParams.productNum = response.msg;
+ if(this.headContent.processesCode === 'OP165'){
+ this.headContent.sfcCode = response.msg.substring(13,26)
+ this.queryParams.productNum = response.msg.substring(13,26);
+ }else {
+ this.headContent.sfcCode = response.msg;
+ this.queryParams.productNum = response.msg;
+ }
this.getList()
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
this.cakeLamp.InPlace = 1
- // this.test1()
- // this.test2()
- this.text = 'P9900200461#T'+this.headContent.sfcCode+' #V993983#SSW001.001#HHW001.001#NMCU'
+ // this.text = 'P9900200461#T'+this.headContent.sfcCode+'#V993983#SSW001.001#HHW001.001#NMCU'
}
});
},
@@ -579,7 +665,7 @@
let qrCode = new QRCode('canvasWrapper1',{
width: 83,
height: 83,
- text: 'P9900200461#T'+this.headContent.sfcCode+' #V993983#SSW001.001#HHW001.001#NMCU',
+ text: 'P9900200461#T'+this.headContent.sfcCode+'#V993983#SSW001.001#HHW001.001#NMCU',
colorDark: '#000',
colorLight: '#fff'
})
@@ -592,7 +678,7 @@
let qrCode = new QRCode('canvasWrapper2',{
width: 83,
height: 83,
- text: 'P9900200461#T'+this.headContent.sfcCode+' #V993983#SSW001.001#HHW001.001#NMCU',
+ text: 'P9900200461#T'+this.headContent.sfcCode+'#V993983#SSW001.001#HHW001.001#NMCU',
colorDark: '#000',
colorLight: '#fff'
})
@@ -625,6 +711,10 @@
this.printFlag = true
}
+ if(this.headContent.processesCode === 'OP250'){
+ this.printFlag = true
+ }
+
});
console.log('websocket杩炴帴宸ヤ綅涓�' + this.headContent.processesCode)
const wsuri = this.url + this.headContent.processesCode;
@@ -639,8 +729,11 @@
this.ws.onmessage = function (event) {
if (event.data === "print") {
document.getElementById('print').click();
+ unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 21}).then(response => {});
}else if (event.data === "IN") {
self.cakeLamp.InPlace = 1;
+ }else if(event.data === "twoHundredAndThirtyEND"){
+ self.endClear()
} else if (event.data === "OUT") {
self.cakeLamp.release = 1;
} else if (event.data === "END") {
@@ -678,7 +771,13 @@
} else if(event.data.includes("productNum")){//浜у搧搴忓垪鍙�
let productNum = event.data.split(',')[1];
- self.headContent.sfcCode = productNum;
+ if(self.headContent.processesCode === 'OP165'){
+ console.log("杩涘幓鎴彇鎬绘垚鐮佹柟娉�165宸ョ珯鍘熷鍊兼槸"+productNum+"鎴彇涔嬪悗鐨勬槸"+productNum.substring(13,26))
+ self.headContent.sfcCode = productNum.substring(13,26)
+ console.log("self.headContent.sfcCode"+self.headContent.sfcCode)
+ }else {
+ self.headContent.sfcCode = productNum;
+ }
self.queryParams.productNum = productNum;
self.getList()
self.cakeLamp.scanFinish = 1
@@ -697,7 +796,7 @@
if(self.headContent.processesCode === "OP165"){
// self.test1()
// self.test2()
- self.text = 'P9900166410#T'+self.headContent.sfcCode+'\n#V993983#SSW002.005#HHW001.001#NMCU#'
+ self.text = 'P9900200461#T'+self.headContent.sfcCode+'#V993983#SSW002.005#HHW001.001#NMCU#'
}
}else if (event.data.includes("[")) {//鎷х揣
--
Gitblit v1.9.3