From f4a504f7fc66d8db27707ea198bd3561ba821e52 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 24 二月 2025 13:33:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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 592201c..5f5b30a 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue
@@ -266,7 +266,7 @@
               鏃堕棿锛歿{formattedTime}}
               &nbsp;&nbsp;
             </div>
-            <div>{{itemFlow.rack}}
+            <div><span v-if="item.detailList[0].merge===1">鍚�</span>{{itemFlow.rack}}
               娴佺▼鍗″彿锛� {{
                 itemFlow.process_id
               }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�

--
Gitblit v1.8.0