ad

app/admin/controller/Consult.php

@@ -800,7 +800,7 @@ class Consult extends Base
                 ->find();
             $total_fee = $demo_fee / $zxinfo['num'] + $open_fee / $zxinfo['num'] + $good_weight * $gold["price"] + $cost_fee * $good_weight + $pakge_fee + $mark_fee + $cert_fee + $nake_fee + $delivery_fee;
             //$saleprice(最终售价) = （开模费/购买数量 + 商品重量* 最新金价 + 工艺费* 商品重量+包装费+加标费+证书费+产品裸价）/(1-成本售价/100);
-//            $saleprice = ($open_fee / $zxinfo['num'] + $weight * $gold["price"] + $cost_fee * $weight + $pakge_fee + $mark_fee + $cert_fee + $nake_fee) / (1 - $budget);
+			// $saleprice = ($open_fee / $zxinfo['num'] + $weight * $gold["price"] + $cost_fee * $weight + $pakge_fee + $mark_fee + $cert_fee + $nake_fee) / (1 - $budget);
             $saleprice = $total_fee/ (1 - $budget);
             //销售工艺费=(（开模费/购买数量 + 商品重量* 最新金价 + 工艺费* 商品重量+包装费+加标费+证书费+产品裸价）/(1-成本售价/100)-（打样费/购买数量 + 开模费/购买数量 +包装费+加标费+证书费+产品裸价0+运费) )/商品重量-最新金价
             $sale_cost_fee = ($saleprice - ($demo_fee / $zxinfo['num'] + $open_fee / $zxinfo['num'] + $pakge_fee + $mark_fee + $cert_fee + $nake_fee + $delivery_fee)) /$good_weight - $gold["price"];
@@ -832,6 +832,8 @@ class Consult extends Base
             if ($is_select_pay_rate == 1) {
                if(channel_is_company($zx['platform_code'],$supplierArr['relation_code'])) return  error_show(1004, "平台渠道包含当前供应商公司{$supplierNo}");
             }
+        }else{
+        	if($is_combind==1)$this->error("当前供应商无对应业务公司，不可选择组合商品");
         }
 
 
@@ -911,7 +913,7 @@ class Consult extends Base
                         $temp['skuCode']="";
                         $temp['pgNo']=$zxinfo['pgNo'];
                         $temp['projectNo']=$zx['projectNo'];
-                        $temp['good_name']=$pname;
+                        $temp['good_name']=$good_name;
                         $temp['good_type']=$projectinfo['good_type'];
                         $temp['data_source']=2;
                         $temp['cat_id']=$cat_id;
@@ -977,8 +979,8 @@ class Consult extends Base
                     if($is_combind==1){
                     	$arram=[
                     		'bidNo'=>$bidNo,
-                    		"companyNo"=>$supplierArr['relation_code'],
-                    		"companyName"=>$supplierArr['name'],
+                    		"companyNo"=>$zx['companyNo'],
+                    		"companyName"=>$zx['companyName'],
                     		];
                     	(new \app\admin\model\ConsultTemp)->CreateByZx($goodBind,$arram);
                     }
@@ -1351,8 +1353,8 @@ class Consult extends Base
                 if($is_combind==1){
                     	$arram=[
                     		'bidNo'=>$bidNo,
-                    		'companyNo'=>$supplierArr['relation_code'],
-                    		'companyName'=>$supplierArr['name'],
+                    		"companyNo"=>$zx['companyNo'],
+                    		"companyName"=>$zx['companyName'],
                     		];
                     	(new \app\admin\model\ConsultTemp)->CreateByZx($goodBind,$arram);
                     }

app/admin/controller/Sale.php

@@ -2248,10 +2248,6 @@ class Sale extends Base
 
         $order_source = isset($this->post['order_source']) && $this->post['order_source'] !== "" ? trim($this->post['order_source']) : "";
         if ($order_source !== "") $where[] = ["s.order_source", '=', $order_source];
-
-//        if(!empty($role['platform']) ){
-//            $where[]=["s.platform_id","in",$role['platform']];
-//        }
         $count = Db::name('sale')
             ->alias('s')
             ->leftJoin('order_num b','b.orderCode=s.orderCode')
@@ -2276,10 +2272,6 @@ class Sale extends Base
             ->toArray();
         $all_createrid = array_unique(array_column($list, 'apply_id'));
         $item = get_company_name_by_uid($all_createrid);
-
-//        $userCommon = \app\admin\common\User::getIns();
-//        $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'customer_code'),array_column($list,'supplierNo'))]);
-
         $data = [];
         foreach ($list as $value) {
             if ($value['order_type'] == 3 ||$value['order_type']==4) {
@@ -2308,23 +2300,6 @@ class Sale extends Base
             }
 
             $value['can'] = isset($var['cat_id']) && $var['cat_id'] != 0 ? made($var['cat_id']) : [];
-//            $value['supplierName'] = '';
-//            if ($value['supplierNo'] != "") {
-//                $supplier = Db::name("business")->where(["companyNo" => $value['supplierNo']])->find();
-//                $value['supplierName'] = $names['data'][$value['supplierNo']]??'';//isset($supplier['company']) ? $supplier['company'] : "";
-//            }
-//            $value['customerName'] = '';
-//            if ($value['customer_code'] != "") {
-//                $supplier = Db::name("customer_info")->where(["companyNo" => $value['customer_code']])->find();
-//                $value['customerName'] = $names['data'][$value['customer_code']]??'';//isset($supplier['companyName']) ? $supplier['companyName'] : "";
-//            }
-//            $value['useage'] = "";
-//            if ($value['use_order'] != 0) {
-//                $use = Db::name("order_use")->where(["id" => $value['use_order']])->find();
-//                $value['useage'] = isset($use['order_use']) ? $use['order_use'] : "";
-//            } else {
-//                $value['use_order'] = '';
-//            }
             $value['good_num'] -= $value['th_num'];
             $value['send_num'] -= $value['th_num'];
             $value['total_price'] = round($value['total_price'] - $value['th_fee'], 2);

app/admin/model/ConsultTemp.php

@@ -73,6 +73,8 @@ class ConsultTemp extends Model
             	$item['customized'] = $item['work_day'];
             	$item['craft_desc'] = $item['good_name'];
             	$item['noble_metal'] = $item['metal_id'];
+            	$item['creater'] = $item['cgder'];
+            	$item['createrid'] = $item['cgderid'];
                 $addGood[]  = array_merge($item->toArray(),$marage);
                 $combind[]=[
                 	"spuCode"=>$marage["parent_code"],