From 25634da4364898507b40ac2c48f6d347510de0b1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 18 七月 2025 14:32:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 12 +++++++-----
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 3 +++
north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java | 2 ++
north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue | 1 +
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 7 ++++---
5 files changed, 17 insertions(+), 8 deletions(-)
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 04211fc..e2165b5 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -104,11 +104,12 @@
const handleGetQRCode = async () => {
let technologyNumber=''
for (let i = 0; i < produceList.value.length; i++) {
- if (produceList.value[i].detail[0].qrcode!="" && produceList.value[i].detail[0].qrcode!=null){
- technologyNumber = produceList.value[i].detail[0].qrcode.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃,鍚堝苟鏍囩
- }else {
+ console.log(produceList.value[i].detail[0])
+ // if (produceList.value[i].detail[0].qrcode!="" && produceList.value[i].detail[0].qrcode!=null){
+ // technologyNumber = produceList.value[i].detail[0].qrcode.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃,鍚堝苟鏍囩
+ // }else {
technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
- }
+ // }
produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
if (compound == null ){
const processId = produceList.value[i].detail[0].process_id;
@@ -306,7 +307,8 @@
<td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
<td colspan="2">{{ items.customer_name }}</td>
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
- <td colspan="4" style="min-width: 250px;">{{ items.project }}</td>
+ <td v-if="name=='娲涢槼鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�'" colspan="4" style="min-width: 250px;">{{ items.projectBatch }}</td>
+ <td v-else colspan="4" style="min-width: 250px;">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
<td :colspan="2+item.processList.length*2" style="width: 500px">{{ items.process }}</td>
</tr>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
index 9994944..b3f5bd3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
@@ -244,6 +244,7 @@
showOverflow: "ellipsis",
filters:[{ data: '' }],slots: { filter: 'num1_filter' }
},
+ {field: 'batch', width: 90, title: t('order.batch')},
{
field: 'processId', width: 130, title: t('processCard.processId'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }
},
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java
index 7e298b4..bc78e65 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java
@@ -13,6 +13,8 @@
private String orderId;
@ExcelProperty("椤圭洰鍚嶇О")
private String project;
+ @ExcelProperty("鎵规")
+ private String batch;
@ExcelProperty("娴佺▼鍗″彿")
private String processId;
@ExcelProperty("璁㈠崟搴忓彿")
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 5c454e3..bffeafc 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -619,7 +619,7 @@
left join sd.basic_data as bd on bd.nickname='stepC'
where ogds.order_id = #{orderId}
and LOCATE(bd.basic_name, ogds.process) > 0
- GROUP BY order_id, order_number, ogds.group) as ogdss
+ GROUP BY order_id, order_number, ogds.group,bd.basic_name LIMIT 1) as ogdss
on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
where fc.order_id = #{orderId}
GROUP BY fc.process_id, ogdss.technology_number
@@ -662,7 +662,7 @@
ogds.technology_number
left join sd.basic_data as bd on bd.nickname='stepD'
where ogds.order_id = #{orderId}
- GROUP BY order_id, order_number) as ogdss
+ GROUP BY order_id, order_number,bd.basic_name LIMIT 1) as ogdss
on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
where fc.order_id = #{orderId}
GROUP BY fc.process_id
@@ -670,7 +670,7 @@
where process is not null
and process != ""
GROUP BY order_id, process_id, technology_number, process
- order by order_id, process_id, length(technology_number)) as result
+ order by order_id, process_id, length(technology_number),technology_number) as result
LEFT JOIN (SELECT * from flow_card GROUP BY process_id,technology_number) as fcc
on result.process_id = fcc.process_id and result.technology_number = fcc.technology_number
</select>
@@ -2419,6 +2419,7 @@
<select id="getPrimaryListLimt">
select o.customer_name,
+ if(o.batch!="",CONCAT(o.project,'(',o.batch,')'),o.project) as projectBatch,
o.project,
#{process} process,
od.edging_type,
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 32964a0..7903e6c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -92,6 +92,7 @@
<result column="area" property="area"/>
<result column="breakage_quantity" property="breakageQuantity"/>
<result column="project" property="project"/>
+ <result column="batch" property="batch"/>
<result column="process_id" property="processId"/>
<result column="order_number" property="orderNumber"/>
<result column="technology_number" property="technologyNumber"/>
@@ -566,6 +567,7 @@
SELECT
o.order_id,
o.project,
+ o.batch,
rw.process_id,
dd.order_number,
dd.technology_number,
@@ -995,6 +997,7 @@
<select id="exportDamageReportMp">
SELECT o.order_id,
o.project,
+ o.batch,
rw.process_id,
dd.order_number,
dd.technology_number,
--
Gitblit v1.8.0