From 9f636f3476b661cf8d18edb69d0d75eea74e64ea Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期日, 04 八月 2024 14:16:42 +0800
Subject: [PATCH] -bug修改
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 218 +++++++++++++++++++++++++++++++++++++----------------
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 8 +-
2 files changed, 155 insertions(+), 71 deletions(-)
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 52af3ee..697af64 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
@@ -672,10 +672,10 @@
// String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
try{
daParamCollection.setWeightValue(getRandomNumberBetween(312.5, 313.5));
-// Object recordDataDone = miloService.readFromOpcUa("PACK" + "." + daParamCollection.getLocationCode() + ".MStepNumber").getValue();
-// if(ObjectUtil.isNotNull(recordDataDone)){
-// daParamCollection.setWeightValue(recordDataDone.toString());
-// }
+ Object recordDataDone = miloService.readFromOpcUa("PACK" + "." + daParamCollection.getLocationCode() + ".weight").getValue();
+ if(ObjectUtil.isNotNull(recordDataDone)){
+ daParamCollection.setWeightValue(recordDataDone.toString());
+ }
long timestampMillis = Instant.now().toEpochMilli();
ParentVO parentVO = new ParentVO();
ChildVO childVO = new ChildVO();
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 94f9903..b83c9ac 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -40,12 +40,6 @@
<el-descriptions-item label="灏忚溅鐮�">
<span>{{headContent.cardCode}}</span>
</el-descriptions-item>
-<!-- <el-descriptions-item label="浜у搧鍨嬪彿">-->
-<!-- <span>{{workpieceInformation.productModel}}</span>-->
-<!-- </el-descriptions-item>-->
-<!-- <el-descriptions-item label="浜у搧鍚嶇О">-->
-<!-- <span>{{workpieceInformation.productName}}</span>-->
-<!-- </el-descriptions-item>-->
<el-descriptions-item label="寮�濮嬫椂闂�">
<span>{{workpieceInformation.inboundTime}}</span>
</el-descriptions-item>
@@ -88,21 +82,52 @@
</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>
-<!-- <el-row v-show="showInput" style="margin-top: 20px">-->
-<!-- <el-button @click="bindYzSfc" type="primary">缁戝畾</el-button>-->
-<!-- </el-row>-->
-<!-- <el-row v-show="onLineBinDing" style="margin-top: 20px">-->
-<!-- <el-col></el-col>-->
-<!-- <span style="width: 130px;" class="head-font">灏忚溅鐮� : {{headContent.cardCode}}</span>-->
-<!-- </el-row>-->
-<!-- <el-row v-show="onLineBinDing" style="margin-top: 20px">-->
-<!-- <el-button @click="bindcardCode" type="primary">缁戝畾</el-button>-->
-<!-- </el-row>-->
+ <el-row v-show="goOnlineFlag" style="margin-top: 20px">
+ <el-button @click="getWorkOrders" type="primary">鎺ユ敹宸ュ崟</el-button>
+
+ <div style="display: none">
+ <div id="getWorkOrdersPrintPrintMe" style="width: 500px;">
+ <div ref="canvasWrapper" id="canvasWrapper3" style="display: flex;justify-content: center;"></div>
+ <p style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;">{{packCode}}</p>
+ </div>
+ <el-button @click="print">鎵撳嵃</el-button>
+ <el-button @click="test1">鐢熸垚浜岀淮鐮�</el-button>
+ </div>
+ </el-row>
+
+ <el-row v-show="offlineFlag" style="margin-top: 20px">
+ <el-button @click="print1" type="primary">鎵撳嵃涓夎仈鐮�</el-button>
+ <el-button style="display: none" @click="test1">鐢熸垚浜岀淮鐮�</el-button>
+ <el-button style="display: none" @click="test2">鐢熸垚浜岀淮鐮�</el-button>
+ <div>
+ <div style="display: none" id="printMe">
+ <br>
+ <p style="margin-left: 43px">{{printInfoData.partNumber}}</p>
+ <p style="margin-left: 43px">{{printInfoData.hardwareVersion}}</p>
+ <p style="margin-left: 43px">{{printInfoData.softwareVersion}}</p>
+ <br>
+ <br>
+ <!-- <span style="font-size: 30px;font-weight: bold;margin-left: 40px;">GEELY</span><br>-->
+ <img style="width: 140px;height: 20px;margin-left: 25px" :src="require('@/assets/images/a8963a24920640508e96150a053fc41.png')">
+ <span style="margin-left: 60px">{{printInfoData.printModel}}</span><br>
+ <span style="margin-left: 63px">{{printInfoData.supplierCode}}</span><br>
+ <span style="margin-left: 40px">{{printInfoData.partNumber}}</span><br>
+ <span style="font-size: 10px;margin-left: 17px;">{{headContent.sfcCode}}</span><br>
+ <span style="font-size: 10px;margin-left: 52px">MADE IN CHINA</span><br>
+ <br>
+ <br>
+ <br>
+ <div ref="canvasWrapper" id="canvasWrapper1" style="display: flex;justify-content: center;margin-top: -27px;"></div>
+ <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P{{printInfoData.partNumber}}#T{{headContent.sfcCode}}#V{{printInfoData.supplierCode}}#S{{printInfoData.softwareVersion}}#H{{printInfoData.hardwareVersion}}#NBMS#</span>
+ <!-- <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P{{printInfoData.partNumber}}#T{{text1}}#V{{printInfoData.supplierCode}}#S{{// printInfoData.softwareVersion}}#H{{printInfoData.hardwareVersion}}#NBMS#</span>-->
+ <br>
+ <br>
+ <div ref="canvasWrapper" id="canvasWrapper2" style="display: flex;justify-content: center;margin-top: -27px"></div>
+ <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P{{printInfoData.partNumber}}#T{{headContent.sfcCode}}#V{{printInfoData.supplierCode}}#S{{printInfoData.softwareVersion}}#H{{printInfoData.hardwareVersion}}#NBMS#</span>
+ <!-- <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P{{printInfoData.partNumber}}#T{{text1}}#V{{printInfoData.supplierCode}}#S{{// printInfoData.softwareVersion}}#H{{printInfoData.hardwareVersion}}#NBMS#</span>-->
+ </div>
+ </el-row>
</el-card>
</el-col>
@@ -112,16 +137,10 @@
<span slot="label"> <a class="el-icon-date"></a>棣栭〉</span>
<el-col :span="24">
<el-table height="500" :cell-style="rowStyle" :data="formulaChildList">
-<!-- <el-table-column label="鎺掑簭" width="60" align="center" type="index">-->
-<!-- </el-table-column>-->
<el-table-column label="鎷х揣姝ュ彿" width="80" align="center" prop="stepSort">
</el-table-column>
<el-table-column label="鎿嶄綔鍐呭" align="center" prop="operationSteps">
</el-table-column>
-<!-- <el-table-column label="涓婇檺" width="60" align="center" prop="spareField3">-->
-<!-- </el-table-column>-->
-<!-- <el-table-column label="涓嬮檺" width="60" align="center" prop="spareField4">-->
-<!-- </el-table-column>-->
<el-table-column label="浜у搧缂栧彿" width="80" align="center" prop="productCode">
</el-table-column>
<el-table-column label="鐗╂枡缂栫爜" width="140" align="center" prop="materialCode">
@@ -133,34 +152,7 @@
</el-table>
</el-col>
-<!-- <el-col :span="14">-->
-<!-- <el-image style="height: 520px;width: 100%" :src="imgSrc"></el-image>-->
-<!-- </el-col>-->
</el-tab-pane>
-<!-- <el-tab-pane name="second">-->
-<!-- <span slot="label"> <b class="el-icon-date"></b>鐗╂枡BOM</span>-->
-<!-- <el-empty>-->
-<!-- <span slot="description">鏆傛棤鏁版嵁</span>-->
-<!-- </el-empty>-->
-<!-- </el-tab-pane>-->
-<!-- <el-tab-pane name="third">-->
-<!-- <span slot="label"> <b class="el-icon-date"></b>閲囬泦娓呭崟</span>-->
-<!-- <el-empty>-->
-<!-- <span slot="description">鏆傛棤鏁版嵁</span>-->
-<!-- </el-empty>-->
-<!-- </el-tab-pane>-->
-<!-- <el-tab-pane name="fourth">-->
-<!-- <span slot="label"> <b class="el-icon-date"></b>瀹夌伅鐘舵��</span>-->
-<!-- <el-empty>-->
-<!-- <span slot="description">鏆傛棤鏁版嵁</span>-->
-<!-- </el-empty>-->
-<!-- </el-tab-pane>-->
-<!-- <el-tab-pane name="fifth">-->
-<!-- <span slot="label"> <b class="el-icon-date"></b>宸ヨ壓閰嶆柟</span>-->
-<!-- <el-empty>-->
-<!-- <span slot="description">鏆傛棤鏁版嵁</span>-->
-<!-- </el-empty>-->
-<!-- </el-tab-pane>-->
</el-tabs>
</el-col>
</el-row>
@@ -334,14 +326,23 @@
saveCampaignTimeParameters,
replaceAssemblyCode, checkRecordDataDone, enterWeighing,
} from "@/api/main/da/paramCollection/paramCollection";
+import QRCode from "qrcodejs2";
export default {
name: "stationTerminal",
data() {
return {
+ printInfoData: {
+ softwareVersion: 'SW001.001', //杞欢鐗堟湰鍙�
+ hardwareVersion: 'HW001.001', //纭欢鐗堟湰鍙�
+ printModel: 'H2155D', //鍨嬪彿
+ partNumber: '9900200136', //闆堕儴浠跺彿
+ supplierCode: '993983', //渚涘簲鍟嗙紪鐮�
+ },
carCode: '',
- showInput: false,
- onLineBinDing: false,
+ goOnlineFlag: false,
+ offlineFlag: false,
+
serialPortContent: '',
// 鏌ヨ鍙傛暟
@@ -426,6 +427,8 @@
originalArray: [],
yzSfcFlag: 1,
endYz: false,
+ packCode: 'test111',
+
}
},
beforeDestroy() {
@@ -462,6 +465,88 @@
},
},
methods: {
+
+ //鎺ユ敹宸ュ崟-------寮�濮�
+ getWorkOrdersPrint() {
+ let newStr = document.getElementById('getWorkOrdersPrintPrintMe').innerHTML;
+ const printFrame = document.createElement('iframe');
+ printFrame.style.display = 'none';
+ document.body.appendChild(printFrame);
+ const content = document.getElementById('getWorkOrdersPrintPrintMe').innerHTML;
+ printFrame.contentDocument.write(content);
+ printFrame.contentWindow.print();
+ document.body.removeChild(printFrame);
+ return false;
+ },
+ async getWorkOrders(){
+ await receivingWorkOrders().then(response => {
+ this.packCode = response.msg;
+ this.getWorkOrdersTest1()
+ });
+ setTimeout(() => {
+ this.getWorkOrdersPrint()
+ },50)
+ },
+ getWorkOrdersTest1(){
+ document.getElementById('canvasWrapper3').innerHTML = ''
+ this.$nextTick(() => {
+ let qrCode = new QRCode('canvasWrapper3',{
+ width: 80,
+ height: 80,
+ padding: 0,
+ margin: 0,
+ text: this.packCode,
+ colorDark: '#000',
+ colorLight: '#fff'
+ })
+ })
+ },
+ //鎺ユ敹宸ュ崟-------缁撴潫
+
+ //涓嬬嚎鎵撳嵃-------寮�濮�
+ test1(){
+ document.getElementById('canvasWrapper1').innerHTML = '';
+ this.$nextTick(() => {
+ let qrCode = new QRCode('canvasWrapper1',{
+ width: 120,
+ height: 120,
+ text: 'P'+this.printInfoData.partNumber+'#T'+ this.headContent.sfcCode +'#V'+this.printInfoData.supplierCode+'#S'+this.printInfoData.softwareVersion+'#H'+this.printInfoData.hardwareVersion+'#NBMS#',
+ colorDark: '#000',
+ colorLight: '#fff'
+ })
+ }
+ )
+ },
+ test2(){
+ document.getElementById('canvasWrapper2').innerHTML = '';
+ this.$nextTick(() => {
+ let qrCode = new QRCode('canvasWrapper2',{
+ width: 120,
+ height: 120,
+ text: 'P'+this.printInfoData.partNumber+'#T'+ this.headContent.sfcCode +'#V'+this.printInfoData.supplierCode+'#S'+this.printInfoData.softwareVersion+'#H'+this.printInfoData.hardwareVersion+'#NBMS#',
+ colorDark: '#000',
+ colorLight: '#fff'
+ })
+ }
+ )
+ },
+ print1() {
+ if(this.headContent.sfcCode!==''&&this.headContent.sfcCode!==null){
+ // 鏂板紑椤甸潰鎵撳嵃
+ let newStr = document.getElementById('printMe').innerHTML;
+ const printFrame = document.createElement('iframe');
+ printFrame.style.display = 'none';
+ document.body.appendChild(printFrame);
+ const content = document.getElementById('printMe').innerHTML;
+ printFrame.contentDocument.write(content);
+ printFrame.contentWindow.print();
+ document.body.removeChild(printFrame);
+ return false;
+ }else {
+ this.$message.error('鏈壂鎻忔�绘垚鐮佺姝㈡墦鍗帮紒');
+ }
+ },
+ //涓嬬嚎鎵撳嵃-------鎴
bindcardCode(scanValue){
// this.$message('缁戝畾鎴愬姛锛�');
let param = {
@@ -618,6 +703,10 @@
this.headContent.cardCode = rowsData.trolleyYard;
this.formulaChildParams.artificialNgFlag = rowsData.artificialNgFlag;
});
+ if(this.headContent.processesCode === 'POP430'){
+ this.test1()
+ this.test2()
+ }
this.getListFormulaChild()
// this.addOverStationCollection()
this.workpieceInformation.inboundTime = this.getCurrentTime()
@@ -695,6 +784,13 @@
this.cakeLamp.InPlace = response.data
});
+ if(this.headContent.processesCode === 'POP230'){
+ this.goOnlineFlag = true
+ }
+ if(this.headContent.processesCode === 'POP430'){
+ this.offlineFlag = true
+ }
+
});
this.conCom()
console.log('websocket杩炴帴宸ヤ綅涓�' + this.headContent.processesCode)
@@ -750,14 +846,6 @@
inboundTime: self.workpieceInformation.inboundTime,
formulaChildEntity: self.formulaChildList[formulaChildIndex]
}
-
- // if(param.locationCode === 'POP430'){
- // let enterWeighingparam = {
- // sfcCode: param.productBarcode,
- // }
- // enterWeighing(enterWeighingparam).then(response => {
- // });
- // }
console.log("杩涘叆鏈�缁堟柟娉�")
self.endSaveData(param)
@@ -840,10 +928,6 @@
console.log("sfc=--"+this.headContent.sfcCode+"--")
if(this.headContent.sfcCode !== '' && this.headContent.sfcCode !== null
&& this.headContent.sfcCode !== undefined){
- // if(scanValue.includes("P9900173252")){
- // this.headContent.yzSfcCode = scanValue
- // this.bindYzSfc();
- // }else
if(scanValue.includes("0RSP1TE") && this.headContent.processesCode === 'POP230'){
this.headContent.cardCode = scanValue
this.bindcardCode(scanValue);
--
Gitblit v1.9.3