财务开票模块更新

server/app/Finance/Services/InvoiceService.php

@@ -118,7 +118,7 @@ class InvoiceService
         }
 
         //对发票项进行检查
-        if(!empty($invoiceParams['invoice_items'])){
+        /*if(!empty($invoiceParams['invoice_items'])){
             $itemIds = [];
             $invoiceItemsParams = [];
             foreach($invoiceParams['invoice_items'] as $item){
@@ -137,7 +137,7 @@ class InvoiceService
                     }
                 }
             }
-        }
+        }*/
 
         $invoiceNumber = 'I';
         $invoiceNumber .= $invoiceParams['invoice_platform'] == 'rhawn' ? 'R' : 'B';
@@ -187,16 +187,16 @@ class InvoiceService
 
         $applyInvoiceParams['detailParam'] = [];
         //开票明细列
-        foreach($invoiceItem as $item){
+        foreach($invoiceParams['invoice_items'] as $item){
             $applyInvoiceItems = [];
             $applyInvoiceItems['fphxz'] = 0;
             $applyInvoiceItems['hsbz'] = 1; //默认含税
-            $applyInvoiceItems['spmc'] = $invoiceParams['item_name'];
+            $applyInvoiceItems['spmc'] = $item['item_name'];
             $applyInvoiceItems['spbm'] = '1070214010000000000';//$item['p_code'];
-            $applyInvoiceItems['ggxh'] = $invoiceParams['item_spec'];
+            $applyInvoiceItems['ggxh'] = $item['item_spec'];
             $applyInvoiceItems['dw'] = 'EA';
-            $applyInvoiceItems['je'] = bcmul($invoiceItemsParams[$item['soid_id']]['item_price'],1,2);
-            $applyInvoiceItems['sl'] = $invoiceItemsParams[$item['soid_id']]['item_nums'];
+            $applyInvoiceItems['je'] = bcmul($item['item_price'],1,2);
+            $applyInvoiceItems['sl'] = $item['item_nums'];
             $applyInvoiceItems['dj'] = bcdiv($applyInvoiceItems['je'],$applyInvoiceItems['sl'],2);
             $applyInvoiceItems['se'] = '';
             $applyInvoiceItems['slv'] = bcdiv($platformInfo['tax_rate'],100,3);