From c069f2cce3c10a773e8c474c0031e316ffd8ad9e Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 十一月 2025 10:57:02 +0800
Subject: [PATCH] 打印流程卡新增北玻logo
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 2 +-
north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue | 2 +-
north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabel.vue | 38 +++++++++++++++++++++++++++-----------
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 2 +-
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue | 2 +-
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 10 +++++++++-
north-glass-erp/northglass-erp/src/components/pp/PrintConsolidatedReplenish.vue | 2 +-
7 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintConsolidatedReplenish.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintConsolidatedReplenish.vue
index 80c14f0..2e5942a 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintConsolidatedReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintConsolidatedReplenish.vue
@@ -302,7 +302,7 @@
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="34">
-
+ <div style="float: left;"><img id="img-pic" style="width: 42px;height: 32px" src="@/assets/northGlass.ico" alt=""></div>
<div id="bj" style="float: right;font-size: 28px">琛� {{ id + 1 }}</div>
<div style="left: 150px">{{ company.companyName }}</div>
<div>鐢熶骇娴佺▼鍗�</div>
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index e046032..11152f2 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -286,7 +286,7 @@
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="31">
- <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px "/></div>
+ <div style="float: left;"><img id="img-pic" style="width: 42px;height: 32px" src="@/assets/northGlass.ico" alt=""><input style="border: none;font-size: 28px;width: 70px;margin: 5px "/></div>
<div id="bj" v-if="printFc=='true'" style="float: right;font-size: 28px">{{ id + 1 }}</div>
<div id="bj" v-else style="float: right;font-size: 28px"></div>
<div>{{ company.companyName }}</div>
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
index 6b83914..b234f5b 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -278,7 +278,7 @@
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="34">
-
+ <div style="float: left;"><img id="img-pic" style="width: 42px;height: 32px" src="@/assets/northGlass.ico" alt=""></div>
<div id="bj" style="float: right;font-size: 28px">琛� {{ id + 1 }}</div>
<div style="left: 150px">{{ company.companyName }}</div>
<div>鐢熶骇娴佺▼鍗�</div>
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue
index 8da7166..f0d331a 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue
@@ -255,7 +255,7 @@
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="31">
- <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px "/></div>
+ <div style="float: left;"><img id="img-pic" style="width: 42px;height: 32px" src="@/assets/northGlass.ico" alt=""><input style="border: none;font-size: 28px;width: 70px;margin: 5px "/></div>
<div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
<div>{{ company.companyName }}</div>
<div>鐢熶骇娴佺▼鍗�<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span></div>
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabel.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabel.vue
index 637b8bf..7f834e7 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabel.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabel.vue
@@ -74,19 +74,35 @@
}
})
labelList = a
- for (let i = 0; i < list.value.length; i++) {
- let count = list.value[i].data.length
- for (let j = 0; j < count; j++) {
- if (detailType==0){
- for (let k = 0; k < list.value[i].data[j].quantity; k++) {
- props.lastList.push(list.value[i].data[j])
+ // 閬嶅巻鍒楄〃锛堟浛鎹� i 涓烘洿璇箟鍖栫殑鍙橀噺鍚嶏級
+ for (const group of list.value) {
+ // 閬嶅巻姣忕粍涓殑鏁版嵁锛堟浛鎹� j锛�
+ for (const item of group.data) {
+ const { quantity, newList } = item;
+ // 璺宠繃 quantity 涓� 0 鎴栨棤鏁堢殑鎯呭喌
+ if (!quantity || quantity <= 0) continue;
+
+ // 澶勭悊 newList锛氱‘淇濇槸鏁扮粍锛屼笉瓒虫椂鐢ㄧ┖瀵硅薄鍏滃簳
+ const safeNewList = Array.isArray(newList) ? newList : [];
+
+ // 寰幆 quantity 娆★紝娣诲姞鏁版嵁鍒� lastList
+ for (let k = 0; k < quantity; k++) {
+ // 娣辨嫹璐� item锛岄伩鍏嶉噸澶嶅紩鐢紙鍏抽敭锛侊級
+ const newItem = JSON.parse(JSON.stringify(item));
+
+ // 鑻� newList 鏈夊搴旂储寮曟暟鎹紝濉厖瀛楁锛涘惁鍒欑疆绌�
+ const listItem = safeNewList[k];
+ if (listItem) {
+ newItem.heat_layout_sort = listItem.glass_id || ''; // 鍏滃簳绌哄瓧绗︿覆
+ newItem.stockPolysId = `${listItem.stock_id || ''}/${listItem.polys_id || ''}`; // 閬垮厤 undefined/
+ } else {
+ // 鏃犲搴旀暟鎹椂锛屽瓧娈电疆绌猴紙閬垮厤淇濈暀鍘熷鍊硷級
+ newItem.heat_layout_sort = '';
+ newItem.stockPolysId = '';
}
- }
- else {
- for (let k = 0; k < list.value[i].data[j].quantity; k++) {
- props.lastList.push(list.value[i].data[j])
- }
+ // 娣诲姞鍒扮洰鏍囧垪琛�
+ props.lastList.push(newItem);
}
}
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index d668410..453bed3 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -172,7 +172,7 @@
List<Map<String, String>> selectPrintNotMergeMp(String orderId);
- List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+ List<Map<String, Object>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
List<Map<String, String>> getReworkPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index 0b4cf51..a0099f2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -288,7 +288,15 @@
}
else{//灏忕墖鏍囩
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber()));
+ List<Map<String,Object>> customDataSemi =flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber());
+ for (Map<String, Object> dataMap : customDataSemi) {
+ dataMap.put("newList", flowCardMapper.getgetPrintCustomDataSemiSp(
+ flowCard.getProcessId(),
+ dataMap.get("technologyNumber").toString(),
+ flowCard.getOrderNumber()
+ ));
+ }
+ itemmap.put("data", customDataSemi);
list.add(itemmap);
}
--
Gitblit v1.8.0