فهرست منبع

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

wufeng 2 سال پیش
والد
کامیت
f03f5a7738
1فایلهای تغییر یافته به همراه1 افزوده شده و 5 حذف شده
  1. 1 5
      app/admin/controller/Sale.php

+ 1 - 5
app/admin/controller/Sale.php

@@ -1310,7 +1310,7 @@ class Sale extends Base
                 //项目创建时已有供应商和企业,不能修改
                 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 ($feedback['data_source'] == 1) {
                     if ($key == 0) Db::name('standing_book')->where('projectNo', $plan['projectNo'])->update($standing_book_data);
@@ -3706,8 +3706,6 @@ 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'],
@@ -3715,8 +3713,6 @@ class Sale extends Base
                     '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){