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

app/admin/controller/Activity.php

@@ -189,6 +189,8 @@ class Activity extends Base
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
         if($relaComNo!="") $where[]=['a.supplierNo|a.companyNo','=', $relaComNo];
+        $orderSource= isset($this->post['order_source']) && $this->post['order_source']!='' ? trim($this->post['order_source']):'';
+        if($orderSource!=""||!empty($orderSource)) $where[]=['a.order_source','in', $orderSource];
 
         $count = Db::name('good_zixun')
             ->alias("a")

app/admin/controller/Filing.php

@@ -636,7 +636,8 @@ class Filing extends Base
                     'order_creater' => $filing['updater'],
                     'proof_type' => '',
                     'proof_url' => '',
-                    'order_type' => $order_type
+                    'order_type' => $order_type,
+                    'order_source' => 7
                 ]);
 			if($goodIn==false) throw new \Exception("商品录入商品库失败");
             $orderCode = makeNo('QR');

app/admin/controller/Sale.php

@@ -1129,6 +1129,8 @@ class Sale extends Base
                     "companyName" =>$companyinfo['data'][$companyNo]??"",
                     "status" => 1,
                     "is_del" => 0,
+                    'order_type' => 3,
+                    'order_source' => 2,
                     "createrid" => $zxinfo['createrid'],
                     "creater" => $zxinfo['creater'],
                     "order_createrid" => $this->uid,
@@ -1669,8 +1671,10 @@ class Sale extends Base
                 "send_way" => $goodinfo['send_way'],
                 "status" => 1,
                 "is_del" => 0,
+                "order_type" => 3,
+                'order_source' => 3,
                 'order_createrid' => $data['rm'],
-                 'order_creater' => $data['ri'],
+                'order_creater' => $data['ri'],
                 "createrid" => $goodinfo['createrid'],
                 "creater" => $goodinfo['creater'],
                 "addtime" => date("Y-m-d H:i:s"),

app/command/InterMakeOrder.php

@@ -180,6 +180,8 @@ class InterMakeOrder extends Command
             "is_diff" => 0,
             "pay_way" => 0,
             "send_way" => 0,
+            'order_type' => 3,
+             'order_source' => 9,
              'order_createrid' =>$param['apply_id'],
              'order_creater' => $param['apply_name'],
             "companyNo" => $param['companyNo'],