Merge branch 'dev-wgg' of wugg/cxinv into dev

app/admin/command/CheckInvoice.php

@@ -86,7 +86,11 @@ class CheckInvoice extends Command
                 }elseif (in_array($result['data']['cyjg'],['0002','1014'])){
                     $this->lastUpdate($invoice['id']);
                 }else $this->faild($invoice['id'],$result['data']['cyjgxx']);
-            }else $this->faild($invoice['id'],"验票失败");
+            }else {
+                if($result['code']=='0000' && $result['message']=='fail'){
+                   sleep(100);
+                }else$this->faild($invoice['id'],"验票失败");
+            }
         }catch (\Exception $e){
             Db::rollback();
            echo $e->getMessage();

app/admin/command/CheckTicket.php

@@ -81,11 +81,11 @@ class CheckTicket extends Command
                 $this->lastUpdate($info['invNo']);
             }else $this->faild($info['invNo'],$result['data']['cyjgxx']);
         }else $this->faild($info['invNo'],'验票失败');
+         Db::commit();
        }catch (\Exception $e){
             Db::rollback();
             echo $e->getMessage()."\r\n";
        }
-        Db::commit();
     }
     protected function changeFiled($data,$info){
         $item = $this->itemFiled($data['detailList']);

app/admin/controller/Export.php

@@ -122,7 +122,7 @@ class Export extends Base
 		          concat(b.buyer_bankNo," ") 发票买方企业财务账户,
 		          d.orderCode 公司订单号,
 		          b.buyer_title 订单企业客户,
-		          d.goodName 订单商品名,
+		          f.goodName 订单商品名,
 		          concat(g.inv_cat_code," ") 税收分类编码,
 		          g.inv_cat_name 税收分类名称,
 		          d.goodName 发票明细商品名称,
@@ -137,7 +137,10 @@ class Export extends Base
 		          a.exam_remark 申请备注,
 		          a.remark 发票备注,
 		          if(f.cxCode="",f.sequenceNo,f.cxCode) 销售主单号,
-		          f.goodPrice 商品单价')
+		          f.goodPrice 商品单价,
+		          f.ownerName 订单下单人,
+		          d.goodNo 商品编码,
+		          f.firstCat 商品一级分类')
 		          ->leftJoin('invoice_pool_info b', 'a.invNo=b.invNo')
 		          ->leftJoin('invoice_ticket c', 'a.invNo=c.invNo AND c.type=0 AND c.status=1 and c.is_del=0')
 		          ->leftJoin('invoice_good d', 'd.invNo=a.invNo and d.is_del=0')
@@ -276,6 +279,7 @@ class Export extends Base
                        d.platName 平台名称,
                        d.poCode 平台订单编号,
                        a.poCode 客户PO,
+                       e.palt_po 平台采购PO,
                        d.goodNo  商品SKU,
                        e.skuCode 泰e购SKU,
                        e.goodNo 商品唯一编号,

app/admin/model/InvoiceTicket.php

@@ -33,8 +33,8 @@ class InvoiceTicket extends Model
                                   'tax_amount'=>$item['SE'],
                                   'tax'=>$item['SL'],
                                   'cat_code'=>$item['SPBM'],
-                                  'total_amount'=>bcadd($item['amount'],$item['tax'],2),
-                                  'balance_amount'=>bcadd($item['amount'],$item['tax'],2),
+                                  'total_amount'=>bcadd($item['JE'],$item['SE'],2),
+                                  'balance_amount'=>bcadd($item['JE'],$item['SE'],2),
                               ];
                },$model['item']));
             }

app/common.php

@@ -454,11 +454,11 @@ function excelExport($fileName = '', $headArr = [], $data = [])
         $rows=is_array($rows)?$rows:$rows->toArray();
         foreach ($rows as $keyName => $value) { // 列写入
             //判断数据是否有数组，如果有数组，转换成字符串
-
             if(is_array($value)){
                 $value = implode("、", $value);
             }
-            $objActSheet->setCellValue(PHPExcel_Cell::stringFromColumnIndex($span) . $column, $value." ");
+            $objActSheet->getStyle(PHPExcel_Cell::stringFromColumnIndex($span) . $column)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_TEXT);
+            $objActSheet->setCellValue(PHPExcel_Cell::stringFromColumnIndex($span) . $column, $value);
             $span++;
         }
         $column++;