Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/SaleReport.php

@@ -23,6 +23,7 @@ class SaleReport extends Base
     private $is_receive = [0 => '未收到', 1 => '收到'];
     private $bargain_order_status = [1 => '待主管审批', 2 => '待财务专员审批', 3 => '待财务主管审批', 4 => '审批通过', 5 => '主管驳回', 6 => '财务主管驳回', 7 => '已取消议价'];
     private $order_out_status = [0 => '待发货', 1 => '待库管发货', 2 => '已发货待收货', 3 => '已收货', 4 => '已全部退货'];
+    private $except_code = [0 => [1 => '退货', 2 => '补发'], 1 => [1 => '退货', 2 => '换货'],];//期望意愿
 
 
     //【一、管理报表】1.日报_列表
@@ -1096,6 +1097,7 @@ class SaleReport extends Base
         foreach ($data as $value) {
 
             $value['status'] = isset($this->all_order_return_status[$value['status']]) ? $this->all_order_return_status[$value['status']] : '';
+            $value['except_code'] = isset($this->except_code[$value['is_receive']][$value['except_code']]) ? $this->except_code[$value['is_receive']][$value['except_code']] : '';
             $value['is_receive'] = isset($this->is_receive[$value['is_receive']]) ? $this->is_receive[$value['is_receive']] : '';
             $value['apply_company'] = get_company_name_by_uid($value['apply_id']);
             $value['error_total_price'] = round($value['error_num'] * $value['sale_price'], 2);
@@ -1137,7 +1139,6 @@ class SaleReport extends Base
         foreach ($data as $value) {
 
             $value['处理状态'] = isset($this->all_order_return_status[$value['处理状态']]) ? $this->all_order_return_status[$value['处理状态']] : '';
-            $value['收货情况'] = isset($this->is_receive[$value['收货情况']]) ? $this->is_receive[$value['收货情况']] : '';
             $value['部门'] = get_company_name_by_uid($value['apply_id']);
             $value['异常金额'] = round($value['异常数量'] * $value['销售单价'], 2);
             if (!empty($value['itemid'])) {
@@ -1145,7 +1146,9 @@ class SaleReport extends Base
                 $value['一级组织'] = isset($customer_org1[1]) ? $customer_org1[1] : '';
                 $value['二级组织'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
             }
+            $value['期望意愿'] = isset($this->except_code[$value['收货情况']][$value['期望意愿']]) ? $this->except_code[$value['收货情况']][$value['期望意愿']] : '';
 
+            $value['收货情况'] = isset($this->is_receive[$value['收货情况']]) ? $this->is_receive[$value['收货情况']] : '';
 
             unset($value['apply_id']);
             unset($value['itemid']);