项目下单时优化台账记录

app/admin/controller/Consult.php

@@ -8,7 +8,7 @@ use think\App;
 use think\facade\Db;
 use think\facade\Validate;
 
-//咨询单
+//竞价单(咨询单)
 class Consult extends Base
 {
     public $noble=[];

app/admin/controller/Project.php

@@ -487,7 +487,7 @@ class Project extends Base
             $value['mark_fee'] = isset($good['mark_fee'])?$good['mark_fee']:"0";
             $value['cert_fee'] = isset($good['cert_fee'])?$good['cert_fee']:"0";
             $value['cost_fee'] = isset($good['cost_fee'])?$good['cost_fee']:"0";
-            $value['rate'] =round(($value['sale_price'] - $value['origin_price'])/$value['sale_price'] * 100,2);
+            $value['rate'] = $value['sale_price'] == 0 ? 0 : round(($value['sale_price'] - $value['origin_price']) / $value['sale_price'] * 100, 2);
             $value['supply_area'] = isset($good['supply_area'])?$good['supply_area']:"";
             $data[]=$value;
         }

app/admin/controller/Sale.php

@@ -547,8 +547,8 @@ class Sale extends Base
                 'skuCode' => $data['skuCode'],
                 'order_type' => $data['order_type'],
                 'order_source' => $data['order_source'],
-//                'supplierNo' => $data['supplierNo'],
-//                "companyNo" => $data['companyNo'],
+                'supplierNo' => $data['supplierNo'],
+                "companyNo" => $data['companyNo'],
             ]);
 
             $rela=[
@@ -1286,6 +1286,11 @@ class Sale extends Base
                 }
 
                 //处理台账(一个项目会生成多个销售订单,第一个更新，其余的新增)
+                //项目创建时已有供应商和企业，不能修改
+                if (isset($standing_book_data['supplierNo'])) unset($standing_book_data['supplierNo']);
+                if (isset($standing_book_data['companyNo'])) unset($standing_book_data['companyNo']);
+                if (isset($standing_book_data['customer_code'])) unset($standing_book_data['customer_code']);
+
                 if ($key == 0) Db::name('standing_book')->where('projectNo', $plan['projectNo'])->update($standing_book_data);
                 else {
                     $temp = Db::name('standing_book')->where('projectNo', $plan['projectNo'])->find();
@@ -1441,6 +1446,7 @@ class Sale extends Base
         $datainfo = Db::name('sale')->insert($datas, true);
         if($datainfo>0){
             $standing_book_data['sale_id'] = $datainfo;
+            $standing_book_data['customer_code']=$datas['customer_code'];
             //修改状态，添加待办
             ActionLog::logAdd($this->post['token'], [
                 "order_code" =>$orderCode,//项目编码
@@ -3465,7 +3471,7 @@ class Sale extends Base
                                 'order_source' => $der['order_source'],
                                 'cgdNo' => $order['cgdNo'],
                                 'outCode' => $outCode,
-//                                'customer_code' => $der['customer_code'],
+                                'customer_code' => $der['customer_code'],
                                 'updatetime' => date('Y-m-d H:i:s'),
                             ]);
 
@@ -3662,12 +3668,17 @@ class Sale extends Base
                 return false;
             }else{
                 $standing_book_da = array_merge($standing_book_da, [
+//                    'standBookNo' => makeNo("IO"),
                     'bk_code' => $cgdinfo['bkcode'],
                     'orderCode' => $outinfo['orderCode'],
                     'cgdNo' => $QrdCgd['cgdNo'],
                     'spuCode' => $outinfo['spuCode'],
                     'order_type' => $QrdCgd['order_type'],
                     'order_source' => $QrdCgd['order_source'],
+                    'supplierNo' => $cgdinfo['supplierNo'],
+                    "companyNo" => $cgdinfo['companyNo'],
+//                    'addtime' => date('Y-m-d H:i:s'),
+//                    'updatetime' => date('Y-m-d H:i:s')
                 ]);
             }
             if($good['is_gold_price']==1 && $good['is_stock']==1){