Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Filing.php

@@ -632,6 +632,8 @@ class Filing extends Base
                     'send_way' => $filing['send_way'],
                     'companyNo' => $filing['customerCode'],
                     'companyName' => $filing['customerName'],
+                     'order_createrid' => $filing['updaterid'],
+                    'order_creater' => $filing['updater'],
                     'proof_type' => '',
                     'proof_url' => '',
                     'order_type' => $order_type

app/admin/controller/Good.php

@@ -256,23 +256,14 @@ class Good extends Base
         if ($param['plat_code'] !== '') $where[] = ["b.plat_code", "like", '%' . $param['plat_code'] . '%'];
         if ($param['exam_status'] !== '') $where[] = ['b.exam_status', "=", $param['exam_status']];
         if ($param['brand_id'] !== "") $where[] = ['a.brand_id', "=", $param['brand_id']];
-//        $role = $this->checkRole();
-//        if (!empty($role['write'])) $where[] = ["a.createrid", "in", $role['write']];
-//        $role = $this->checkDataShare();
-//        $hand = resign_hand_user($this->uid,0);
-//        if (!empty($role[DataGroupModel::$type_全部])) {
-//        	$arr= array_unique(array_merge($hand,$role[DataGroupModel::$type_全部]));
-//			$where[] = ['b.createrid', 'in',$arr];
-//        }
+
         if ($param['company_name'] !== '') $where[] = ["a.createrid", 'in', get_company_item_user_by_name($param['company_name'])];
 
-//        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
-        if($param['relaComNo'] !== '') $where[]=['a.companyNo|a.supplierNo','=', $param['relaComNo']];
+    if($param['relaComNo'] !== '') $where[]=['a.companyNo|a.supplierNo','=', $param['relaComNo']];
 
         $count = Db::name('platform_youzan')
             ->alias("b")
             ->leftJoin("good_basic a", "a.spuCode=b.spuCode")
-//            ->leftJoin("depart_user u", "u.uid=a.createrid AND u.is_del=0")
             ->where($where)
             ->count();
 

app/admin/controller/Sale.php

@@ -1669,6 +1669,8 @@ class Sale extends Base
                 "send_way" => $goodinfo['send_way'],
                 "status" => 1,
                 "is_del" => 0,
+                'order_createrid' => $data['rm'],
+                 'order_creater' => $data['ri'],
                 "createrid" => $goodinfo['createrid'],
                 "creater" => $goodinfo['creater'],
                 "addtime" => date("Y-m-d H:i:s"),

app/admin/controller/SaleReport.php

@@ -485,11 +485,17 @@ class SaleReport extends Base
     //【一、管理报表】3.订单报表
     public function saleList()
     {
-        $param = $this->request->only(['token', 'start_date' => '', 'end_date' => '', 'page' => 1, 'size' => 15], 'post', 'trim');
-
+        $param = $this->request->only(['token','depart_id'=>'', 'plat_type'=>'', 'start_date' => '', 'end_date' => '', 'page' => 1, 'size' => 15], 'post', 'trim');
         $where = [['s.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['s.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
-
+        if ($param['depart_id'] != ''){
+					$uidArr = get_company_item_user_by_name('',$param['depart_id']);
+		            $where[] = ['a.apply_id', 'in',$uidArr];
+		 }
+        if ($param['plat_type'] !== ''){
+			$plat =Db::name('platform')->where(['use_type'=>$param['plat_type'],'is_del'=>0])->column('id');
+		     $where[] = ['a.platform_id', 'in',$plat];
+		 }
         $count = Db::name('sale')
             ->alias('s')
 //            ->leftJoin('customer_info csi', 'csi.companyNo=s.customer_code')
@@ -552,11 +558,18 @@ class SaleReport extends Base
     //【一、管理报表】3.订单报表_导出
     public function saleExport()
     {
-        $param = $this->request->only(['token', 'start_date' => '', 'end_date' => ''], 'post', 'trim');
+        $param = $this->request->only(['token',"depart_id"=>"", "plat_type"=>"",'start_date' => '', 'end_date' => ''], 'post', 'trim');
 
         $where = [['s.is_del', '=', 0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['s.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
-
+        if ($param['depart_id'] != ''){
+					$uidArr = get_company_item_user_by_name('',$param['depart_id']);
+		            $where[] = ['a.apply_id', 'in',$uidArr];
+		 }
+        if ($param['plat_type'] !== ''){
+			$plat =Db::name("platform")->where(["use_type"=>$param['plat_type'],"is_del"=>0])->column("id");
+		     $where[] = ['a.platform_id', 'in',$plat];
+		 }
         $data = Db::name('sale')
             ->alias('s')
             ->field('s.apply_name 创建人,"" 创建人所属部门,s.addtime 下单时间,s.orderCode 订单号,"" 一级企业,"" 二级企业,"" 客户名称,s.good_name 商品名称,s.good_num 数量,"" 单位,s.sale_price 单价,s.total_price 金额,s.is_stock 是否库存,s.order_type 订单类型,s.good_code,s.apply_id,s.cat_id,s.customer_code')

app/command/InterMakeOrder.php

@@ -180,6 +180,8 @@ class InterMakeOrder extends Command
             "is_diff" => 0,
             "pay_way" => 0,
             "send_way" => 0,
+             'order_createrid' =>$param['apply_id'],
+             'order_creater' => $param['apply_name'],
             "companyNo" => $param['companyNo'],
             "companyName" =>$param['companyName'],
             "addtime" => date("Y-m-d H:i:s"),