Browse Source

Merge branch 'dev_wf' of wugg/phpstock into version1.5

wufeng 2 years ago
parent
commit
5695479e21
1 changed files with 3 additions and 9 deletions
  1. 3 9
      app/admin/controller/Sale.php

+ 3 - 9
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=[
@@ -1441,7 +1441,6 @@ 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,//项目编码
@@ -3466,7 +3465,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'),
                             ]);
 
@@ -3663,17 +3662,12 @@ 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){