From 48513bfc8f9f30cf6133f09a9cadf373ef3eddb0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 18 七月 2025 15:28:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml          |    2 +-
 north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue |   12 ++++++------
 north-glass-erp/src/main/resources/mapper/pp/Report.xml                      |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue b/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
index e7f266d..b4ed4ea 100644
--- a/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
+++ b/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
@@ -149,12 +149,12 @@
 
 <template>
   <div >
-    <div :class="'div_'+n " style="width: 46%;position: relative;" v-for="n in 2" >
+    <div :class="'div_'+n " style="width: 46%;position: relative;margin-top: 20px" v-for="n in 2" >
         <table v-for="page in orderDetailList" :key="page" style="width: 100%">
           <thead>
           <tr>
             <td colspan="1" style="text-align: center;font-weight: bolder;">
-              <div style="width: 60px;height: 60px">
+              <div style="width: 35px;height: 35px">
                 <img id="img-pic" style="width:100%;height: 100%" src="@/assets/northGlass.ico" alt="">
               </div>
             </td>
@@ -178,7 +178,7 @@
             <td colspan="5">
               <div style="display:flex;">
                 <div style="width: 100%"><span style="font-weight: bold;">瀹㈡埛鍚嶇О</span>锛�
-                  <input class="contactNumber" style="width: 60%;font-size: 12px" type="text"
+                  <input class="contactNumber" style="width: 85%;font-size: 12px" type="text"
                          v-model="customer.customer_name" />
                 </div>
               </div>
@@ -219,7 +219,7 @@
           <tbody>
           <template v-for="(row,index) in page" :key="row">
             <tr v-if="row.type==='product'" style="width: 100%;height: 100px" >
-              <td colspan="1" style="font-weight: bold;font-size: 13px">鍔犲伐鍝佺:</td>
+              <td colspan="1" style="font-weight: bold;font-size: 11px">鍔犲伐鍝佺:</td>
               <td colspan="4">
                 <textarea style="resize: none;width: 100%;height: 100px;border: 0" class="textarea" type="textarea" v-model="row.productName" /></td>
             </tr>
@@ -317,12 +317,12 @@
   }
   #footsum{
     position: fixed;
-    bottom: 2cm;
+    bottom: 1.5cm;
     width: 100%; /* 鎴栬�呰缃垚鍏蜂綋鐨勫搴� */
   }
   #sticky-footer {
     position: fixed;
-    bottom: 1cm;
+    bottom: 0.5cm;
     width: 100%; /* 鎴栬�呰缃垚鍏蜂綋鐨勫搴� */
   }
 /*    thead{
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 6324c01..4fd0c76 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -926,7 +926,7 @@
 
     <select id="getDetailLists">
         SELECT
-            ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'')) as building_number,
+            ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')) as building_number,
             od.width,
             od.height,
             fol.quantity,
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 7903e6c..df58f7d 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -596,7 +596,7 @@
         rw.reporting_work_time >= #{selectTime1}
         AND rw.reporting_work_time &lt;  #{selectTime2}
 
-        AND dd.available = 0
+        AND dd.available = 0 and rw.reviewed_state>=0
         <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
             and o.order_id regexp #{damageReportDTO.orderId}
         </if>
@@ -1021,7 +1021,7 @@
             AND dd.technology_number = ogd.technology_number
         WHERE rw.reporting_work_time >= #{dates[0]}
           and rw.reporting_work_time &lt;= #{dates[1]}
-          AND dd.available = 0
+          AND dd.available = 0 and rw.reviewed_state>=0
         GROUP BY dd.id
     </select>
 

--
Gitblit v1.8.0