Merge remote-tracking branch 'origin/master'

app/Exports/ExportOrder.php

@@ -0,0 +1,116 @@
+<?php
+
+namespace App\Exports;
+
+
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Redis;
+use Maatwebsite\Excel\Concerns\FromCollection;
+
+use Maatwebsite\Excel\Concerns\WithCustomValueBinder;
+use Maatwebsite\Excel\Concerns\WithEvents;     // 自动注册事件监听器
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithStrictNullComparison;    // 导出 0 原样显示，不为 null
+use Maatwebsite\Excel\Events\AfterSheet;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Cell\DefaultValueBinder;
+
+
+class ExportOrder extends DefaultValueBinder implements WithCustomValueBinder , FromCollection, WithEvents, WithStrictNullComparison,withHeadings
+{
+
+    /**
+     * @return \Illuminate\Support\Collection
+     */
+    public function __construct($data,$type=1,$headers)
+    {
+        $this->data = $data;
+        $this->type = $type;
+        $this->headers = $headers;
+    }
+
+    public function registerEvents(): array
+    {
+        //区分不通状态的合同导出，格式不同
+            $type = $this->type.'_set';
+            return $this->$type();
+    }
+
+    //数组转集合
+    public function collection()
+    {
+        return new Collection($this->createData());
+    }
+    //业务代码
+    public function createData()
+    {
+        $name = $this->type;
+        $data = $this->export();
+        return $data;
+
+    }
+
+    public function bindValue(Cell $cell, $value)
+    {
+        if (is_numeric($value)) {
+            $cell->setValueExplicit($value, DataType::TYPE_STRING2);
+
+            return true;
+        }
+
+        // else return default behavior
+        return parent::bindValue($cell, $value);
+    }
+
+    // 自定义表头，需实现withHeadings接口
+    public function headings(): array
+    {
+        return $this->headers;
+    }
+
+    private function export(){
+        $list = [];
+//        dump($this->data);die;
+        foreach ($this->data as $v){
+            $list[] = $v;
+        }
+        return $list;
+    }
+
+    private function default_set(){
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                $count = count($this->data);
+
+                //设置区域单元格水平居中
+                $event->sheet->getDelegate()->getStyle('A1:'.'M'.($count+1))->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // 定义列宽度
+                $widths = ['A' => 20, 'B' => 20, 'C' => 20, 'D' => 20, 'E' => 20, 'F' => 20, 'G' => 20, 'H' => 20, 'I' => 20, 'J' => 20, 'K' => 20, 'L' => 20, 'M' => 20, 'O' => 20, 'P' => 20, 'Q' => 20, 'R' => 20, 'S' => 20, 'T' => 20, 'U' => 20, 'V' => 20, 'W' => 20, 'X' => 20, 'Y' => 20, 'Z' => 20];
+                foreach ($widths as $k => $v) {
+                    // 设置列宽度
+                    $event->sheet->getDelegate()->getColumnDimension($k)->setWidth($v);
+                }
+            },
+        ];
+    }
+
+    private function salary_set(){
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                $count = count($this->data);
+
+                //设置区域单元格水平居中
+                $event->sheet->getDelegate()->getStyle('A1:'.'M'.($count+1))->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // 定义列宽度
+                $widths = ['A' => 20, 'B' => 20, 'C' => 20, 'D' => 20, 'E' => 20, 'F' => 35, 'G' => 25, 'H' => 25, 'I' => 25, 'J' => 25, 'K' => 25, 'L' => 25, 'M' => 25];
+                foreach ($widths as $k => $v) {
+                    // 设置列宽度
+                    $event->sheet->getDelegate()->getColumnDimension($k)->setWidth($v);
+                }
+            },
+        ];
+    }
+}

app/Http/Controllers/Api/ExportFileController.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Service\ExportFileService;
+use Illuminate\Http\Request;
+
+class ExportFileController extends BaseController
+{
+    public function exportFile(Request $request)
+    {
+        $service = new ExportFileService();
+        $userData = $request->userData->toArray();
+        list($status,$data) = $service->exportAll($request->all(),$userData);
+
+        if($status){
+            return $this->json_return(200,'',['file'=>$data]);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+}

app/Model/PaymentReceiptInfo.php

@@ -12,9 +12,11 @@ class PaymentReceiptInfo extends Model
     protected $dateFormat = 'U';
     const type_one = 1; // 文件/图片
     const type_two = 2; // 归属人
+    const type_three = 3; // 回款信息
     public static $type = [
         self::type_one,
         self::type_two,
+        self::type_three,
     ];
     public static $man = [
         self::type_two,

app/Service/ConstructionService.php

@@ -543,6 +543,7 @@ class ConstructionService extends Service
         }
         if(! empty($data['install_method'])) $model->where('install_method',$data['install_method']);
         if(! empty($data['install_position'])) $model->where('install_position',$data['install_position']);
+        if(! empty($data['order_number'])) $model->where('order_number', 'LIKE', '%'.$data['order_number'].'%');
 
         $list = $this->limit($model,'',$data);
         $list = $this->fillData($list);
@@ -722,9 +723,9 @@ class ConstructionService extends Service
             $data['data'][$key]['customer_contact_title'] = $emp[$value['customer_contact_id']] ?? '';
             $data['data'][$key]['state_title'] = Construction::$name[$value['state']] ?? '';
             $tmp_sales = $sales_map[$value['sales_order_id']] ?? [];
-            $tmp_sales_time = $tmp_sales['handover_time'] ? date("Y-m-d") : "";
+//            $tmp_sales_time = $tmp_sales['handover_time'] ? date("Y-m-d") : "";
             $data['data'][$key]['sales_order_number'] = $tmp_sales['order_number'];
-            $data['data'][$key]['handover_time'] = $tmp_sales_time;
+            $data['data'][$key]['handover_time'] = $value['handover_time'] ? date("Y-m-d") : "";
             $data['data'][$key]['storehouse_title'] = $storehouse[$value['storehouse_id']] ?? '';
             $data['data'][$key]['dispatch_company'] = $dispatch[$value['sales_order_id']] ?? '';
             $data['data'][$key]['pq_state_title'] = Construction::$pq_name[$value['pq_state']] ?? '';

app/Service/ExportFileService.php

@@ -0,0 +1,587 @@
+<?php
+
+namespace App\Service;
+
+
+use App\Exports\ExportOrder;
+use App\Exports\MyExport;
+use App\Model\Area;
+use App\Model\BasicMaterial;
+use App\Model\BasicRollFilm;
+use App\Model\BasicType;
+use App\Model\CarDepart;
+use App\Model\CarFiles;
+use App\Model\CarType;
+use App\Model\Company;
+use App\Model\Construction;
+use App\Model\ConstructionOrder;
+use App\Model\ConstructionOrderImg;
+use App\Model\ConstructionOrderSub;
+use App\Model\ConstructionProductInfo;
+use App\Model\Employee;
+use App\Model\FoursShop;
+use App\Model\InOutRecord;
+use App\Model\Inventory;
+use App\Model\InventorySub;
+use App\Model\Material;
+use App\Model\MaterialCharge;
+use App\Model\MaterialChargeSub;
+use App\Model\MaterialOrder;
+use App\Model\MaterialOrderApply;
+use App\Model\MaterialOrderIn;
+use App\Model\MaterialOrderSend;
+use App\Model\MaterialOrderSendSub;
+use App\Model\MaterialReturn;
+use App\Model\MaterialReturnSub;
+use App\Model\PaymentReceipt;
+use App\Model\PaymentReceiptInfo;
+use App\Model\RollFilm;
+use App\Model\RollFilmCombine;
+use App\Model\RollFilmCompany;
+use App\Model\RollFilmInventory;
+use App\Model\SalesOrder;
+use App\Model\SalesOrderOtherFee;
+use App\Model\SalesOrderProductInfo;
+use App\Model\Storehouse;
+use App\Model\Transfer;
+use App\Model\TransferSub;
+use Illuminate\Support\Facades\DB;
+use Maatwebsite\Excel\Facades\Excel;
+
+class ExportFileService extends Service
+{
+    //导出文件
+    const type_one = 1;
+    const type_two = 2;
+    const type_three = 3;
+    const type_four = 4;
+    const type_five = 5;
+    const type_six = 6;
+    const type_seven = 7;
+
+    //导出文件方法
+    protected static $fuc = [
+        self::type_one => 'one',
+        self::type_two => 'two',
+        self::type_three => 'three',
+        self::type_four => 'four',
+    ];
+
+    protected static $fuc_name = [
+        self::type_one => '合同订单',
+        self::type_two => '派工订单',
+        self::type_three => '收付款单',
+        self::type_four => '施工单',
+    ];
+
+    public static $filename = "";
+
+    public function exportAll($data,$user){
+        if(empty($data['id'])) return [false,'请选择导出数据'];
+        if(empty($data['type']) || ! isset(self::$fuc[$data['type']])) return [false,'导出文件类型错误或者不存在'];
+        self::$filename = self::$fuc_name[$data['type']] ?? "";
+
+        //不超时
+        ini_set('max_execution_time', 0);
+        //内存设置
+        ini_set('memory_limit', -1);
+
+        $function = self::$fuc[$data['type']];
+        $return = $this->$function($data);
+
+        return [true, $return];
+    }
+
+    public function one($ergs){
+        $id = $ergs['id'];
+
+        // 导出数据
+        $return = [];
+
+        DB::table('sales_order')
+            ->whereIn('id', $id)
+            ->select('id','order_number','model_type','sales_order_type','sign_time','plat_order','plat_type','product_total','other_fee','discount_fee','contract_fee','crt_time','crt_id','state','invoice_state','pay_way')
+            ->orderBy('id','desc')
+            ->chunk(500,function ($data) use(&$return){
+                $data = $data->toArray();
+                $data_id = array_unique(array_column($data,'id'));
+                $emp_map = Employee::whereIn('id',array_unique(array_column($data,'crt_id')))
+                    ->pluck('emp_name','id')
+                    ->toArray();
+                //获取分社订货合同关联的发货单
+                $id = [];
+                foreach ($data as $value){
+                    $id[] = [
+                        'id' => $value->id,
+                        'invoice_state' => $value->invoice_state,
+                    ];
+                }
+                $invoiceData = (new SalesOrderService())->getInvoiceOrderData($id);
+
+                $array = array_unique(array_merge_recursive(array_column($data,'car_type'),array_column($data,'pay_way'),array_column($data,'install_position'),array_column($data,'install_method'),array_column($data,'plat_type')));
+                $basic_map = BasicType::whereIn('id',$array)
+                    ->pluck('title','id')
+                    ->toArray();
+
+                $product = [];
+                $sales_p_info = SalesOrderProductInfo::where('del_time',0)
+                    ->whereIn('sales_order_id',$data_id)
+                    ->get()->toArray();
+                $basic_price = BasicType::whereIn('id',array_unique(array_column($sales_p_info,'basic_type_id')))->pluck('title','id')->toArray();
+                $map = (new ProductService())->getProductDetail(array_column($sales_p_info,'product_id'));
+                foreach ($sales_p_info as $value){
+                    $tmp = $map[$value['product_id']] ?? [];
+                    $value['title'] = $tmp['title'] ?? "";
+                    $value['code'] = $tmp['code'] ?? "";
+                    $value['size'] = $tmp['size'] ?? "";
+                    $value['bar_code'] = $tmp['bar_code'] ?? "";
+                    $value['basic_type_title'] = $basic_price[$value['basic_type_id']] ?? "";
+                    $value['install_time'] = $tmp['install_time'] ?? 0;
+                    $product[$value['sales_order_id']][] = $value;
+                }
+
+                $flag = [];
+                foreach ($data as $value){
+                    $tmp = $invoiceData[$value->id] ?? [];
+                    $invoice_arr = implode(',', $tmp);
+                    $model_type_title = SalesOrder::$model_type_title[$value->model_type] ?? '';
+                    $plat_type_title = $basic_map[$value->plat_type] ?? '';
+                    $sales_order_type_title = SalesOrder::$order_type[$value->sales_order_type] ?? '';
+                    $crt_time = empty($value->crt_time) ? '' : date('Y-m-d',$value->crt_time);
+                    $sign_time = empty($value->sign_time) ? '' : date('Y-m-d',$value->sign_time);
+                    $product_tmp = $product[$value->id] ?? [];
+                    if($value->sales_order_type == SalesOrder::Order_type_one){
+                        if($value->model_type == SalesOrder::Model_type_four){
+                            $state = SalesOrder::$state[$value->state] ?? '';
+                        }else{
+                            $state = SalesOrder::$state_2[$value->state] ?? '';
+                        }
+                    }else{
+                        $state = SalesOrder::$state2[$value->state] ?? '';
+                    }
+
+                    foreach ($product_tmp as $val){
+                        if(in_array($val['sales_order_id'], $flag)){
+                            $return[] = [
+                                'order_number' => "",
+                                'model_type_title' => "",
+                                'sales_order_type_title' => "",
+                                'sign_time' => "",
+                                'plat_order' => "",
+                                'plat_type_title' => "",
+                                'product_total' => "",
+                                'other_fee' => "",
+                                'discount_fee' => "",
+                                'contract_fee' => "",
+                                'crt_time' => "",
+                                'crt_name' => "",
+                                'state_title' => "",
+                                'invoice_state_title' =>"",
+                                'invoice_arr' => "",
+                                'pay_way' => "",
+                                'product_title' => $val['title'],
+                                'product_code' => $val['code'],
+                                'product_size' => $val['size'],
+                                'product_rate' => $val['rate'],
+                                'product_price' => $val['price'],
+                                'product_num' => $val['number'],
+                                'product_final_amount' => $val['final_amount'],
+                            ];
+                        }else{
+                            $flag[] = $val['sales_order_id'];
+                            $return[] = [
+                                'order_number' => $value->order_number,
+                                'model_type_title' => $model_type_title,
+                                'sales_order_type_title' => $sales_order_type_title,
+                                'sign_time' => $sign_time,
+                                'plat_order' => $value->plat_order,
+                                'plat_type_title' => $plat_type_title,
+                                'product_total' => $value->product_total,
+                                'other_fee' => $value->other_fee,
+                                'discount_fee' => $value->discount_fee,
+                                'contract_fee' => $value->contract_fee,
+                                'crt_time' => $crt_time,
+                                'crt_name' => $emp_map[$value->crt_id] ?? "",
+                                'state_title' => $state,
+                                'invoice_state_title' => SalesOrder::$invoice_state[$value->invoice_state] ?? '',
+                                'invoice_arr' => $invoice_arr,
+                                'pay_way' => $basic_map[$value->pay_way] ?? "",
+                                'product_title' => $val['title'],
+                                'product_code' => $val['code'],
+                                'product_size' => $val['size'],
+                                'product_rate' => $val['rate'],
+                                'product_price' => $val['price'],
+                                'product_num' => $val['number'],
+                                'product_final_amount' => $val['final_amount'],
+                            ];
+                        }
+                    }
+                }
+            });
+
+        $header = ['合同单号','销售类型','产品类型','签订时间','平台单号','平台类型','产品合计','其他费用','优惠金额','合同金额','创建时间','创建人','订单状态','发货状态','发货单号','付款方式','产品名称','产品编码','产品规格','产品税率','产品单价','产品数量','产品合同金额'];
+
+        return $this->saveExportData($return,$header);
+    }
+
+    public function two($ergs){
+        $id = $ergs['id'];
+
+        // 导出数据
+        $return = [];
+
+        DB::table('sales_order')
+            ->whereIn('id', $id)
+            ->select('id','order_number','model_type','sales_order_type','sign_time','plat_order','plat_type','product_total','other_fee','discount_fee','contract_fee','crt_time','crt_id','state','invoice_state','pay_way')
+            ->orderBy('id','desc')
+            ->chunk(500,function ($data) use(&$return){
+                $data = $data->toArray();
+                $data_id = array_unique(array_column($data,'id'));
+                $emp_map = Employee::whereIn('id',array_unique(array_column($data,'crt_id')))
+                    ->pluck('emp_name','id')
+                    ->toArray();
+                //获取分社订货合同关联的发货单
+                $id = [];
+                foreach ($data as $value){
+                    $id[] = [
+                        'id' => $value->id,
+                        'invoice_state' => $value->invoice_state,
+                        'state' => $value->state,
+                    ];
+                }
+                $invoiceData = (new SalesOrderService())->getInvoiceOrderData($id);
+
+                $array = array_unique(array_merge_recursive(array_column($data,'car_type'),array_column($data,'pay_way'),array_column($data,'install_position'),array_column($data,'install_method'),array_column($data,'plat_type')));
+                $basic_map = BasicType::whereIn('id',$array)
+                    ->pluck('title','id')
+                    ->toArray();
+
+                $product = [];
+                $sales_p_info = SalesOrderProductInfo::where('del_time',0)
+                    ->whereIn('sales_order_id',$data_id)
+                    ->get()->toArray();
+                $basic_price = BasicType::whereIn('id',array_unique(array_column($sales_p_info,'basic_type_id')))->pluck('title','id')->toArray();
+                $map = (new ProductService())->getProductDetail(array_column($sales_p_info,'product_id'));
+
+                //指派金额
+                $fee = [];
+                $sales_o_info = SalesOrderOtherFee::where('del_time',0)
+                    ->whereIn('sales_order_id',$data_id)
+                    ->get()->toArray();
+                foreach ($sales_o_info as $value){
+                    $fee[$value['sales_order_id']] = $value['other_fee_1'];
+                }
+                foreach ($sales_p_info as $value){
+                    $tmp = $map[$value['product_id']] ?? [];
+                    $value['title'] = $tmp['title'] ?? "";
+                    $value['code'] = $tmp['code'] ?? "";
+                    $value['size'] = $tmp['size'] ?? "";
+                    $value['bar_code'] = $tmp['bar_code'] ?? "";
+                    $value['basic_type_title'] = $basic_price[$value['basic_type_id']] ?? "";
+                    $value['install_time'] = $tmp['install_time'] ?? 0;
+                    $product[$value['sales_order_id']][] = $value;
+                }
+
+                //分派的总社或分社
+                $dispatch = (new SalesOrderService())->getDispatchData($id);
+
+                $flag = [];
+                foreach ($data as $value){
+                    $tmp = $invoiceData[$value->id] ?? [];
+                    $invoice_arr = implode(',', $tmp);
+                    $model_type_title = SalesOrder::$model_type_title[$value->model_type] ?? '';
+                    $plat_type_title = $basic_map[$value->plat_type] ?? '';
+                    $sales_order_type_title = SalesOrder::$order_type[$value->sales_order_type] ?? '';
+                    $crt_time = empty($value->crt_time) ? '' : date('Y-m-d',$value->crt_time);
+                    $sign_time = empty($value->sign_time) ? '' : date('Y-m-d',$value->sign_time);
+                    $product_tmp = $product[$value->id] ?? [];
+                    if($value->sales_order_type == SalesOrder::Order_type_one){
+                        if($value->model_type == SalesOrder::Model_type_four){
+                            $state = SalesOrder::$state[$value->state] ?? '';
+                        }else{
+                            $state = SalesOrder::$state_2[$value->state] ?? '';
+                        }
+                    }else{
+                        $state = SalesOrder::$state2[$value->state] ?? '';
+                    }
+
+                    foreach ($product_tmp as $val){
+                        if(in_array($val['sales_order_id'], $flag)){
+                            $return[] = [
+                                'order_number' => "",
+                                'model_type_title' => "",
+                                'sales_order_type_title' => "",
+                                'sign_time' => "",
+                                'plat_order' => "",
+                                'plat_type_title' => "",
+                                'product_total' => "",
+                                'other_fee' => "",
+                                'discount_fee' => "",
+                                'contract_fee' => "",
+                                'fee' => "",
+                                'dispatch_company' => "",
+                                'crt_time' => "",
+                                'crt_name' => "",
+                                'state_title' => "",
+                                'invoice_state_title' =>"",
+                                'invoice_arr' => "",
+                                'pay_way' => "",
+                                'product_title' => $val['title'],
+                                'product_code' => $val['code'],
+                                'product_size' => $val['size'],
+                                'product_rate' => $val['rate'],
+                                'product_price' => $val['price'],
+                                'product_num' => $val['number'],
+                                'product_final_amount' => $val['final_amount'],
+                            ];
+                        }else{
+                            $flag[] = $val['sales_order_id'];
+                            $return[] = [
+                                'order_number' => $value->order_number,
+                                'model_type_title' => $model_type_title,
+                                'sales_order_type_title' => $sales_order_type_title,
+                                'sign_time' => $sign_time,
+                                'plat_order' => $value->plat_order,
+                                'plat_type_title' => $plat_type_title,
+                                'product_total' => $value->product_total,
+                                'other_fee' => $value->other_fee,
+                                'discount_fee' => $value->discount_fee,
+                                'contract_fee' => $value->contract_fee,
+                                'fee' => $fee[$value->id] ?? "",
+                                'dispatch_company' => $dispatch[$value->id] ?? '',
+                                'crt_time' => $crt_time,
+                                'crt_name' => $emp_map[$value->crt_id] ?? "",
+                                'state_title' => $state,
+                                'invoice_state_title' => SalesOrder::$invoice_state[$value->invoice_state] ?? '',
+                                'invoice_arr' => $invoice_arr,
+                                'pay_way' => $basic_map[$value->pay_way] ?? "",
+                                'product_title' => $val['title'],
+                                'product_code' => $val['code'],
+                                'product_size' => $val['size'],
+                                'product_rate' => $val['rate'],
+                                'product_price' => $val['price'],
+                                'product_num' => $val['number'],
+                                'product_final_amount' => $val['final_amount'],
+                            ];
+                        }
+                    }
+                }
+            });
+
+        $header = ['合同单号','销售类型','产品类型','签订时间','平台单号','平台类型','产品合计','其他费用','优惠金额','合同金额','指派金额','派遣门店','创建时间','创建人','订单状态','发货状态','发货单号','付款方式','产品名称','产品编码','产品规格','产品税率','产品单价','产品数量','产品合同金额'];
+
+        return $this->saveExportData($return,$header);
+    }
+
+    public function three($ergs){
+        $id = $ergs['id'];
+
+        // 导出数据
+        $return = [];
+
+        DB::table('payment_receipt')
+            ->whereIn('id', $id)
+            ->select('id','order_number','account','pay_way','type','data_type','payment_receipt_date','mark','crt_time','crt_id','state')
+            ->orderBy('id','desc')
+            ->chunk(500,function ($data) use(&$return){
+                $data = $data->toArray();
+                $emp_map = Employee::whereIn('id',array_unique(array_column($data,'crt_id')))
+                    ->pluck('emp_name','id')
+                    ->toArray();
+                $array = array_unique(array_merge_recursive(array_column($data,'account'),array_column($data,'pay_way')));
+                $basic_map = BasicType::whereIn('id',$array)
+                    ->pluck('title','id')
+                    ->toArray();
+                $info = PaymentReceiptInfo::where('del_time',0)
+                    ->where('type',PaymentReceiptInfo::type_three)
+                    ->whereIn('payment_receipt_id',array_column($data,'id'))
+                    ->get()->toArray();
+                $map = [];
+                foreach ($info as $value){
+                    $map[$value['payment_receipt_id']][] = [
+                        'payment_receipt_id' => $value['payment_receipt_id'],
+                        'data_order_no' => $value['data_order_no'],
+                        'amount' => $value['amount']
+                    ];
+                }
+
+                $flag = [];
+                foreach ($data as $value){
+                    $account_title = $basic_map[$value->account] ?? '';
+                    $pay_way_title = $basic_map[$value->pay_way] ?? '';
+                    $crt_time = empty($value->crt_time) ? '' : date('Y-m-d',$value->crt_time);
+                    $payment_receipt_date= empty($value->payment_receipt_date) ? '' : date('Y-m-d',$value->payment_receipt_date);
+                    $state_title = PaymentReceipt::$name[$value->state] ?? '';
+
+                    $product_tmp = $map[$value->id] ?? [];
+
+                    foreach ($product_tmp as $val){
+                        if(in_array($val['payment_receipt_id'], $flag)){
+                            $return[] = [
+                                'order_number' => "",
+                                'account' => "",
+                                'pay_way' => "",
+                                'type' => "",
+                                'data_type' => "",
+                                'payment_receipt_date' => "",
+                                'mark' => "",
+                                'crt_time' => "",
+                                'crt_name' => "",
+                                'state_title' => "",
+                                'data_order_no' => $val['data_order_no'],
+                                'amount' => $val['amount'],
+                            ];
+                        }else{
+                            $flag[] = $val['payment_receipt_id'];
+                            $return[] = [
+                                'order_number' => $value->order_number,
+                                'account' => $account_title,
+                                'pay_way' => $pay_way_title,
+                                'type' => PaymentReceipt::$model_type[$value->type] ?? '',
+                                'data_type' => PaymentReceipt::$data_type[$value->data_type] ?? '',
+                                'payment_receipt_date' => $payment_receipt_date,
+                                'mark' => $value->mark,
+                                'crt_time' => $crt_time,
+                                'crt_name' => $emp_map[$value->crt_id] ?? "",
+                                'state_title' => $state_title,
+                                'data_order_no' => $val['data_order_no'],
+                                'amount' => $val['amount'],
+                            ];
+                        }
+                    }
+                }
+            });
+
+        $header = ['收付款单号','收付款账户','支付方式','收付款类型','关联单号类型','回款日期','备注','创建时间','创建人','订单状态','关联单号','金额'];
+
+        return $this->saveExportData($return,$header);
+    }
+
+    public function four($ergs){
+        $id = $ergs['id'];
+
+        // 导出数据
+        $return = [];
+
+        DB::table('construction')
+            ->whereIn('id', $id)
+            ->select('id','order_number','title','sales_order_id','handover_time','install_method','install_position','mark','urgency','start_time','end_time','crt_time','crt_id','state','pq_state','day_start_stamp','day_end_stamp')
+            ->orderBy('id','desc')
+            ->chunk(500,function ($data) use(&$return){
+                $data = $data->toArray();
+                $emp_map = Employee::whereIn('id',array_unique(array_column($data,'crt_id')))
+                    ->pluck('emp_name','id')
+                    ->toArray();
+
+                $sales = SalesOrder::whereIn('id',array_unique(array_column($data,'sales_order_id')))->select('order_number','id','handover_time')->get()->toArray();
+                $sales_map = [];
+                foreach ($sales as $value){
+                    $sales_map[$value['id']] = $value;
+                }
+
+                $array = array_unique(array_merge_recursive(array_column($data,'install_method'),array_column($data,'urgency'),array_column($data,'install_position')));
+                $basic_map = BasicType::whereIn('id',$array)
+                    ->pluck('title','id')
+                    ->toArray();
+
+                $product = [];
+                $p_info = ConstructionProductInfo::where('del_time',0)
+                    ->whereIn('construction_id',array_unique(array_column($data,'id')))
+                    ->get()->toArray();
+                $map = (new ProductService())->getProductDetail(array_column($p_info,'product_id'));
+                foreach ($p_info as $value){
+                    $tmp = $map[$value['product_id']] ?? [];
+                    $value['title'] = $tmp['title'] ?? "";
+                    $value['code'] = $tmp['code'] ?? "";
+                    $value['size'] = $tmp['size'] ?? "";
+                    $value['unit'] = $tmp['unit'] ?? "";
+                    $value['bar_code'] = $tmp['bar_code'] ?? "";
+                    $product[$value['construction_id']][] = $value;
+                }
+
+                $flag = [];
+                foreach ($data as $value){
+                    $tmp_sales = $sales_map[$value->sales_order_id] ?? [];
+                    $handover_time = $value->handover_time ? date("Y-m-d") : "";
+                    $sales_order_number = $tmp_sales['order_number'];
+                    $crt_time = empty($value->crt_time) ? '' : date('Y-m-d',$value->crt_time);
+                    $install_position_title = $basic_map[$value->install_position] ?? '';
+                    $install_method_title = $basic_map[$value->install_position] ?? '';
+                    $urgency_title = $basic_map[$value->urgency] ?? '';
+                    $start_time = $value->start_time ? date("Y-m-d H:i",$value->start_time) : '';
+                    $end_time = $value->end_time ? date("Y-m-d H:i",$value->end_time) : '';
+                    $construction_period = $start_time . '——' . $end_time;
+                    $state =  Construction::$name[$value->state] ?? '';
+                    $pq_state = Construction::$pq_name[$value->pq_state] ?? '';
+                    $str = "";
+                    $start_time = $value->day_start_stamp ? date("Y-m-d H:i",$value->day_start_stamp) : '';
+                    $end_time = $value->day_end_stamp ? date("Y-m-d H:i",$value->day_end_stamp) : '';
+                    if(! empty($start_time) && ! empty($end_time)) $str = $start_time . '——' . $end_time;
+                    $pq_period = $str;
+                    $product_tmp = $product[$value->id] ?? [];
+
+                    foreach ($product_tmp as $val){
+                        if(in_array($val['construction_id'], $flag)){
+                            $return[] = [
+                                'order_number' => "",
+                                'title' => "",
+                                'sales_order_title' => "",
+                                'handover_time' => "",
+                                'install_method' => "",
+                                'install_position' => "",
+                                'mark' => "",
+                                'urgency' => "",
+                                'construction_period' => "",
+                                'state_title' => "",
+                                'pq_state' => "",
+                                'pq_period' => "",
+                                'crt_time' => "",
+                                'crt_name' => "",
+                                'product_title' => $val['title'],
+                                'product_code' => $val['code'],
+                                'product_size' => $val['size'],
+                                'product_price' => $val['price'],
+                                'product_num' => $val['number'],
+                                'product_final_amount' => $val['final_amount'],
+                            ];
+                        }else{
+                            $flag[] = $val['construction_id'];
+                            $return[] = [
+                                'order_number' => $value->order_number,
+                                'title' => $value->title,
+                                'sales_order_title' => $sales_order_number,
+                                'handover_time' => $handover_time,
+                                'install_method' => $install_method_title,
+                                'install_position' => $install_position_title,
+                                'mark' => $value->mark,
+                                'urgency' => $urgency_title,
+                                'construction_period' => $construction_period,
+                                'state_title' => $state,
+                                'pq_state' => $pq_state,
+                                'pq_period' => $pq_period,
+                                'crt_time' => $crt_time,
+                                'crt_name' => $emp_map[$value->crt_id] ?? "",
+                                'product_title' => $val['title'],
+                                'product_code' => $val['code'],
+                                'product_size' => $val['size'],
+                                'product_price' => $val['price'],
+                                'product_num' => $val['number'],
+                                'product_final_amount' => $val['final_amount'],
+                            ];
+                        }
+                    }
+                }
+            });
+
+        $header = ['施工单号','工单来源','关联单号','交车日期','安装方式','安装地点','备注','紧急程度','施工时间','订单状态','是否排期','排期时间','创建时间','创建人','产品名称','产品编码','产品规格','产品单价','产品数量','产品合同金额'];
+
+        return $this->saveExportData($return,$header);
+    }
+
+    public function saveExportData($data, $headers, $type = 'default',$file_name = ''){
+        if(empty($file_name)) $file_name = self::$filename . "_". date("Y-m-d") . "_". rand(1000,9999);
+        $filename =  $file_name . '.' . 'xlsx';
+        $bool = Excel::store(new ExportOrder($data,$type,$headers),"/public/export/{$filename}", null, 'Xlsx', []);
+        return $filename;
+    }
+}

app/Service/OaService.php

@@ -419,7 +419,7 @@ class OaService extends Service
         try {
             DB::beginTransaction();
 
-            list($employee_ids, $oa_sub_id) = $this->oaCommon($menu_id, ['order_number' => $orderObject], 1);
+            list($employee_ids, $oa_sub_id) = $this->oaCommon($menu_id, ['order_number' => $orderObject], 1,0,$this->user);
             if (empty($employee_ids)) {
                 $this->returnOa($order_no, 1, $type);
                 DB::commit();

app/Service/PaymentReceiptService.php

@@ -6,6 +6,8 @@ use App\Model\BasicType;
 use App\Model\Employee;
 use App\Model\PaymentReceipt;
 use App\Model\PaymentReceiptInfo;
+use App\Model\PurchaseOrder;
+use App\Model\SalesOrder;
 use Illuminate\Support\Facades\DB;
 
 class PaymentReceiptService extends Service
@@ -25,12 +27,12 @@ class PaymentReceiptService extends Service
             DB::beginTransaction();
 
             $model = PaymentReceipt::where('id',$data['id'])->first();
-            $model->data_order_no = $data['data_order_no'];
-            $model->data_type = $data['data_type'];
+//            $model->data_order_no = $data['data_order_no'];
+//            $model->data_type = $data['data_type'];
             $model->type = $data['type'];
             $model->account = $data['account'] ?? 0;
             $model->pay_way = $data['pay_way'] ?? 0;
-            $model->amount = $data['amount'] ?? 0;
+//            $model->amount = $data['amount'] ?? 0;
             $model->mark = $data['mark'] ?? '';
             $model->payment_receipt_date = $data['payment_receipt_date'] ?? 0;
             $model->save();
@@ -71,6 +73,20 @@ class PaymentReceiptService extends Service
                 }
                 PaymentReceiptInfo::insert($insert);
             }
+            if(! empty($data['amount_list'])){
+                $insert = [];
+                foreach ($data['amount_list'] as $value){
+                    $insert[] = [
+                        'payment_receipt_id' => $model->id,
+                        'data_order_no' => $value['data_order_no'],
+                        'data_order_type' => $data['data_type'],
+                        'amount' => $value['amount'],
+                        'type' => PaymentReceiptInfo::type_three,
+                        'crt_time' => $time,
+                    ];
+                }
+                PaymentReceiptInfo::insert($insert);
+            }
 
             DB::commit();
         }catch (\Exception $exception){
@@ -92,12 +108,12 @@ class PaymentReceiptService extends Service
 
             $model = new PaymentReceipt();
             $model->order_number = $data['order_number'];
-            $model->data_order_no = $data['data_order_no'];
+//            $model->data_order_no = $data['data_order_no'];
             $model->data_type = $data['data_type'];
             $model->type = $data['type'];
             $model->account = $data['account'] ?? 0;
             $model->pay_way = $data['pay_way'] ?? 0;
-            $model->amount = $data['amount'] ?? 0;
+//            $model->amount = $data['amount'] ?? 0;
             $model->mark = $data['mark'] ?? '';
             $model->crt_id = $user['id'];
             $model->depart_id = $data['depart_id'];
@@ -131,6 +147,20 @@ class PaymentReceiptService extends Service
                 }
                 PaymentReceiptInfo::insert($insert);
             }
+            if(! empty($data['amount_list'])){
+                $insert = [];
+                foreach ($data['amount_list'] as $value){
+                    $insert[] = [
+                        'payment_receipt_id' => $model->id,
+                        'data_order_no' => $value['data_order_no'],
+                        'data_order_type' => $data['data_type'],
+                        'amount' => $value['amount'],
+                        'type' => PaymentReceiptInfo::type_three,
+                        'crt_time' => $time,
+                    ];
+                }
+                PaymentReceiptInfo::insert($insert);
+            }
             DB::commit();
         }catch (\Exception $exception){
             DB::rollBack();
@@ -204,17 +234,42 @@ class PaymentReceiptService extends Service
             ->where('payment_receipt_id',$data['id'])
             ->get()->toArray();
         $emp_id = [];
+        $order_no = [];
         foreach ($file as $value){
             if(in_array($value['type'],PaymentReceiptInfo::$man)){
                 $emp_id[] = $value['data_id'];
             }
+            if(! empty($value['data_order_no'])) $order_no[] = $value['data_order_no'];
+        }
+        if($customer['data_type'] == PaymentReceipt::data_type_one){
+            $order = SalesOrder::where('del_time',0)
+                ->whereIn('order_number',$order_no)
+                ->pluck('contract_fee','order_number')
+                ->toArray();
+        }else{
+            $order = PurchaseOrder::where('del_time',0)
+                ->whereIn('order_number',$order_no)
+                ->pluck('purchase_total','order_number')
+                ->toArray();
+        }
+        $infos = PaymentReceiptInfo::where('del_time',0)
+            ->where('type',PaymentReceiptInfo::type_three)
+            ->where('payment_receipt_id','<>',$customer['id'])
+            ->get()->toArray();
+        $infos_map = [];
+        foreach ($infos as $value){
+            if(isset($infos_map[$value['data_order_no']])){
+                $infos_map[$value['data_order_no']] += $value['amount'];
+            }else{
+                $infos_map[$value['data_order_no']] = $value['amount'];
+            }
         }
         $emp_map = Employee::whereIn('id',array_unique($emp_id))
             ->where('del_time',0)
             ->pluck('emp_name','id')
             ->toArray();
 
-        $customer['file'] = $customer['employee_one'] = [];
+        $customer['file'] = $customer['employee_one'] = $customer['amount_list'] = [];
         foreach ($file as $value){
             if($value['type'] == PaymentReceiptInfo::type_one){
                 $tmp = [
@@ -233,6 +288,14 @@ class PaymentReceiptService extends Service
                         $customer['employee_one'][] = $tmp;
                     }
                 }
+            }elseif ($value['type'] == PaymentReceiptInfo::type_three){
+                $tmp = [
+                    'data_order_no' => $value['data_order_no'],
+                    'amount' => $value['amount'],
+                    'total_amount' => $order[$value['data_order_no']] ?? 0,
+                    'has_amount' => $infos_map[$value['data_order_no']] ?? 0,
+                ];
+                $customer['amount_list'][] = $tmp;
             }
         }
 
@@ -246,7 +309,15 @@ class PaymentReceiptService extends Service
             ->orderby('id', 'desc');
 
         if(isset($data['state'])) $model->where('state', $data['state']);
-        if(! empty($data['data_order_no'])) $model->where('data_order_no',  'LIKE', '%'.$data['data_order_no'].'%');
+        if(! empty($data['data_order_no'])) {
+            $info = PaymentReceiptInfo::where('del_time',0)
+                ->where('type',PaymentReceiptInfo::type_three)
+                ->where('data_order_no',  'LIKE', '%'.$data['data_order_no'].'%')
+                ->select('payment_receipt_id')
+                ->get()->toArray();
+
+            $model->whereIn('id', array_unique(array_column($info,'payment_receipt_id')));
+        }
         if(! empty($data['order_number'])) $model->where('order_number',  'LIKE', '%'.$data['order_number'].'%');
         if(! empty($data['data_type'])) $model->where('data_type', $data['data_type']);
         if(! empty($data['type'])) $model->where('type', $data['type']);
@@ -258,7 +329,7 @@ class PaymentReceiptService extends Service
             $model->where('crt_time','>=',$return[0]);
             $model->where('crt_time','<=',$return[1]);
         }
-        if(! empty($data['payment_receipt_date'][0]) && ! empty($data['payment_receipt_date'][1])) {
+        if(! empty($data['payment_receipt_date'][0]) && ! empty($data['payment_receipt_date'][1])){
             $return = $this->changeDateToTimeStampAboutRange($data['payment_receipt_date']);
             $model->where('payment_receipt_date','>=',$return[0]);
             $model->where('payment_receipt_date','<=',$return[1]);
@@ -276,12 +347,15 @@ class PaymentReceiptService extends Service
 
     public function customerRule(&$data, $user, $is_add = true){
         if(empty($data['order_number'])) return [false,'收付款单编号不能为空'];
-        if(empty($data['data_order_no'])) return [false,'关联单号不能为空'];
         if(empty($data['data_type'])) return [false,'单号类型不能为空'];
-        if(empty($data['type'])) return [false,'金额类型不能为空'];
-        if(empty($data['amount'])) return [false,'金额不能为空'];
-        $res = $this->checkNumber($data['amount']);
-        if(! $res) return [false, '金额请输入不超过两位小数并且大于0的数值'];
+        if(empty($data['type'])) return [false,'收付款类型不能为空'];
+        if(empty($data['amount_list']) || ! is_array($data['amount_list'])) return [false,'关联单号与回款金额不能为空'];
+        foreach ($data['amount_list'] as $value){
+            if(empty($value['data_order_no'])) return [false,'关联单号不能为空'];
+            if(empty($value['amount'])) return [false,'金额不能为空'];
+            $res = $this->checkNumber($value['amount']);
+            if(! $res) return [false, '金额请输入不超过两位小数并且大于0的数值'];
+        }
 
         if(! empty($data['payment_receipt_date'])) $data['payment_receipt_date'] = $this->changeDateToDate($data['payment_receipt_date']);
 
@@ -318,6 +392,16 @@ class PaymentReceiptService extends Service
             ->pluck('title','id')
             ->toArray();
 
+        $map = [];
+        $info = PaymentReceiptInfo::where('del_time',0)
+            ->where('type',PaymentReceiptInfo::type_three)
+            ->whereIn('payment_receipt_id',  array_unique(array_column($data['data'],'id')))
+            ->select('payment_receipt_id','data_order_no')
+            ->get()->toArray();
+        foreach ($info as $value){
+            $map[$value['payment_receipt_id']][] = $value['data_order_no'];
+        }
+
         foreach ($data['data'] as $key => $value){
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
             $data['data'][$key]['payment_receipt_date'] = $value['payment_receipt_date'] ? date('Y-m-d',$value['payment_receipt_date']) : '';
@@ -327,6 +411,7 @@ class PaymentReceiptService extends Service
             $data['data'][$key]['data_type_title'] = PaymentReceipt::$data_type[$value['data_type']] ?? '';
             $data['data'][$key]['account_title'] = $basic_map[$value['account']] ?? '';
             $data['data'][$key]['pay_way_title'] = $basic_map[$value['pay_way']] ?? '';
+            $data['data'][$key]['data_order_no'] = $map[$value['id']] ?? [];
         }
 
         return $data;
@@ -335,8 +420,21 @@ class PaymentReceiptService extends Service
     public function getPaymentReceiptDataList($data){
         $data['data_order_no'] = $data['order_number'];
 
-        $order = PaymentReceipt::where('del_time',0)
+        $info1 = PaymentReceiptInfo::where('del_time',0)
             ->where('data_order_no',$data['data_order_no'])
+            ->where('type',PaymentReceiptInfo::type_three)
+            ->get()->toArray();
+        $map = [];
+        foreach ($info1 as $value){
+            if(isset($map[$value['payment_receipt_id']])){
+                $map[$value['payment_receipt_id']] += $value['amount'];
+            }else{
+                $map[$value['payment_receipt_id']] = $value['amount'];
+            }
+        }
+
+        $order = PaymentReceipt::where('del_time',0)
+            ->where('id',array_column($info1,'payment_receipt_id'))
             ->get()->toArray();
 
         $emp_id = PaymentReceiptInfo::where('del_time',0)
@@ -364,11 +462,14 @@ class PaymentReceiptService extends Service
             $order[$key]['belong'] = $tmp;
             $order[$key]['state_title'] = PaymentReceipt::$name[$value['state']] ?? '';
             $order[$key]['payment_receipt_date'] = $value['payment_receipt_date'] ? date('Y-m-d',$value['payment_receipt_date']) : '';
-            if($value['state'] == PaymentReceipt::STATE_TWO){
-                $finished += $value['amount'];
-            }else{
-                $not_finished += $value['amount'];
-            }
+            $amount = $map[$value['id']] ?? 0;
+            $order[$key]['amount'] = $amount;
+            $finished += $amount;
+//            if($value['state'] == PaymentReceipt::STATE_TWO){
+//                $finished += $amount;
+//            }else{
+//                $not_finished += $amount;
+//            }
         }
 
         $return['receipt_amount'] = $finished;
@@ -441,4 +542,47 @@ class PaymentReceiptService extends Service
 
         return $customer;
     }
+
+    public function getPaymentReceiptDataCountList($data){
+        $data_order_no = [];
+        foreach ($data as $value){
+            $data_order_no[] = $value['order_number'];
+        }
+        if(empty($data_order_no)) return [];
+
+        $order = PaymentReceiptInfo::where('del_time',0)
+            ->where('type',PaymentReceiptInfo::type_three)
+            ->whereIn('data_order_no',$data_order_no)
+            ->get()->toArray();
+
+        $return = [];
+        foreach ($order as $value){
+            if(isset($return[$value['data_order_no']])){
+                $return[$value['data_order_no']] += $value['amount'];
+            }else{
+                $return[$value['data_order_no']] = $value['amount'];
+            }
+        }
+
+        return $return;
+    }
+
+    public function maked(){
+        $payment = PaymentReceipt::where('del_time',0)
+            ->where('data_order_no','<>','')
+            ->where('amount','>',0)
+            ->get()->toArray();
+        $insert = [];
+        foreach ($payment as $value){
+            $insert[] = [
+                'payment_receipt_id' => $value['id'],
+                'crt_time' => $value['crt_time'],
+                'type' => PaymentReceiptInfo::type_three,
+                'data_order_no' => $value['data_order_no'],
+                'amount' => $value['amount'],
+                'data_order_type' => $value['type'],
+            ];
+        }
+        if(! empty($insert)) PaymentReceiptInfo::insert($insert);
+    }
 }

app/Service/PurchaseOrderService.php

@@ -269,6 +269,11 @@ class PurchaseOrderService extends Service
         }
         $order['is_show_confirm'] = $is_show_confirm;
 
+        //收付款单信息
+        $order['payment_receipt_list'] = (new PaymentReceiptService())->getPaymentReceiptDataList($order);
+        $order['payment_receipt_list']['not_receipt_amount'] = $order['purchase_total'] - $order['payment_receipt_list']['receipt_amount'];
+        $order['not_payment_receipt_amount'] = $order['payment_receipt_list']['not_receipt_amount'];
+
         return [true, $order];
     }
 
@@ -428,6 +433,10 @@ class PurchaseOrderService extends Service
                 $product[$value['purchase_order_id']][] = $value;
             }
         }
+
+        $for_amount_list = [];
+        if(! empty($ergs['for_amount_list'])) $for_amount_list = (new PaymentReceiptService())->getPaymentReceiptDataCountList($data['data']);
+
         //获取金额列表
         $money = (new BookingListService())->getAllAmount(array_column($data['data'],'id'), BookingList::data_type_two);
         //获取发货信息
@@ -444,6 +453,7 @@ class PurchaseOrderService extends Service
             $data['data'][$key]['storehouse_title'] = $storehouse[$value['storehouse_id']] ?? '';
             $data['data'][$key]['supplier_title'] = $supplier_tmp['title'] ?? '';
             $data['data'][$key]['product'] = $product[$value['id']] ?? [];
+            $data['data'][$key]['payment_receipt_amount'] = $for_amount_list[$value['order_number']] ?? 0;
 
             //合同对应的金额数据
             $tmp = $money[$value['id']] ?? [];

app/Service/SalesOrderService.php

@@ -365,13 +365,13 @@ class SalesOrderService extends Service
 
         if(empty($orders)){
             $model = new PaymentReceipt();
-            $model->order_number = $data['order_number'];
-            $model->data_order_no = $order['data_order_no'];
+            $model->order_number = $order['order_number'];
+//            $model->data_order_no = $data['order_number'];
             $model->data_type = $order['data_type'];
             $model->type = $order['type'];
             $model->account = $order['account'] ?? 0;
             $model->pay_way = $order['pay_way'] ?? 0;
-            $model->amount = $order['amount'] ?? 0;
+//            $model->amount = $order['amount'] ?? 0;
             $model->mark = $order['mark'] ?? '';
             $model->crt_id = $user['id'];
             $model->depart_id = $data['depart_id'];
@@ -405,6 +405,16 @@ class SalesOrderService extends Service
                 }
                 PaymentReceiptInfo::insert($insert);
             }
+            $insert = [];
+            $insert[] = [
+                'payment_receipt_id' => $model->id,
+                'data_order_no' => $data['order_number'],
+                'data_order_type' => $order['data_type'],
+                'amount' => $order['amount'],
+                'type' => PaymentReceiptInfo::type_three,
+                'crt_time' => $time,
+            ];
+            PaymentReceiptInfo::insert($insert);
         }else{
             $order = $data['payment_receipt'];
             $orders->type = $order['type'];
@@ -651,6 +661,8 @@ class SalesOrderService extends Service
 
         //收付款单信息
         $sales['payment_receipt_list'] = (new PaymentReceiptService())->getPaymentReceiptDataList($sales);
+        $sales['payment_receipt_list']['not_receipt_amount'] = $sales['contract_fee'] - $sales['payment_receipt_list']['receipt_amount'];
+        $sales['not_payment_receipt_amount'] = $sales['payment_receipt_list']['not_receipt_amount'];
 
         //详情里的收付款信息
 //        $sales['payment_receipt'] = (new PaymentReceiptService())->getPaymentReceiptDeatail($sales);
@@ -803,7 +815,7 @@ class SalesOrderService extends Service
             if(empty($data['payment_receipt']['amount'])) return [false,'回款金额不能为空'];
             $res = $this->checkNumber($data['payment_receipt']['amount']);
             if(! $res) return [false, '回款金额请输入不超过两位小数并且大于0的数值'];
-            if(! empty($data['payment_receipt']['payment_receipt_date'])) $data['payment_receipt_date'] = $this->changeDateToDate($data['payment_receipt']['payment_receipt_date']);
+            if(! empty($data['payment_receipt']['payment_receipt_date'])) $data['payment_receipt']['payment_receipt_date'] = $this->changeDateToDate($data['payment_receipt']['payment_receipt_date']);
         }
 
         if($is_add){
@@ -877,6 +889,9 @@ class SalesOrderService extends Service
             }
         }
 
+        $for_amount_list = [];
+        if(! empty($ergs['for_amount_list'])) $for_amount_list = (new PaymentReceiptService())->getPaymentReceiptDataCountList($data['data']);
+
         //获取分社订货合同关联的发货单
         $invoiceData = $this->getInvoiceOrderData($data['data']);
 
@@ -925,6 +940,7 @@ class SalesOrderService extends Service
             $tmp = $invoiceData[$value['id']] ?? [];
             $data['data'][$key]['invoice_arr'] = implode(',', $tmp);
             $data['data'][$key]['dispatch_company'] = $dispatch[$value['id']] ?? '';
+            $data['data'][$key]['payment_receipt_amount'] = $for_amount_list[$value['order_number']] ?? 0;
 
             //合同对应的金额数据
             $tmp = $money[$value['id']] ?? [];

app/Service/ScheduleService.php

@@ -491,7 +491,7 @@ class ScheduleService extends Service
             ->where('end_time', '<=', $endTimestamp)
             ->select('id')
             ->get()->toArray();
-        if(empty($schedule)) return [true, $return];
+        if(empty($schedule)) return [true, array_values($return)];
 
         $construction = Construction::where('del_time',0)
             ->whereIn('schedule_id',array_column($schedule,'id'))
@@ -515,7 +515,7 @@ class ScheduleService extends Service
 
         $construction = Construction::where('del_time',0)
             ->whereIn('id',$order_id)
-            ->select('id','order_number','crt_id')
+            ->select('id','order_number','crt_id','day_start_stamp','day_end_stamp')
             ->get()->toArray();
         if(empty($construction)) return [true, ""];
         $emp = Employee::whereIn('id',array_unique(array_column($construction,'crt_id')))
@@ -538,10 +538,14 @@ class ScheduleService extends Service
 
         $return = [];
         foreach ($construction as $value){
+            $str = "";
+            if(! empty($value['day_start_stamp']) && ! empty($value['day_end_stamp'])) $str = date('Y-m-d H:i',$value['day_start_stamp']) . '-' . date("H:i",$value['day_end_stamp']);
+
             $tmp = [
                 'order_number' => $value['order_number'],
                 'crt_name' => $emp[$value['crt_id']] ?? "",
                 'product' => $product_title[$value['id']],
+                'crt_time' => $str,
             ];
             $return[] = $tmp;
         }

config/header/34.php

@@ -47,10 +47,6 @@ return [
         'value' => '施工时间',
     ],
     [
-        'key' => 'order_type_title',
-        'value' => '订单类型',
-    ],
-    [
         'key' => 'state_title',
         'value' => '订单状态',
     ],

config/header/37.php

@@ -50,10 +50,10 @@ return [
         'key' => 'contract_fee',
         'value' => '合同金额',
     ],
-    [
-        'key' => 'fee',
-        'value' => '指派金额',
-    ],
+//    [
+//        'key' => 'fee',
+//        'value' => '指派金额',
+//    ],
 //    [
 //        'key' => 'fee1',
 //        'value' => '已收金额',
@@ -71,10 +71,6 @@ return [
 //        'value' => '最终金额',
 //    ],
     [
-        'key' => 'order_type_title',
-        'value' => '订单类型',
-    ],
-    [
         'key' => 'crt_time',
         'value' => '创建时间',
     ],
@@ -94,10 +90,10 @@ return [
         'key' => 'invoice_arr',
         'value' => '发货单号',
     ],
-    [
-        'key' => 'dispatch_company',
-        'value' => '派遣门店',
-    ],
+//    [
+//        'key' => 'dispatch_company',
+//        'value' => '派遣门店',
+//    ],
     [
         'key' => 'pay_way_title',
         'value' => '付款方式',

config/header/43.php

@@ -71,10 +71,6 @@ return [
 //        'value' => '最终金额',
 //    ],
     [
-        'key' => 'order_type_title',
-        'value' => '订单类型',
-    ],
-    [
         'key' => 'crt_time',
         'value' => '创建时间',
     ],

routes/api.php

@@ -295,4 +295,7 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('getTableTitleXls','Api\ImportController@getTableTitleXls');
     //导入
     $route->any('importAll','Api\ImportController@importAll');
+
+    //导出统一方法
+    $route->any('exportFile', 'Api\ExportFileController@exportFile');
 });

routes/wx.php

@@ -88,4 +88,7 @@ Route::group(['middleware'=> ['checkWx']],function ($route){
     //设置列表
     $route->any('productInventorySetList', 'Api\ProductInventoryController@productInventorySetList');
     $route->any('getMySetting', 'Api\ProductInventoryController@getMySetting');
+
+    $route->any('getSettingTotal', 'Api\ScheduleController@getSettingTotal');
+    $route->any('getSettingGetDetail', 'Api\ScheduleController@getSettingGetDetail');
 });