From 918c870a2bc093f22b6e80e7ed447aba0b161f4a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 08 八月 2024 14:28:57 +0800
Subject: [PATCH] 修改打印数据格式，下面界面实现打印功能
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 79 +++++++++++++++
UI-Project/src/views/UnLoadGlass/Landingindication.vue | 1
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java | 6
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java | 6
UI-Project/src/views/UnLoadGlass/PrintFlow.vue | 161 ++++++++++++++++++++++++++++---
6 files changed, 227 insertions(+), 28 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindication.vue b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
index 06aa4d0..fcfa8e7 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindication.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
@@ -123,7 +123,6 @@
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
-
data.glassinfo[0].forEach((itemData, index) => {
if (index < racks.value.length) {
const rack = racks.value[index];
diff --git a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
index 4c1358e..7188fdb 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
@@ -10,21 +10,141 @@
import { ref, onMounted , onBeforeUnmount, reactive, computed,onUnmounted } from "vue";
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { ElMessage, ElMessageBox } from 'element-plus'
+import companyInfo from "@/lang/companyInfo";
+import QRCode from "qrcode";
+
+const company = companyInfo()
+const printMerge = null
+let props = defineProps({
+ printFlowCardId: null,
+ printLayer: null,
+})
let produceList = ref([])
-let flowCardList = ref([])
+const handleGetQRCode = async () => {
+ for (let i = 0; i < produceList.value.length; i++) {
+ const technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
-const searchout = async () => {
+ for (let j = 0; j < technologyNumber.length; j++) {
+ const processId = produceList.value[i].detail[0].process_id;
+ const url = `${processId}/${technologyNumber[j]}`;
+
+ // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
+ const qrcodeData = await QRCode.toDataURL(url);
+ produceList.value[i].detail[0]["qrcodeList"].push({
+ qrcode: qrcodeData,
+ technologyNumber: technologyNumber[j]
+ });
+
+ }
+ }
+};
+
+
+//鏍规嵁杈撳叆鐨勬暟閲忛噸鏂版眹鎬�
+const handleSummary = () => {
+ for (let i = 0; i < produceList.value.length; i++) {
+ //鏁伴噺
+ let totalQuantity = 0;
+ //闈㈢Н
+ let totalArea = 0;
+ //閲嶉噺
+ let totalWeight = 0;
+ // 瀵规瘡涓泦鍚堜腑鐨� detailList 杩涜璁＄畻
+ produceList.value[i].detailList.forEach(collection => {
+ totalQuantity += collection.quantity * 1;
+ //姣忎釜搴忓彿闈㈢Н
+ collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
+ totalArea += collection.total_area * 1;
+ totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
+ //姣忎釜搴忓彿鍛ㄩ暱
+ collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
+ });
+ // 杈撳嚭姣忎釜闆嗗悎涓殑鎬绘暟閲�
+ produceList.value[i].detail[0].quantity = totalQuantity
+ produceList.value[i].detail[0].gross_area = totalArea
+ produceList.value[i].detail[0].weight = totalWeight
+ }
+}
+
+
+const printFlowCard = () => {
+ // 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
+ let el = document.getElementById("printFlowCard");
+ let doc = document;
+ let body = doc.body || doc.getElementsByTagName("body")[0];
+ let printId = "print-" + Date.now();
+
+ // 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
+ let content = doc.createElement("div");
+ content.id = printId;
+
+ // 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
+ let style = doc.createElement("style");
+ style.innerHTML =
+ "body>#" +
+ printId +
+ "{display:none}@media print{" +
+ "@page {" +
+ " size: auto; " +
+ " margin: 0mm 0mm 0mm 0mm; " +
+ " }body>:not(#" +
+ printId +
+ "){display:none !important}body>#" +
+ printId +
+ "{display:block;padding-top:1px}}";
+ //
+ content.innerHTML = el.outerHTML;
+ // // console.log("el.outerHTML", el.outerHTML);
+ body.appendChild(style);
+
+ // 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
+ // 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
+ body.appendChild(content);
+ setTimeout(() => {
+ window.print();
+ body.removeChild(content);
+ body.removeChild(style);
+ }, 20);
+}
+
+onMounted(async () => {
+
try {
const response = await request.post('/unLoadGlass/downGlassInfo/downGlassPrint',{
- flowCardId:"NG24070506A001",
- layer:1
+ flowCardId:props.printFlowCardId,
+ layer:props.printLayer
});
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
- produceList.value = response.data.projectInfo;
- flowCardList.value = response.data.flowCardList;
+ produceList.value = response.data;
+ console.log(produceList.value);
ElMessage.success(response.message);
+ for (let j = 0; j < produceList.value.length; j++) {
+ let sumWeight = 0
+ produceList.value[j].detailList.forEach((item, index) => {
+ // 瑙ｆ瀽 separation 瀛楁鐨� JSON 瀛楃涓�
+ let separationObj = JSON.parse(item.separation);
+
+ // 鑾峰彇 thickness 鐨勫師濮嬪��
+ let thicknessValue = separationObj.thickness;
+
+ // 鍘婚櫎 'mm' 鍗曚綅
+ let thicknessWithoutUnit = thicknessValue.replace('mm', '');
+
+ item.separation = thicknessWithoutUnit
+
+ sumWeight += item.width * item.height * item.quantity / 1000000 * item.separation * 2.5 * 1;
+
+ });
+ produceList.value[j].detail[0].weight = sumWeight
+ }
+ handleGetQRCode()
+ handleSummary()
+ // printFlowCard();
+
+
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
@@ -34,7 +154,7 @@
// 澶勭悊閿欒
console.error(error);
}
-};
+});
</script>
<template>
<div id="printFlowCard">
@@ -46,13 +166,13 @@
<div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
<div>{{ company.companyName }}</div>
<div>鐢熶骇娴佺▼鍗�</div>
- <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ <div v-if="itemFlow.technologyNumber!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
- }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
+ }}/{{ itemFlow.technologyNumber }}
</div>
<div v-else style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
- }}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
+ }}/{{ itemFlow.technologyNumber }}
</div>
</td>
<td v-else colspan="24">
@@ -60,9 +180,9 @@
<div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
<div>{{ company.companyName }}</div>
<div>鐢熶骇娴佺▼鍗�</div>
- <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ <div v-if="itemFlow.technologyNumber!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
- }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
+ }}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
</div>
<div v-else style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
itemFlow.process_id
@@ -90,11 +210,11 @@
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
- <td rowspan='2'>缂栧彿</td>
<td v-if="like!=null" rowspan="2">灏忕墖椤哄簭</td>
<td v-else style="display: none;" rowspan="2">灏忕墖椤哄簭</td>
<td rowspan='2'>瀹�*楂�</td>
<td rowspan='2'>鏁伴噺</td>
+ <td rowspan='2'>钀芥灦鏁�</td>
<td rowspan='2'>闈㈢Н</td>
<td rowspan='2'>鍛ㄩ暱</td>
<td rowspan='2'>鍗婂緞</td>
@@ -125,12 +245,17 @@
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
- <td>{{ itemDatile.s01Value }}</td>
+ <!-- <td>{{ itemDatile.s01Value }}</td> -->
<td v-if="like=='1'">{{ itemDatile.technology_number }}</td>
<td v-else style="display: none"></td>
<td>{{ itemDatile.child_width }}</td>
<td class="item" style="width: 5%;height: 100%;">
- <el-input v-model="itemDatile.quantity" style="border: none" @keyup="handleSummary()"></el-input>
+ <!-- <el-input v-model="itemDatile.quantity" style="border: none" @keyup="handleSummary()"></el-input> -->
+ {{ itemDatile.quantity }}
+ </td>
+ <td class="item" style="width: 5%;height: 100%;">
+ <!-- <el-input v-model="itemDatile.quantity" style="border: none" @keyup="handleSummary()"></el-input> -->
+ {{ itemDatile.quantity1 }}
</td>
<td>{{ itemDatile.total_area }}</td>
<td>{{ itemDatile.perimeter }}</td>
@@ -176,7 +301,7 @@
<div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{itemtextarea.otherRemarks}}</textarea>
</div>
</td>
- <td>瀹屽伐绛惧悕</td>
+ <td colspan="2">瀹屽伐绛惧悕</td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -189,7 +314,7 @@
<td colspan="2"></td>
</tr>
<tr>
- <td>鐢熶骇鏃ユ湡</td>
+ <td colspan="2">鐢熶骇鏃ユ湡</td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -202,7 +327,7 @@
<td colspan="2"></td>
</tr>
<tr>
- <td>璐ㄦ绛惧悕</td>
+ <td colspan="2">璐ㄦ绛惧悕</td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index a6b9c45..6f7522a 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -13,6 +13,7 @@
import request from "@/utils/request";
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { WebSocketHost, host } from '@/utils/constants'
+import PrintFlow from './PrintFlow.vue'
const dialogFormVisiblea = ref(false)
const dialogFormVisiblea2 = ref(false)
const dialogFormVisibleaDownGlass = ref(false)
@@ -30,6 +31,9 @@
const timeRange = ref(["2022-01-01", "2025-01-01"])
const selectValuesa = reactive({});
const selectOptionsa = ref([]);
+const dialogTableVisible = ref(false)
+const printFlowCardId = ref('')
+const printLayer=ref('')
const handleInputChangea = (value, rowId) => {
// 鏇存柊瀵瑰簲琛岀殑 select 鍊�
@@ -230,8 +234,55 @@
}
-const open=async()=>{
- router.push({path: '/UnLoadGlass/PrintFlow'})
+const open=async(row)=>{
+
+ printFlowCardId.value=row.flowCardId;
+ printLayer.value=row.layer
+ dialogTableVisible.value = true;
+ setTimeout(() => {
+ printFlowCard(); // 鏇挎崲鎴愪綘瑕佹墽琛岀殑鍑芥暟鍚�
+ }, 1000);
+ ;
+}
+
+const printFlowCard = () => {
+ // 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
+ let el = document.getElementById("child");
+ let doc = document;
+ let body = doc.body || doc.getElementsByTagName("body")[0];
+ let printId = "print-" + Date.now();
+
+ // 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
+ let content = doc.createElement("div");
+ content.id = printId;
+
+ // 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
+ let style = doc.createElement("style");
+ style.innerHTML =
+ "body>#" +
+ printId +
+ "{display:none}@media print{" +
+ "@page {" +
+ " size: auto; " +
+ " margin: 2mm 2mm 0mm 1mm; " +
+ " }body>:not(#" +
+ printId +
+ "){display:none !important}body>#" +
+ printId +
+ "{display:block;padding-top:1px}}";
+ //
+ content.innerHTML = el.outerHTML;
+ // // console.log("el.outerHTML", el.outerHTML);
+ body.appendChild(style);
+
+ // 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
+ // 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
+ body.appendChild(content);
+ setTimeout(() => {
+ window.print();
+ body.removeChild(content);
+ body.removeChild(style);
+ }, 20);
}
@@ -273,7 +324,7 @@
@click="handleBindRack(scope.row)">{{ $t('reportWork.bindingshelves') }}</el-button>
<el-button size="mini" type="text" plain @click="handleBindRack2(scope.row)">{{ $t('reportWork.clear')
}}</el-button>
- <el-button @click="open()">111</el-button>
+ <el-button @click="open(scope.row)" :disabled="scope.row.flowCardId==null">鎵撳嵃</el-button>
</template>
</el-table-column>
@@ -377,6 +428,22 @@
</div>
</template>
</el-dialog>
+
+ <el-dialog
+ id="sizePrintCalrd"
+ v-model="dialogTableVisible"
+ destroy-on-close
+ style="width: 75%;height:75% ">
+ <!-- <template #header="{ close, titleId, titleClass }">
+ <el-button @click="printFlowCard" >鎵撳嵃</el-button>
+ </template> -->
+ <print-flow
+ id="child"
+ :printFlowCardId="printFlowCardId"
+ :printLayer="printLayer"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
+
</template>
<style scoped>
#dt {
@@ -421,4 +488,10 @@
margin-top: -40px;
margin-left: 100px;
}
+
+:deep(#sizePrintCalrd .el-dialog__body) {
+ height: 85%;
+ width: 100%;
+ overflow-y: auto;
+}
</style>
\ No newline at end of file
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
index 006c8f9..a323a39 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
@@ -31,7 +31,7 @@
// 3銆佹暟鎹簮閰嶇疆
DataSourceConfig dsc = new DataSourceConfig();
- dsc.setUrl("jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8");
+ dsc.setUrl("jdbc:mysql://localhost:3306/pp?serverTimezone=GMT%2b8");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
dsc.setUsername("root");
dsc.setPassword("beibo.123/");
@@ -41,7 +41,7 @@
// 4銆佸寘閰嶇疆
PackageConfig pc = new PackageConfig();
pc.setParent("com.mes");
- pc.setModuleName("work_assignment"); //妯″潡鍚�
+ pc.setModuleName("flow_card"); //妯″潡鍚�
pc.setController("controller");
pc.setService("service");
pc.setMapper("mapper");
@@ -50,7 +50,7 @@
// 5銆佺瓥鐣ラ厤缃�
StrategyConfig strategy = new StrategyConfig();
- strategy.setInclude("work_assignment");
+ strategy.setInclude("flow_card");
strategy.setNaming(NamingStrategy.underline_to_camel);//鏁版嵁搴撹〃鏄犲皠鍒板疄浣撶殑鍛藉悕绛栫暐
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java
index 846a3e8..7bee99b 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java
@@ -45,5 +45,5 @@
String setDownGlassInfoRequest(DownGlassInfoRequest request);
- Map<String, List<Map<String, Object>>> downGlassPrint(DownGlassInfo downGlassInfo);
+ List<Map<String, List<Map<String, Object>>>> downGlassPrint(DownGlassInfo downGlassInfo);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
index b09fcf6..909c76a 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
@@ -109,7 +109,7 @@
}
@Override
- public Map<String, List<Map<String, Object>>> downGlassPrint(DownGlassInfo downGlassInfo){
+ public List<Map<String, List<Map<String, Object>>>> downGlassPrint(DownGlassInfo downGlassInfo){
QueryWrapper<DownGlassInfo> queryWrapper = Wrappers.query();
queryWrapper.eq("flow_card_id", "NG24080012A001")
.eq("layer", 1)
@@ -135,6 +135,7 @@
}
}
}
+ List<Map<String, List<Map<String, Object>>>> listMap=new ArrayList<>();
Map<String, List<Map<String, Object>>> result = new HashMap<>();
result.put("detail", projectInfo);
result.put("detailList", flowCardInfo);
@@ -150,7 +151,8 @@
}
result.put("processList", processList);
}
- return result;
+ listMap.add(result);
+ return listMap;
}
}
--
Gitblit v1.8.0