ad

app/admin/controller/Filing.php

@@ -62,6 +62,8 @@ class Filing extends Base
         	'customerCode',
         	'supplierNo',
         	'companyName',
+        	"manager",
+        	"managerid",
         	'num',
         	'is_determine_price',
         	'price' => 0,
@@ -122,7 +124,8 @@ class Filing extends Base
         ]);
 
         if (!$val->check($param)) return json_show(1004, $val->getError());
-
+        $manager = $param['manager']??$this->uname;
+        $managerid = $param['managerid']??$this->uid;
         //如果是贵金属的话，额外判断
         $cat = made($param['cat_id']);
         if (isset($cat[0]['id']) && $cat[0]['id'] == 6) {
@@ -184,6 +187,8 @@ class Filing extends Base
                 'apply_name' => $this->uname,
                 'status' => 0,
                 'is_del' => 0,
+                "manager"=>$manager,
+                "managerid"=>$managerid,
                 'addtime' => date('Y-m-d H:i:s'),
                 'updaterid' => $this->uid,
                 'updater' => $this->uname,
@@ -231,7 +236,7 @@ class Filing extends Base
         	'delivery_day',
         	'make_day',
         	'tax',
-        	  'fill_url' ,
+        	 'fill_url' ,
         	'unit_id',
         	'cat_id',
         	'spec_list' => [],
@@ -681,6 +686,8 @@ class Filing extends Base
                 'cgder' => $supplier['data']['person'],
                 'good_createrid' => $filing['updaterid'],
                 'good_creater' => $filing['updater'],
+                 'manager'=>$filing['manager'],
+                'managerid'=>$filing['managerid'],
             ]);
 			if($sale_id==false)  throw new \Exception('订单生成失败');
 			 ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], [

app/admin/controller/Goodup.php

@@ -1581,7 +1581,7 @@ class Goodup extends Base
         if($online_remark===""){
             return error_show(1004,"参数online_remark不能为空");
         }
-        $fixed = isset($this->post['is_fixed'])&&$this->post['is_fixed']!==''? intval($this->post['is_fixed']):0;
+        $fixed = isset($this->post['is_fixed'])&&$this->post['is_fixed']!==''? intval($this->post['is_fixed']):1;
         if($fixed==1){
         	//使用实时金价
         	 $nake=Db::name('good_nake')->where(['spuCode'=> $spuCode,'is_del'=>0,"nake_fee"=>0])->findOrEmpty();

app/admin/controller/InterOrder.php

@@ -56,6 +56,8 @@ class InterOrder extends Base
 			"sendtime|发货时间"=>"require|date|dateFormat:Y-m-d H:i:s",
 			"poCode|业务单号"=>"max:255|min:1",
 			"workCode|单据号"=>"max:255|min:1",
+			"manager|项目经理"=>"require|max:255|min:1",
+			"managerid|项目经理ID"=>"require|number",
 			]);
 			$data=[];
 			$i=0;
@@ -90,6 +92,8 @@ class InterOrder extends Base
 				"interNo"=>$interNo,
 				"apply_id"=>$this->uid,
 				"apply_name"=>$this->uname,
+				'manager'=>$item['manager'],
+                'managerid'=>$item['managerid'],
 				"companyNo"=>$item['companyNo'],
 				"companyName"=>$compAr[$item['companyNo']]??"",
 				"customerNo"=>$item['customerNo'],

app/admin/controller/Platform.php

@@ -110,7 +110,7 @@ class Platform extends Base
             'page' => 1,
             'size' => 10,
             'platform_name' => '',
-//            'platform_type' => '',
+            'platform_type' => '',
 //            'use_type' => '',
             'status' => '',
             'start' => '',
@@ -127,7 +127,7 @@ class Platform extends Base
         if ($param['platform_name'] != "") $where[] = ['p.platform_name', "like", '%' . $param['platform_name'] . '%'];
 
 //        $platform_type = isset($this->post['platform_type']) && $this->post['platform_type'] !=="" ? intval($this->post['platform_type']):"";
-//        if ($param['platform_type'] !== "") $where[] = ['p.platform_type', "=", $param['platform_type']];
+        if ($param['platform_type'] !== "") $where[] = ['p.platform_type', "=", $param['platform_type']];
 
 //         $use_type = isset($this->post['use_type']) && $this->post['use_type'] !=="" ? intval($this->post['use_type']):"";
 //        if ($param['use_type'] !== "") $where[] = ['p.use_type', "=", $param['use_type']];

app/admin/controller/Sale.php

@@ -69,6 +69,9 @@ class Sale extends Base
         if ($arrtime == "") {
             return error_show(1004, "参数arrtime不能为空");
         }
+        
+        $manager = isset($this->post['manager']) && $this->post['manager'] != '' ? $this->post['manager'] :$this->uname;
+       $managerid = isset($this->post['managerid']) && $this->post['managerid'] != '' ? $this->post['managerid'] :$this->uid;
         $paytime = isset($this->post['paytime']) && $this->post['paytime'] != "" ? $this->post['paytime'] : "";
         $workNo = isset($this->post['workNo']) && $this->post['workNo'] != "" ? trim($this->post['workNo']) : "";
         $ct = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
@@ -259,6 +262,8 @@ class Sale extends Base
                 'cgder' => $holder_name,//采购员(供应商负责人)
                 'good_createrid' => $goodinfo['createrid'],
                 'good_creater' => $goodinfo['creater'],//商品创建人
+                'manager' => $manager,
+                'managerid' => $managerid,//商品创建人
             ];
             $paytime == "" ? "" : $data['paytime'] = $paytime;
             $datainfo = Db::name('sale')->insert($data, true);
@@ -864,9 +869,8 @@ class Sale extends Base
         if ($zx == false) {
             return error_show(1003, "未找到咨询单信息");
         }
-//        if (in_array($zx['status'],[2,3])) {
-//            return error_show(1003, "咨询单状态有误无法转单");
-//        }
+        $manager = isset($this->post['manager']) && $this->post['manager'] != '' ? $this->post['manager'] :$this->uname;
+       $managerid = isset($this->post['managerid']) && $this->post['managerid'] != '' ? $this->post['managerid'] :$this->uid;
         $zxorder = Db::name("consult_order")->where(["zxNo" => $zx["zxNo"], "is_del" => 0])->find();
         if ($zxorder == false) {
             return error_show(1003, "未找到咨询单信息");
@@ -1042,6 +1046,8 @@ class Sale extends Base
                 'cgder' => $supplier_temp_info['person'],//采购员(采购单对应的供应商负责人)
                 'good_createrid' => $zxinfo['createrid'],
                 'good_creater' => $zxinfo['creater'],//商品创建人id
+                "manager"=>$manager,
+                "managerid"=>$managerid,
             ];
             $datainfo = Db::name('sale')->insert($data, true);
             if ($datainfo > 0) {
@@ -1304,6 +1310,8 @@ class Sale extends Base
         if($platforminfo['is_select_pay_rate']==1 && channel_is_company($project['platform_id'],$project['companyNo']))return error_show(1004, "平台渠道含有 {$names['data'][$project['companyNo']]}");
         $rm = $this->uid;//isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
         $ri = $this->uname;//isset($apply_id["data"]['nickname']) ? $apply_id["data"]['nickname'] : "";
+       $manager = isset($this->post['manager']) && $this->post['manager'] != '' ? $this->post['manager'] :$this->uname;
+       $managerid = isset($this->post['managerid']) && $this->post['managerid'] != '' ? $this->post['managerid'] :$this->uid;
         Db::startTrans();
         try {
             $plan = Db::name("project_plan")->where(["planNo" => $planNo, "is_del" => 0])->lock(true)->find();
@@ -1340,6 +1348,8 @@ class Sale extends Base
                 $good['arrtime'] = $arrtime;
                 $good['rm'] = $rm;
                 $good['ri'] = $ri;
+                $good['manager'] = $manager;
+                $good['managerid'] = $managerid;
                 $good['send_num'] = 0;
 
                 $standing_book_data = ['projectNo' => $plan['projectNo'], 'updatetime' => date('Y-m-d H:i:s')];
@@ -1566,6 +1576,8 @@ class Sale extends Base
             'cgder' => $holder_name,//采购员(供应商负责人)
             'good_createrid' => $goodinfo['createrid'],
             'good_creater' => $goodinfo['creater'],//商品创建人
+            "manager"=>$data['manager'],
+            "managerid"=>$data['managerid'],
         ];
         $datainfo = Db::name('sale')->insert($datas, true);
         if ($datainfo > 0) {
@@ -1871,6 +1883,8 @@ class Sale extends Base
             'cgder' => $supplier_temp_info['person']??"",//采购员(供应商负责人)
             'good_createrid' => $good['createrid'],
             'good_creater' => $good['creater'],//商品创建人
+            "manager"=>$data['manager'],
+            "managerid"=>$data['managerid'],
         ];
         $datainfo = Db::name('sale')->insert($datas, true);
         if ($datainfo > 0) {

app/command/ImportOrderFromCHandleData.php

@@ -267,6 +267,8 @@ class ImportOrderFromCHandleData extends Command
                     'cgder' => $supplier_temp_info['person'],//采购员(供应商负责人)
                     'good_createrid' => $goodinfo['createrid'],
                     'good_creater' => $goodinfo['creater'],//商品创建人
+                    'manager'=>$rm,
+                    'managerid'=>$ri,
                 ];
                 $paytime == "" ? "" : $data['paytime'] = $paytime;
                 $datainfo = Db::name('sale')->insert($data, true);

app/command/InterMakeOrder.php

@@ -109,7 +109,9 @@ class InterMakeOrder extends Command
             "cgderid" => $person['personid'],
             "cgder" => $person['person'],
             "good_createrid" =>$param['apply_id'],
-            "good_creater" => $param['apply_name']
+            "good_creater" => $param['apply_name'],
+            'manager'=>$param['manager'],
+            'managerid'=>$param['managerid'],
         ];
         $orderCgd = [
             "orderCode" => $qrdcode,

app/command/SplitSale.php

@@ -194,6 +194,8 @@ class SplitSale extends Command
     {
         $sale_price = $sale['good_num'] > 0 ? bcdiv($sale_total, $sale['good_num'], 5) : 0;
         $tmp_sale = [
+        	'manager'=>$sale['manager'],
+            'managerid'=>$sale['managerid'],
             'origin_price' =>round( $sale['origin_price'] ?? 0, 2),
             'origin_plan_price' =>round( $sale['plan_price'] ?? 0, 2),
 	        'total_origin_price' => round($sale['origin_price']*$sale['good_num'],2),

app/command/handleYzOrderData.php

@@ -200,6 +200,8 @@ class handleYzOrderData extends Command
                     'cgder' => $supplier_temp_info['person']??'',//采购员(供应商负责人)
                     'good_createrid' => $goodinfo['createrid'],
                     'good_creater' => $goodinfo['creater'],//商品创建人
+                     'manager'=>$rm,
+                    'managerid'=>$ri,
                 ];
                 $paytime == "" ? "" : $data['paytime'] = $paytime;
                 $datainfo = Db::name('sale')->insertGetId($data);