Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）

sf_sale/models/quick_easy_order.py

@@ -183,7 +183,7 @@ class QuickEasyOrder(models.Model):
             company_id = self.env.ref('base.main_company').sudo()
             # user_id = request.env.ref('base.user_admin').sudo()
             order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX',
-                                                                str(datetime.now()))
+                                                                str(datetime.now()), '现结', '支付宝')
             i = 1
             # 给sale_order的default_code字段赋值
             aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)])
@@ -243,8 +243,7 @@ class QuickEasyOrder(models.Model):
             # self.cr.rollback()
             return UserError('工厂创建销售订单和产品失败，请联系管理员')
 
-
-# 特征识别
+    # 特征识别
     def feature_recognition(self, report_path, model_code):
         feature_path = self.env['sf.auto_quatotion.common'].sudo().get_feature_full_path()
         process_time_db_path = self.env['sf.auto_quatotion.common'].sudo().get_process_time_db_path()