Browse Source

feature/EK-33291的改动

ryan 1 month ago
parent
commit
4d5c84c1fc
1 changed files with 10 additions and 3 deletions
  1. 10 3
      common/libs/export/BaseExport.php

+ 10 - 3
common/libs/export/BaseExport.php

@@ -1614,6 +1614,7 @@ ORDER;
             $mobile = $oderList[0]['MOBILE'];
             $orderAt = Date::convert($oderList[0]['CREATED_AT'],'d/m/Y');
             $orderDetails = '';
+            $orderDetails_bv = '';
             $orderSn = $oderList[0]['SN'];;
             $orderAmount = 0;  // 合计总额
             $orderNums = 0; // 合计总数
@@ -1683,6 +1684,12 @@ ORDER;
                     <td>{$taxableAmountFormat}</td>
                     <td>{$totalFormat}</td> 
                 </tr>
+EOT;
+                $orderDetails_bv .= <<<EOT
+                    <td>{$value['SKU_CODE']}</td>
+                    <td>{$value['BUY_NUMS']}</td>
+                    <td>{$unitBvFormat}</td>
+                    <td>{$totalBvFormat}</td>
 EOT;
             }
 
@@ -1889,14 +1896,14 @@ EOT;
                             <tr style="text-align: left; font-weight: normal; font-size: 12px; margin-top: 15px;">
                                 <td colspan="2">Remark:</td>
                                 <td colspan="5"></td>
-                                <td>Product ID</td>
+                                <td>Product Code</td>
                                 <td>Quantity</td>
                                 <td>Unit BV</td>
                                 <td>Total BV</td>
                             </tr>
                             <tr style="text-align: left; font-weight: normal; font-size: 12px;">
-                                <td colspan="7">{$invoiceRemark}</td>
-                                <td colspan="4"></td>
+                                <td colspan="6">{$invoiceRemark}</td>
+                                $orderDetails_bv
                             </tr>
                         </table>