cqpCow há 1 ano atrás
pai
commit
aef12d797b

+ 4 - 0
app/Service/ConstructionService.php

@@ -706,6 +706,10 @@ class ConstructionService extends Service
 //            if($bool) return [false,'合同:' . $sale['order_number'] . '在' . $start_time . '——' . $end_time . '已下施工单'];
         }else{
             if(empty($data['id'])) return [false,'ID不能为空'];
+            $construction = Construction::where('del_time',0)
+                ->where('id',$data['id'])->first();
+            if(empty($construction)) return [false, '施工单单据不存在或已被删除'];
+            if($construction->state > Construction::STATE_ZERO) return [false,'请确认施工单单据状态,修改失败'];
 //            $bool = Construction::where('del_time',0)
 //                ->where('id','<>',$data['id'])
 //                ->where('sales_order_id',$data['sales_order_id'])

+ 589 - 187
app/Service/ExportFileService.php

@@ -19,11 +19,15 @@ use App\Model\ConstructionOrder;
 use App\Model\ConstructionOrderImg;
 use App\Model\ConstructionOrderSub;
 use App\Model\ConstructionProductInfo;
+use App\Model\Customer;
+use App\Model\Depart;
 use App\Model\Employee;
 use App\Model\FoursShop;
 use App\Model\InOutRecord;
 use App\Model\Inventory;
 use App\Model\InventorySub;
+use App\Model\InvoiceOrder;
+use App\Model\InvoiceOrderInfo;
 use App\Model\Material;
 use App\Model\MaterialCharge;
 use App\Model\MaterialChargeSub;
@@ -38,6 +42,8 @@ use App\Model\PaymentReceipt;
 use App\Model\PaymentReceiptInfo;
 use App\Model\PurchaseOrder;
 use App\Model\PurchaseOrderInfo;
+use App\Model\ReturnExchangeOrder;
+use App\Model\ReturnExchangeOrderProductInfo;
 use App\Model\RollFilm;
 use App\Model\RollFilmCombine;
 use App\Model\RollFilmCompany;
@@ -49,6 +55,7 @@ use App\Model\Storehouse;
 use App\Model\Supplier;
 use App\Model\Transfer;
 use App\Model\TransferSub;
+use App\Model\U8Job;
 use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Facades\Excel;
 
@@ -70,6 +77,8 @@ class ExportFileService extends Service
         self::type_three => 'three',
         self::type_four => 'four',
         self::type_five => 'five',
+        self::type_six => 'six',
+        self::type_seven => 'seven',
     ];
 
     protected static $fuc_name = [
@@ -78,6 +87,8 @@ class ExportFileService extends Service
         self::type_three => '收付款单',
         self::type_four => '施工单',
         self::type_five => '采购单',
+        self::type_six => '退换货单',
+        self::type_seven => '发货单',
     ];
 
     public static $filename = "";
@@ -106,10 +117,13 @@ class ExportFileService extends Service
 
         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')
+            ->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','customer_id')
             ->orderBy('id','desc')
             ->chunk(500,function ($data) use(&$return){
-                $data = $data->toArray();
+                $data = Collect($data)->map(function ($object) {
+                    return (array)$object;
+                })->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')
@@ -118,17 +132,31 @@ class ExportFileService extends Service
                 $id = [];
                 foreach ($data as $value){
                     $id[] = [
-                        'id' => $value->id,
-                        'invoice_state' => $value->invoice_state,
+                        'id' => $value['id'],
+                        'invoice_state' => $value['invoice_state'],
                     ];
                 }
-                $invoiceData = (new SalesOrderService())->getInvoiceOrderData($id);
+                $service = new SalesOrderService();
+                $invoiceData = $service->getInvoiceOrderData($id);
+
+                //订单状态数据组织
+                $state_array = $service->getStateMake($data);
+
+                //同步用友信息
+                $u8 = (new U8ServerService())->getMessage($data_id,U8Job::two);
 
-                $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')));
+                //关联施工单号
+                $construction_array = $service->getConstruction($data_id);
+
+                $array = array_unique(array_merge_recursive(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();
 
+                $customer = Customer::whereIn('id',array_unique(array_column($data,'customer_id')))
+                    ->pluck('title','id')
+                    ->toArray();
+
                 $product = [];
                 $sales_p_info = SalesOrderProductInfo::where('del_time',0)
                     ->whereIn('sales_order_id',$data_id)
@@ -152,104 +180,158 @@ class ExportFileService extends Service
 
                 $flag = [];
                 foreach ($data as $value){
-                    $tmp = $invoiceData[$value->id] ?? [];
+                    $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){
-                        $state = SalesOrder::$state[$value->state] ?? '';
+                    $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']);
+                    $crt_name = $emp_map[$value['crt_id']] ?? "";
+                    $value['crt_name'] = $crt_name;
+                    $sign_time = empty($value['sign_time']) ? '' : date('Y-m-d',$value['sign_time']);
+                    $product_tmp = $product[$value['id']] ?? [];
+                    $state = $service->makeState($value, $state_array);
+                    $customer_tmp = $customer[$value['customer_id']] ?? '';
+                    $u8_message = $u8[$value['id']] ?? '';
+                    $construction_no = $construction_array[$value['id']] ?? '';
+
+                    if(empty($product_tmp)){
+                        //(审核后)
+                        //已收
+                        $one = $for_amount_list1[$value['order_number'] . PaymentReceipt::type_one] ?? 0;
+                        $red = $for_amount_list1[$value['order_number'] . PaymentReceipt::type_three] ?? 0;
+                        $return_exchange_amount1 = $getDifferentAmountALL1[$value['id']] ?? 0;
+                        $bad = bcsub($return_exchange_amount1 ,$red,2);
+                        //已收金额
+                        $fee1 = bcsub($one ,$red,2);
+                        //未收金额
+                        $fee2 = bcsub(bcsub(bcsub($value['contract_fee'], $fee1,2), $bad, 2),$red,2);
+                        //红冲金额
+                        $fee3 = $red;
+                        //坏账金额
+                        $fee4 = $bad;
+
+                        $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,
+                            'customer_title' => $customer_tmp,
+                            'product_total' => $value['product_total'],
+                            'other_fee' => $value['other_fee'],
+                            'discount_fee' => $value['discount_fee'],
+                            'contract_fee' => $value['contract_fee'],
+                            'fee1' => $fee1,
+                            'fee2' => $fee2,
+                            'fee3' => $fee3,
+                            'fee4' => $fee4,
+                            'crt_time' => $crt_time,
+                            'crt_name' => $crt_name,
+                            'state_title' => $state,
+                            'invoice_state_title' => SalesOrder::$invoice_state[$value['invoice_state']] ?? '',
+                            'invoice_arr' => $invoice_arr,
+                            'u8' => $u8_message,
+                            'con_no' => $construction_no,
+                            'product_title' => "",
+                            'product_code' => "",
+                            'product_size' => "",
+                            'product_rate' => "",
+                            'product_price' => "",
+                            'product_num' => "",
+                            'product_final_amount' => "",
+                        ];
                     }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' => "",
-                                'fee1' => "",
-                                'fee2' => "",
-                                'fee3' => "",
-                                'fee4' => "",
-                                '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'];
-
-                            //(审核后)
-                            //已收
-                            $one = $for_amount_list1[$value->order_number . PaymentReceipt::type_one] ?? 0;
-                            $red = $for_amount_list1[$value->order_number . PaymentReceipt::type_three] ?? 0;
-                            $return_exchange_amount1 = $getDifferentAmountALL1[$value->id] ?? 0;
-                            $bad = bcsub($return_exchange_amount1 ,$red,2);
-                            //已收金额
-                            $fee1 = bcsub($one ,$red,2);
-                            //未收金额
-                            $fee2 = bcsub(bcsub(bcsub($value->contract_fee, $fee1,2), $bad, 2),$red,2);
-                            //红冲金额
-                            $fee3 = $red;
-                            //坏账金额
-                            $fee4 = $bad;
-
-                            $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,
-                                'fee1' => $fee1,
-                                'fee2' => $fee2,
-                                'fee3' => $fee3,
-                                'fee4' => $fee4,
-                                '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'],
-                            ];
+                        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' => "",
+                                    'customer_title' => "",
+                                    'product_total' => "",
+                                    'other_fee' => "",
+                                    'discount_fee' => "",
+                                    'contract_fee' => "",
+                                    'fee1' => "",
+                                    'fee2' => "",
+                                    'fee3' => "",
+                                    'fee4' => "",
+                                    'crt_time' => "",
+                                    'crt_name' => "",
+                                    'state_title' => "",
+                                    'invoice_state_title' =>"",
+                                    'invoice_arr' => "",
+                                    'u8' => "",
+                                    'con_no' => "",
+                                    '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'];
+
+                                //(审核后)
+                                //已收
+                                $one = $for_amount_list1[$value['order_number'] . PaymentReceipt::type_one] ?? 0;
+                                $red = $for_amount_list1[$value['order_number'] . PaymentReceipt::type_three] ?? 0;
+                                $return_exchange_amount1 = $getDifferentAmountALL1[$value['id']] ?? 0;
+                                $bad = bcsub($return_exchange_amount1 ,$red,2);
+                                //已收金额
+                                $fee1 = bcsub($one ,$red,2);
+                                //未收金额
+                                $fee2 = bcsub(bcsub(bcsub($value['contract_fee'], $fee1,2), $bad, 2),$red,2);
+                                //红冲金额
+                                $fee3 = $red;
+                                //坏账金额
+                                $fee4 = $bad;
+
+                                $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,
+                                    'customer_title' => $customer_tmp,
+                                    'product_total' => $value['product_total'],
+                                    'other_fee' => $value['other_fee'],
+                                    'discount_fee' => $value['discount_fee'],
+                                    'contract_fee' => $value['contract_fee'],
+                                    'fee1' => $fee1,
+                                    'fee2' => $fee2,
+                                    'fee3' => $fee3,
+                                    'fee4' => $fee4,
+                                    'crt_time' => $crt_time,
+                                    'crt_name' => $crt_name,
+                                    'state_title' => $state,
+                                    'invoice_state_title' => SalesOrder::$invoice_state[$value['invoice_state']] ?? '',
+                                    'invoice_arr' => $invoice_arr,
+                                    'u8' => $u8_message,
+                                    'con_no' => $construction_no,
+                                    '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 = ['合同单号','销售类型','产品类型','签订时间','平台单号','平台类型','产品合计','其他费用','优惠金额','合同金额','已收金额','未收金额','红冲金额','坏账金额','创建时间','创建人','订单状态','发货状态','发货单号','付款方式','产品名称','产品编码','产品规格','产品税率','产品单价','产品数量','产品合同金额'];
+        $header = ['合同单号','销售类型','产品类型','签订时间','平台单号','平台类型','客户名称','产品合计','其他费用','优惠金额','合同金额','已收金额','未收金额','红冲金额','坏账金额','创建时间','创建人','订单状态','发货状态','发货单号','同步U8信息','施工单号','产品名称','产品编码','产品规格','产品税率','产品单价','产品数量','产品合同金额'];
 
         return $this->saveExportData($return,$header);
     }
@@ -262,26 +344,28 @@ class ExportFileService extends Service
 
         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')
+            ->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','customer_id')
             ->orderBy('id','desc')
             ->chunk(500,function ($data) use(&$return){
-                $data = $data->toArray();
+                $data = Collect($data)->map(function ($object) {
+                    return (array)$object;
+                })->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,
+                        'id' => $value['id'],
+                        'invoice_state' => $value['invoice_state'],
+                        'state' => $value['state'],
                     ];
                 }
-                $invoiceData = (new SalesOrderService())->getInvoiceOrderData($id);
+                $service = new SalesOrderService();
+                $invoiceData = $service->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')));
+                $array = array_unique(array_merge_recursive(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();
@@ -313,27 +397,41 @@ class ExportFileService extends Service
                 }
 
                 //分派的总社或分社
-                $dispatch = (new SalesOrderService())->getDispatchData($id);
+                $dispatch = $service->getDispatchData($id);
 
                 //金额
                 list($for_amount_list, $for_amount_list1) = (new PaymentReceiptService())->getPaymentReceiptDataCountList(array_column($data,'order_number'));
-                list($getDifferentAmountALL,$getDifferentAmountALL1) = (new ReturnExchangeOrderService())->getDifferentAmountALLNew(array_column($data,'id'));
+                list($getDifferentAmountALL,$getDifferentAmountALL1) = (new ReturnExchangeOrderService())->getDifferentAmountALLNew($data_id);
+
+                //订单状态数据组织
+                $state_array = $service->getStateMake($data);
+
+                //同步用友信息
+                $u8 = (new U8ServerService())->getMessage($data_id,U8Job::two);
+
+                //关联施工单号
+                $construction_array = $service->getConstruction($data_id);
+
+                $customer = Customer::whereIn('id',array_unique(array_column($data,'customer_id')))
+                    ->pluck('title','id')
+                    ->toArray();
 
                 $flag = [];
                 foreach ($data as $value){
-                    $tmp = $invoiceData[$value->id] ?? [];
+                    $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){
-                        $state = SalesOrder::$state[$value->state] ?? '';
-                    }else{
-                        $state = SalesOrder::$state2[$value->state] ?? '';
-                    }
+                    $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']);
+                    $crt_name = $emp_map[$value['crt_id']] ?? "";
+                    $value['crt_name'] = $crt_name;
+                    $sign_time = empty($value['sign_time']) ? '' : date('Y-m-d',$value['sign_time']);
+                    $product_tmp = $product[$value['id']] ?? [];
+                    $state = $service->makeState($value, $state_array);
+                    $customer_tmp = $customer[$value['customer_id']] ?? '';
+                    $u8_message = $u8[$value['id']] ?? '';
+                    $construction_no = $construction_array[$value['id']] ?? '';
 
                     foreach ($product_tmp as $val){
                         if(in_array($val['sales_order_id'], $flag)){
@@ -344,6 +442,7 @@ class ExportFileService extends Service
                                 'sign_time' => "",
                                 'plat_order' => "",
                                 'plat_type_title' => "",
+                                'customer_title' => "",
                                 'product_total' => "",
                                 'other_fee' => "",
                                 'discount_fee' => "",
@@ -359,7 +458,8 @@ class ExportFileService extends Service
                                 'state_title' => "",
                                 'invoice_state_title' =>"",
                                 'invoice_arr' => "",
-                                'pay_way' => "",
+                                'u8' => "",
+                                'con_no' => "",
                                 'product_title' => $val['title'],
                                 'product_code' => $val['code'],
                                 'product_size' => $val['size'],
@@ -373,42 +473,44 @@ class ExportFileService extends Service
 
                             //(审核后)
                             //已收
-                            $one = $for_amount_list1[$value->order_number . PaymentReceipt::type_one] ?? 0;
-                            $red = $for_amount_list1[$value->order_number . PaymentReceipt::type_three] ?? 0;
-                            $return_exchange_amount1 = $getDifferentAmountALL1[$value->id] ?? 0;
+                            $one = $for_amount_list1[$value['order_number'] . PaymentReceipt::type_one] ?? 0;
+                            $red = $for_amount_list1[$value['order_number'] . PaymentReceipt::type_three] ?? 0;
+                            $return_exchange_amount1 = $getDifferentAmountALL1[$value['id']] ?? 0;
                             $bad = bcsub($return_exchange_amount1 ,$red,2);
                             //已收金额
                             $fee1 = bcsub($one ,$red,2);
                             //未收金额
-                            $fee2 = bcsub(bcsub(bcsub($value->contract_fee, $fee1,2), $bad, 2),$red,2);
+                            $fee2 = bcsub(bcsub(bcsub($value['contract_fee'], $fee1,2), $bad, 2),$red,2);
                             //红冲金额
                             $fee3 = $red;
                             //坏账金额
                             $fee4 = $bad;
 
                             $return[] = [
-                                'order_number' => $value->order_number,
+                                '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_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] ?? '',
+                                'customer_title' => $customer_tmp,
+                                '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']] ?? '',
                                 'fee1' => $fee1,
                                 'fee2' => $fee2,
                                 'fee3' => $fee3,
                                 'fee4' => $fee4,
                                 'crt_time' => $crt_time,
-                                'crt_name' => $emp_map[$value->crt_id] ?? "",
+                                'crt_name' => $crt_name,
                                 'state_title' => $state,
-                                'invoice_state_title' => SalesOrder::$invoice_state[$value->invoice_state] ?? '',
+                                'invoice_state_title' => SalesOrder::$invoice_state[$value['invoice_state']] ?? '',
                                 'invoice_arr' => $invoice_arr,
-                                'pay_way' => $basic_map[$value->pay_way] ?? "",
+                                'u8' => $u8_message,
+                                'con_no' => $construction_no,
                                 'product_title' => $val['title'],
                                 'product_code' => $val['code'],
                                 'product_size' => $val['size'],
@@ -422,7 +524,7 @@ class ExportFileService extends Service
                 }
             });
 
-        $header = ['合同单号','销售类型','产品类型','签订时间','平台单号','平台类型','产品合计','其他费用','优惠金额','合同金额','指派金额','派遣门店','已收金额','未收金额','红冲金额','坏账金额','创建时间','创建人','订单状态','发货状态','发货单号','付款方式','产品名称','产品编码','产品规格','产品税率','产品单价','产品数量','产品合同金额'];
+        $header = ['合同单号','销售类型','产品类型','签订时间','平台单号','平台类型','客户名称','产品合计','其他费用','优惠金额','合同金额','指派金额','派遣门店','已收金额','未收金额','红冲金额','坏账金额','创建时间','创建人','订单状态','发货状态','发货单号','同步用友信息','施工单号','产品名称','产品编码','产品规格','产品税率','产品单价','产品数量','产品合同金额'];
 
         return $this->saveExportData($return,$header);
     }
@@ -438,7 +540,10 @@ class ExportFileService extends Service
             ->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();
+                $data = Collect($data)->map(function ($object) {
+                    return (array)$object;
+                })->toArray();
+
                 $emp_map = Employee::whereIn('id',array_unique(array_column($data,'crt_id')))
                     ->pluck('emp_name','id')
                     ->toArray();
@@ -458,16 +563,20 @@ class ExportFileService extends Service
                         'amount' => $value['amount']
                     ];
                 }
+                //订单状态数据组织
+                $service = new PaymentReceiptService();
+                $state_array = $service->getStateMake($data);
 
                 $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] ?? [];
+                    $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']);
+                    $crt_name = $emp_map[$value['crt_id']] ?? "";
+                    $value['crt_name'] = $crt_name;
+                    $payment_receipt_date= empty($value['payment_receipt_date']) ? '' : date('Y-m-d',$value['payment_receipt_date']);
+                    $state_title = $service->makeState($value, $state_array);
+                    $product_tmp = $map[$value['id']] ?? [];
 
                     foreach ($product_tmp as $val){
                         if(in_array($val['payment_receipt_id'], $flag)){
@@ -488,15 +597,15 @@ class ExportFileService extends Service
                         }else{
                             $flag[] = $val['payment_receipt_id'];
                             $return[] = [
-                                'order_number' => $value->order_number,
+                                '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] ?? '',
+                                'type' => PaymentReceipt::$model_type[$value['type']] ?? '',
+                                'data_type' => PaymentReceipt::$data_type[$value['data_type']] ?? '',
                                 'payment_receipt_date' => $payment_receipt_date,
-                                'mark' => $value->mark,
+                                'mark' => $value['mark'],
                                 'crt_time' => $crt_time,
-                                'crt_name' => $emp_map[$value->crt_id] ?? "",
+                                'crt_name' => $crt_name,
                                 'state_title' => $state_title,
                                 'data_order_no' => $val['data_order_no'],
                                 'amount' => $val['amount'],
@@ -522,13 +631,16 @@ class ExportFileService extends Service
             ->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',"construction_fee")
             ->orderBy('id','desc')
             ->chunk(500,function ($data) use(&$return){
-                $data = $data->toArray();
+                $data = Collect($data)->map(function ($object) {
+                    return (array)$object;
+                })->toArray();
                 $emp_map = Employee::whereIn('id',array_unique(array_column($data,'crt_id')))
                     ->pluck('emp_name','id')
                     ->toArray();
+                $data_id = array_unique(array_column($data,'id'));
                 $construction_info = ConstructionInfo::where('del_time',0)
                     ->where('type',ConstructionInfo::type_three)
-                    ->whereIn('construction_id',array_unique(array_column($data,'id')))
+                    ->whereIn('construction_id',$data_id)
                     ->select('construction_id','employee_id')
                     ->get()->toArray();
                 $emp_map2 = Employee::whereIn('id',array_unique(array_column($construction_info,'employee_id')))
@@ -557,7 +669,7 @@ class ExportFileService extends Service
 
                 $product = [];
                 $p_info = ConstructionProductInfo::where('del_time',0)
-                    ->whereIn('construction_id',array_unique(array_column($data,'id')))
+                    ->whereIn('construction_id',$data_id)
                     ->get()->toArray();
                 $map = (new ProductService())->getProductDetail(array_column($p_info,'product_id'));
                 foreach ($p_info as $value){
@@ -570,21 +682,27 @@ class ExportFileService extends Service
                     $product[$value['construction_id']][] = $value;
                 }
 
+                //订单状态数据组织
+                $service = new ConstructionService();
+                $state_array = $service->getStateMake($data);
+
                 $flag = [];
                 foreach ($data as $value){
-                    $tmp_sales = $sales_map[$value->sales_order_id] ?? [];
-                    $handover_time = $value->handover_time ? date("Y-m-d") : "";
+                    $tmp_sales = $sales_map[$value['sales_order_id']] ?? [];
+                    $handover_time = $value['handover_time'] ? date("Y-m-d",$value['handover_time']) : "";
                     $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) : '';
+                    $crt_time = empty($value['crt_time']) ? '' : date('Y-m-d',$value['crt_time']);
+                    $crt_name = $emp_map[$value['crt_id']] ?? "";
+                    $value['crt_name'] = $crt_name;
+                    $install_position_title = $basic_map[$value['install_position']] ?? '';
+                    $install_method_title = $basic_map[$value['install_method']] ?? '';
+                    $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] ?? '';
-                    $product_tmp = $product[$value->id] ?? [];
-                    $emp_tmp = $construction_info_map[$value->id] ?? "";
+                    $state = $service->makeState($value, $state_array);
+                    $product_tmp = $product[$value['id']] ?? [];
+                    $emp_tmp = $construction_info_map[$value['id']] ?? "";
                     foreach ($product_tmp as $val){
                         if(in_array($val['construction_id'], $flag)){
                             $return[] = [
@@ -612,20 +730,20 @@ class ExportFileService extends Service
                         }else{
                             $flag[] = $val['construction_id'];
                             $return[] = [
-                                'order_number' => $value->order_number,
-                                'title' => $value->title,
+                                'order_number' => $value['order_number'],
+                                'title' => $value['title'],
                                 'sales_order_title' => $sales_order_number,
-                                'money' => $value->construction_fee,
+                                'money' => $value['construction_fee'],
                                 'emp' => $emp_tmp,
                                 'handover_time' => $handover_time,
                                 'install_method' => $install_method_title,
                                 'install_position' => $install_position_title,
-                                'mark' => $value->mark,
+                                'mark' => $value['mark'],
                                 'urgency' => $urgency_title,
                                 'construction_period' => $construction_period,
                                 'state_title' => $state,
                                 'crt_time' => $crt_time,
-                                'crt_name' => $emp_map[$value->crt_id] ?? "",
+                                'crt_name' => $crt_name,
                                 'product_title' => $val['title'],
                                 'product_code' => $val['code'],
                                 'product_size' => $val['size'],
@@ -651,10 +769,13 @@ class ExportFileService extends Service
 
         DB::table('purchase_order')
             ->whereIn('id', $id)
-            ->select('order_number','id','depart_id','top_depart_id','mark','crt_time','state','crt_id','order_type','sales_order_id','supplier','purchase_id','purchase_total','discount_fee','other_fee','total','storehouse_id')
+            ->select('order_number','id','depart_id','top_depart_id','mark','crt_time','state','crt_id','order_type','sales_order_id','supplier','purchase_id','purchase_total','discount_fee','other_fee','total','storehouse_id','invoice_state')
             ->orderBy('id','desc')
             ->chunk(500,function ($data) use(&$return){
-                $data = $data->toArray();
+                $data = Collect($data)->map(function ($object) {
+                    return (array)$object;
+                })->toArray();
+
                 $array = array_unique(array_merge_recursive(array_column($data,'crt_id'),array_column($data,'purchase_id')));
                 $emp_map = Employee::whereIn('id',$array)
                     ->pluck('emp_name','id')
@@ -683,20 +804,30 @@ class ExportFileService extends Service
                 //获取发货信息
 //                $invoice_map = (new InvoiceOrderService())->getInvoiceData($data);
 
+                //订单状态数据组织
+                $service = new PurchaseOrderService();
+                $state_array = $service->getStateMake($data);
+
                 $flag = [];
                 foreach ($data as $value){
-                    $tmp_supplier = $supplier[$value->supplier] ?? "";
-                    $crt_name = $emp_map[$value->crt_id] ?? "";
-                    $purchase_name = $emp_map[$value->purchase_id] ?? "";
-                    $sales_order = $sales[$value->sales_order_id] ?? "";
-                    $crt_time = empty($value->crt_time) ? '' : date('Y-m-d',$value->crt_time);
-                    //发货信息
-                    $state_title = PurchaseOrder::$name[$value->state] ?? '';
-//                    $invoice_state = "未发货";
+                    $tmp_supplier = $supplier[$value['supplier']] ?? "";
+                    $purchase_name = $emp_map[$value['purchase_id']] ?? "";
+                    $sales_order = $sales[$value['sales_order_id']] ?? "";
+                    $crt_time = empty($value['crt_time']) ? '' : date('Y-m-d',$value['crt_time']);
+                    $crt_name = $emp_map[$value['crt_id']] ?? "";
+                    $value['crt_name'] = $crt_name;
+                    $state_title = $service->makeState($value, $state_array);
+                    if(in_array($value['order_type'], [PurchaseOrder::Order_type_three,PurchaseOrder::Order_type_four])){
+                        $invoice_state = PurchaseOrder::$invoice_name[$value['invoice_state']] ?? "";
+                        $state_message = "订单状态:" . $state_title . "\n"."是否发货:" . $invoice_state;
+                    }else{
+                        $state_message = "订单状态:" . $state_title;
+                    }
+                    $product_tmp = $product[$value['id']] ?? [];
+
+                    //                    $invoice_state = "未发货";
 //                    if(! empty($invoice_map[$value->order_number])) $invoice_state = implode(',',$invoice_map[$value->order_number]);
 //                    $state_message = "订单状态:" . $state_title . "\n"."是否发货:" . $invoice_state;
-                    $state_message = $state_title;
-                    $product_tmp = $product[$value->id] ?? [];
 
                     foreach ($product_tmp as $val){
                         if(in_array($val['purchase_order_id'], $flag)){
@@ -721,15 +852,15 @@ class ExportFileService extends Service
                         }else{
                             $flag[] = $val['purchase_order_id'];
                             $return[] = [
-                                'order_number' => $value->order_number,
+                                'order_number' => $value['order_number'],
                                 'sales_order_number' => $sales_order,
                                 'purchase_name' => $purchase_name,
-                                'product_total' => $value->total,
+                                'product_total' => $value['total'],
                                 'supplier' => $tmp_supplier,
-                                'purchase_amount' => $value->purchase_total,
-                                'other_fee' => $value->other_fee,
-                                'discount_fee' => $value->discount_fee,
-                                'state_title' => $state_title,
+                                'purchase_amount' => $value['purchase_total'],
+                                'other_fee' => $value['other_fee'],
+                                'discount_fee' => $value['discount_fee'],
+                                'state_title' => $state_message,
                                 'crt_time' => $crt_time,
                                 'crt_name' => $crt_name,
                                 'product_title' => $val['title'],
@@ -743,7 +874,278 @@ class ExportFileService extends Service
                 }
             });
 
-        $header = ['采购单号','关联单号','采购人','产品合计','供应商','采购金额','其他费用','优惠金额','订单状态','创建时间','创建人','产品名称','产品编码','产品规格','产品单价','产品数量'];
+        $header = ['采购单号','关联单号','采购人','产品合计','供应商','采购金额','其他费用','优惠金额','状态','创建时间','创建人','产品名称','产品编码','产品规格','产品单价','产品数量'];
+
+        return $this->saveExportData($return,$header);
+    }
+
+    public function six($ergs){
+        $id = $ergs['id'];
+
+        // 导出数据
+        $return = [];
+
+        DB::table('return_exchange_order')
+            ->whereIn('id', $id)
+            ->select('id','order_number','data_id','difference_amount','state','crt_time','crt_id','mark','model_type','storehouse_id','type')
+            ->orderBy('id','desc')
+            ->chunk(500,function ($data) use(&$return){
+                $data = Collect($data)->map(function ($object) {
+                    return (array)$object;
+                })->toArray();
+                $emp_map = Employee::whereIn('id',array_unique(array_column($data,'crt_id')))
+                    ->pluck('emp_name','id')
+                    ->toArray();
+                $data_id = array_unique(array_column($data,'id'));
+
+                $sales = $purchase = [];
+                foreach ($data as $value){
+                    if($value['type'] == ReturnExchangeOrder::Order_type){
+                        $sales[] = $value['data_id'];
+                    }elseif($value['type'] == ReturnExchangeOrder::Order_type2){
+                        $purchase[] = $value['data_id'];
+                    }
+                }
+                $sales = SalesOrder::whereIn('id',$sales)->pluck('order_number','id')->toArray();
+                $purchase = PurchaseOrder::whereIn('id',$purchase)->pluck('order_number','id')->toArray();
+//                $storehouse = Storehouse::whereIn('id',array_unique(array_column($data['data'],'storehouse_id')))
+//                    ->pluck('title','id')
+//                    ->toArray();
+
+                $product = [];
+                $p_info = ReturnExchangeOrderProductInfo::where('del_time',0)
+                    ->whereIn('return_exchange_id',$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['return_exchange_id']][] = $value;
+                }
+
+                //订单状态数据组织
+                $service = new ReturnExchangeOrderService();
+                $state_array = $service->getStateMake($data);
+
+                $flag = [];
+                foreach ($data as $value){
+                    $crt_time = $value['crt_time'] ? date("Y-m-d H:i:s",$value['crt_time']) : '';
+                    $crt_name = $emp_map[$value['crt_id']] ?? '';
+                    $value['crt_name'] = $crt_name;
+                    $state_title = $service->makeState($value,$state_array);
+                    $title = "" ;
+                    if($value['type'] == ReturnExchangeOrder::Order_type){
+                        $title = $sales[$value['data_id']] ?? "";
+                    }elseif($value['type'] == ReturnExchangeOrder::Order_type2){
+                        $title = $purchase[$value['data_id']] ?? "";
+                    }
+                    $model_type_title = ReturnExchangeOrder::$model_type_name[$value['model_type']] ?? "";
+//                    $storehouse_title = $storehouse[$value['storehouse_id']] ?? '';
+                    $product_tmp = $product[$value['id']] ?? [];
+                    if(empty($product_tmp)){
+                        $return[] = [
+                            'order_number' => $value['order_number'],
+                            'title' => $title,
+                            'type' => $model_type_title,
+                            'difference_amount' => $value['difference_amount'],
+                            'mark' => $value['mark'],
+                            'state_title' => $state_title,
+                            'crt_time' => $crt_time,
+                            'crt_name' => $crt_name,
+                            'product_title' => '',
+                            'product_code' => '',
+                            'product_size' => '',
+                            'product_price' => '',
+                            'product_num' => '',
+                            'product_final_amount' => '',
+                        ];
+                    }else{
+                        foreach ($product_tmp as $val){
+                            if(in_array($val['return_exchange_id'], $flag)){
+                                $return[] = [
+                                    'order_number' => '',
+                                    'title' => '',
+                                    'type' => '',
+                                    'difference_amount' => '',
+                                    'mark' => '',
+                                    'state_title' => '',
+                                    'crt_time' => '',
+                                    'crt_name' => '',
+                                    'product_title' => $val['title'],
+                                    'product_code' => $val['code'],
+                                    'product_size' => $val['size'],
+                                    'product_price' => $val['return_exchange_price'],
+                                    'product_num' => $val['number'],
+                                    'product_final_amount' => $val['final_amount'],
+                                ];
+                            }else{
+                                $flag[] = $val['return_exchange_id'];
+                                $return[] = [
+                                    'order_number' => $value['order_number'],
+                                    'title' => $title,
+                                    'type' => $model_type_title,
+                                    'difference_amount' => $value['difference_amount'],
+                                    'mark' => $value['mark'],
+                                    'state_title' => $state_title,
+                                    'crt_time' => $crt_time,
+                                    'crt_name' => $crt_name,
+                                    'product_title' => $val['title'],
+                                    'product_code' => $val['code'],
+                                    'product_size' => $val['size'],
+                                    'product_price' => $val['return_exchange_price'],
+                                    'product_num' => $val['number'],
+                                    'product_final_amount' => $val['final_amount'],
+                                ];
+                            }
+                        }
+                    }
+                }
+            });
+
+        $header = ['退换货单号','关联单号','单据类型','差异金额','备注','订单状态','创建时间','创建人','产品名称','产品编码','产品规格','产品单价','产品数量','产品金额'];
+
+        return $this->saveExportData($return,$header);
+    }
+
+    public function seven($ergs){
+        $id = $ergs['id'];
+
+        // 导出数据
+        $return = [];
+
+        DB::table('invoice_order')
+            ->whereIn('id', $id)
+            ->select('id','order_number','sales_order_id','depart_id','send','send_time','take','take_address','take_phone','logistics_company','logistics_number','crt_id','mark','state','crt_time','storehouse_id','top_depart_id')
+            ->orderBy('id','desc')
+            ->chunk(500,function ($data) use(&$return){
+                $data = Collect($data)->map(function ($object) {
+                    return (array)$object;
+                })->toArray();
+                $depart_id = array_unique(array_column($data,'depart_id'));
+                $depart_map = Depart::whereIn('id',$depart_id)
+                    ->pluck('title','id')
+                    ->toArray();
+
+                $emp_id = array_unique(array_merge_recursive(array_column($data,'crt_id'),array_column($data,'send')));
+                $emp_map = Employee::whereIn('id',$emp_id)
+                    ->pluck('emp_name','id')
+                    ->toArray();
+
+                $sales = SalesOrder::whereIn('id',array_unique(array_column($data,'sales_order_id')))->select('order_number','id','contact_order_no')->get()->toArray();
+                $sales = array_column($sales,null,'id');
+                $storehouse = Storehouse::whereIn('id',array_unique(array_column($data,'storehouse_id')))
+                    ->pluck('title','id')
+                    ->toArray();
+
+                $product = [];
+                $p_info = InvoiceOrderInfo::where('del_time',0)
+                    ->whereIn('invoice_id',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['invoice_id']][] = $value;
+                }
+
+                $flag = [];
+                foreach ($data as $value){
+                    $crt_time = $value['crt_time'] ? date("Y-m-d H:i:s",$value['crt_time']) : '';
+                    $crt_name = $emp_map[$value['crt_id']] ?? '';
+                    $value['crt_name'] = $crt_name;
+                    $depart_name = $depart_map[$value['depart_id']] ?? '';
+                    $send_name = $emp_map[$value['send']] ?? '';
+                    $state_title = InvoiceOrder::$name[$value['state']] ?? '';
+                    $tmp = $sales[$value['sales_order_id']] ?? [];
+                    $sales_order_number = $tmp['order_number'] ?? '';
+                    $purchase_order_number = $tmp['contact_order_no'] ?? '';
+                    $storehouse_title = $storehouse[$value['storehouse_id']] ?? '';
+
+                    $product_tmp = $product[$value['id']] ?? [];
+                    if(empty($product_tmp)){
+                        $return[] = [
+                            'order_number' => $value['order_number'],
+                            'title' => $sales_order_number,
+                            'fs_title' => $purchase_order_number,
+                            'storehouse_title' => $storehouse_title,
+                            'take' => $value['take'],
+                            'take_address' => $value['take_address'],
+                            'take_phone' => $value['take_phone'],
+                            'logistics_company' => $value['logistics_company'],
+                            'logistics_number' => $value['logistics_number'],
+                            'send' => $send_name,
+                            'mark' => $value['mark'],
+                            'state_title' => $state_title,
+                            'crt_time' => $crt_time,
+                            'crt_name' => $crt_name,
+                            'product_title' => '',
+                            'product_code' => '',
+                            'product_size' => '',
+                            'bar_code' => '',
+                            'product_num' => '',
+                        ];
+                    }else{
+                        foreach ($product_tmp as $val){
+                            if(in_array($val['invoice_id'], $flag)){
+                                $return[] = [
+                                    'order_number' => '',
+                                    'title' => '',
+                                    'fs_title' => '',
+                                    'storehouse_title' => '',
+                                    'take' => '',
+                                    'take_address' => '',
+                                    'take_phone' => '',
+                                    'logistics_company' => '',
+                                    'logistics_number' => '',
+                                    'send' => '',
+                                    'mark' => '',
+                                    'state_title' => '',
+                                    'crt_time' => '',
+                                    'crt_name' => '',
+                                    'product_title' => $val['title'],
+                                    'product_code' => $val['code'],
+                                    'product_size' => $val['size'],
+                                    'bar_code' => $val['bar_code'],
+                                    'product_num' => $val['number'],
+                                ];
+                            }else{
+                                $flag[] = $val['invoice_id'];
+                                $return[] = [
+                                    'order_number' => $value['order_number'],
+                                    'title' => $sales_order_number,
+                                    'fs_title' => $purchase_order_number,
+                                    'storehouse_title' => $storehouse_title,
+                                    'take' => $value['take'],
+                                    'take_address' => $value['take_address'],
+                                    'take_phone' => $value['take_phone'],
+                                    'logistics_company' => $value['logistics_company'],
+                                    'logistics_number' => $value['logistics_number'],
+                                    'send' => $send_name,
+                                    'mark' => $value['mark'],
+                                    'state_title' => $state_title,
+                                    'crt_time' => $crt_time,
+                                    'crt_name' => $crt_name,
+                                    'product_title' => $val['title'],
+                                    'product_code' => $val['code'],
+                                    'product_size' => $val['size'],
+                                    'bar_code' => $val['bar_code'],
+                                    'product_num' => $val['number'],
+                                ];
+                            }
+                        }
+                    }
+                }
+            });
+
+        $header = ['发货单号','关联单号','分社采购单号','发货仓库','收货人','收货地址','收货电话','物流公司','物流单号','发货人','备注','订单状态','创建时间','创建人','产品名称','产品编码','产品规格','产品条码','产品数量'];
 
         return $this->saveExportData($return,$header);
     }

+ 25 - 0
app/Service/PurchaseOrderService.php

@@ -396,6 +396,10 @@ class PurchaseOrderService extends Service
                 ->get()->toArray();
             $model->whereIn('purchase_id',array_unique(array_column($emp,'id')));
         }
+        if(! empty($data['get_for_purchase'])){
+            $model->whereIn('order_type',[PurchaseOrder::Order_type_three,PurchaseOrder::Order_type_four])
+                ->where('state',">=",PurchaseOrder::STATE_TWO);
+        }
 
         $list = $this->limit($model,'',$data);
         $list = $this->fillListData($list,$data,$user);
@@ -450,6 +454,10 @@ class PurchaseOrderService extends Service
             }
         }
 
+        //分社订货合同
+        $sales_array = [];
+        if(! empty($ergs['get_for_purchase'])) $sales_array = $this->fsdhOrder($data);
+
         list($for_amount_list, $for_amount_list1) = (new PaymentReceiptService())->getPaymentReceiptDataCountList(array_column($data['data'],'order_number'));
         list($getDifferentAmountALL,$getDifferentAmountALL1) = (new ReturnExchangeOrderService())->getDifferentAmountALLNew(array_column($data['data'],'id'),1);
 
@@ -468,6 +476,7 @@ class PurchaseOrderService extends Service
             $data['data'][$key]['purchase_name'] = $emp_map[$value['purchase_id']] ?? '';
             $data['data'][$key]['order_type_title'] = PurchaseOrder::$order_type[$value['order_type']] ?? '';
             $data['data'][$key]['sales_order_number'] = $sales[$value['sales_order_id']] ?? '';
+            $data['data'][$key]['fsdh_id'] = $sales_array[$value['order_number']] ?? 0;
             $data['data'][$key]['storehouse_title'] = $storehouse[$value['storehouse_id']] ?? '';
             $data['data'][$key]['supplier_title'] = $supplier_tmp['title'] ?? '';
             $data['data'][$key]['product'] = $product[$value['id']] ?? [];
@@ -516,6 +525,22 @@ class PurchaseOrderService extends Service
         return $data;
     }
 
+    public function fsdhOrder($data){
+        if(empty($data['data'])) return [];
+
+        $order_no = [];
+        foreach ($data['data'] as $value){
+            if(in_array($value['order_type'] , [PurchaseOrder::Order_type_three,PurchaseOrder::Order_type_four])) $order_no[] = $value['order_number'];
+        }
+        if(empty($order_no)) return [];
+
+        $sale_order = SalesOrder::where('del_time',0)
+            ->whereIn('contact_order_no', $order_no)
+            ->pluck('id','contact_order_no')
+            ->toArray();
+        return $sale_order;
+    }
+
     public function getStateMake($data){
         if(empty($data)) return [];
 

+ 1 - 1
app/Service/SalesOrderService.php

@@ -1522,7 +1522,7 @@ class SalesOrderService extends Service
             if(! isset($result[$value])) return [false, $value . '不存在或已被删除'];
             $tmp =  $result[$value];
             if($tmp['model_type'] != SalesOrder::Model_type_four) return [false, '单据'. $value . '非线上订单,操作失败'];
-            if($tmp['state'] != SalesOrder::State_zero) return [false, '请确认单据'. $value . '的状态,操作失败'];
+            if(! in_array($tmp['state'] , [SalesOrder::State_zero,SalesOrder::State_minus_one])) return [false, '请确认单据'. $value . '的状态,操作失败'];
         }
 
         SalesOrder::whereIn('order_number',$data['order_number'])->update(['state' => SalesOrder::State_two]);