From cbfb94ee3bbda9cf341d326f55bec2b2f294e321 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 20 九月 2024 08:59:57 +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          |    2 +-
 north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue |   12 ++----------
 north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue    |   12 ++----------
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml                  |    2 +-
 4 files changed, 6 insertions(+), 22 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 47a9656..8f61bba 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -212,7 +212,7 @@
           <div  style="font-weight: bolder;display: flex;justify-content:space-between">
             <div>鎵撳嵃浜猴細{{user.user.userName}}</div>
             <div>
-              {{itemFlow.otherRemarks}}&nbsp;&nbsp;
+              <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
               娴佺▼鍗″彿锛� {{
                 itemFlow.process_id
               }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
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 36074e5..e13f741 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -235,14 +235,10 @@
           <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">娴佺▼鍗″彿锛� {{
-              itemFlow.process_id
-            }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
-          </div>
           <div  style="font-weight: bolder;display: flex;justify-content:space-between">
             <div>鎵撳嵃浜猴細{{user.user.userName}}</div>
             <div>
-              {{itemFlow.otherRemarks}}&nbsp;&nbsp;
+              <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
               娴佺▼鍗″彿锛� {{
                 itemFlow.process_id
               }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
@@ -360,11 +356,7 @@
       <tr v-for="(itemtextarea,index) in item.detail" :key="index">
         <td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
           <div>
-            娆＄牬绫诲瀷锛歿{itemtextarea.breakage_type}}&nbsp;
-            娆＄牬鍘熷洜锛歿{itemtextarea.breakage_reason}}&nbsp;
-            璐ｄ换宸ュ簭锛歿{itemtextarea.responsible_process}}&nbsp;
-            璐ｄ换鐝粍锛歿{itemtextarea.responsible_team}}
-            <span v-if="itemtextarea.responsible_personnel!=null">璐ｄ换淇℃伅锛歿{itemtextarea.responsible_personnel}}</span>
+
           </div>
         </td>
 
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
index fd39ab0..05dcd79 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
@@ -198,14 +198,10 @@
           <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">娴佺▼鍗″彿锛� {{
-              itemFlow.process_id
-            }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
-          </div>
           <div  style="font-weight: bolder;display: flex;justify-content:space-between">
             <div>鎵撳嵃浜猴細{{user.user.userName}}</div>
             <div>
-              {{itemFlow.otherRemarks}}&nbsp;&nbsp;
+              <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
               娴佺▼鍗″彿锛� {{
                 itemFlow.process_id
               }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
@@ -323,11 +319,7 @@
       <tr v-for="(itemtextarea,index) in item.detail" :key="index">
         <td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
           <div>
-            娆＄牬绫诲瀷锛歿{itemtextarea.breakage_type}}&nbsp;
-            娆＄牬鍘熷洜锛歿{itemtextarea.breakage_reason}}&nbsp;
-            璐ｄ换宸ュ簭锛歿{itemtextarea.responsible_process}}&nbsp;
-            璐ｄ换鐝粍锛歿{itemtextarea.responsible_team}}
-            <span v-if="itemtextarea.responsible_personnel!=null">璐ｄ换淇℃伅锛歿{itemtextarea.responsible_personnel}}</span>
+
           </div>
         </td>
 
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 d9569b0..595fc66 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -471,7 +471,7 @@
         where create_time between #{selectTime1} and #{selectTime2}
           and position(#{orderId} in order_id)
           and position(#{project} in project)
-          and processing_card = 2
+          and processing_card >0
         order by create_time desc
     </select>
 

--
Gitblit v1.8.0