From dd9383914ca8d446518ad5bf6faf5a6806bb7c7c Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 14 九月 2024 19:06:55 +0800
Subject: [PATCH] 打印功能修改
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 24 +++++++++++++++++-------
1 files changed, 17 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 1f80b90..25cf3f2 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -172,7 +172,7 @@
</div>
<div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 29px">
<span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
- P9900166410#T{{headContent.sfcCode}}
+ P9900200461#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
@@ -187,7 +187,7 @@
</div>
<div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 29px">
<span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
- P9900166410#T{{headContent.sfcCode}}
+ P9900200461#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
@@ -266,7 +266,7 @@
bindYzSfcFlag,
checkCarCode, checkYzSfcCode,
findBytrolleyYardGetOne,
- listProductionOrde, mozuReceivingWorkOrders,
+ listProductionOrde, listProductionOrdeLoopLine, mozuReceivingWorkOrders,
receivingWorkOrders,
trolleyYardBinDing
} from "@/api/main/om/productionOrde/productionOrde";
@@ -344,7 +344,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: {},
@@ -388,7 +388,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 +518,17 @@
},
/** 鏌ヨ宸ュ崟鍒楄〃 */
async getList() {
- await listProductionOrde(this.queryParams).then(response => {
+ await listProductionOrdeLoopLine(this.queryParams).then(response => {
let rowsData = response.rows[0];
if(rowsData){
+ 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.sfcCode = rowsData.productNum
+ }
this.workpieceInformation.workOrderNo = rowsData.workOrderNo;
this.workpieceInformation.productCode = rowsData.productCode;
this.workpieceInformation.materialCode = rowsData.materialCode;
@@ -680,7 +688,9 @@
} else if(event.data.includes("productNum")){//浜у搧搴忓垪鍙�
let productNum = event.data.split(',')[1];
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;
}
@@ -702,7 +712,7 @@
if(self.headContent.processesCode === "OP165"){
// self.test1()
// self.test2()
- self.text = 'P9900166410#T'+self.headContent.sfcCode+' #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