1.优化生成销售订单和产品的接口：bfm分配工厂时将“结算方式”和“支付方式”传到该接口内的生成报价订单方法里

2.优化销售和报价查询及详情页面：新增“结算方式”和“支付方式”两个字段;销售的tree列表的“号码”显示改为“订单号”；报价的tree列表的“号码”显示改为“订单号”，创建时间改为“下单时间”
3.优化快速订单：tree列表去掉“表面工艺参数”字段，新增“创建人”和“创建时间”2个字段；详情页面新增“加工时长”字段

sf_sale/__manifest__.py

@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale_management', 'web_widget_model_viewer', 'sale_stock'],
+    'depends': ['sale', 'web_widget_model_viewer'],
     'data': [
         'security/group_security.xml',
         'security/ir.model.access.csv',

sf_sale/models/quick_easy_order.py

@@ -16,6 +16,7 @@ import requests
 class QuickEasyOrder(models.Model):
     _name = 'quick.easy.order'
     _description = '简易下单'
+    _order = 'id desc'
 
     name = fields.Char('订单编号', default=lambda self: self.env['ir.sequence'].next_by_code('quick.easy.order'))
     model_length = fields.Float('长(mm)', digits=(16, 3))
@@ -48,6 +49,7 @@ class QuickEasyOrder(models.Model):
     model_color_state = fields.Selection([
         ('success', '成功'),
         ('fail', '失败')], string='模型上色状态')
+    processing_time = fields.Integer('加工时长(min)')
 
     @api.depends('unit_price', 'quantity')
     def _compute_total_amount(self):

sf_sale/models/sale_order.py

@@ -6,14 +6,16 @@ import base64
 class ReSaleOrder(models.Model):
     _inherit = 'sale.order'
 
-    deadline_of_delivery = fields.Date('交货截止日期')
+    deadline_of_delivery = fields.Date('订单交期')
     person_of_delivery = fields.Char('交货人')
     telephone_of_delivery = fields.Char('交货人电话号码')
     address_of_delivery = fields.Char('交货人地址')
+    payments_way = fields.Selection([('现结', '现结'), ('月结', '月结')], '结算方式', default='现结')
+    pay_way = fields.Selection([('转账', '转账'), ('微信', '微信'), ('支付宝', '支付宝')], '支付方式')
 
     # 业务平台分配工厂后在智能工厂先创建销售订单
     def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
-                          deadline_of_delivery):
+                          deadline_of_delivery, payments_way, pay_way):
         now_time = datetime.datetime.now()
         partner = self.get_customer()
         order_id = self.env['sale.order'].sudo().create({
@@ -22,11 +24,12 @@ class ReSaleOrder(models.Model):
             'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time),
             'partner_id': partner.id,
             'state': 'draft',
-            # 'user_id': user_id.id,
             'person_of_delivery': delivery_name,
             'telephone_of_delivery': delivery_telephone,
             'address_of_delivery': delivery_address,
-            'deadline_of_delivery': deadline_of_delivery
+            'deadline_of_delivery': deadline_of_delivery,
+            'payments_way': payments_way,
+            'pay_way': pay_way,
         })
         return order_id
 
@@ -49,7 +52,7 @@ class ReSaleOrder(models.Model):
                 product.materials_id.name),
             'price_unit': product.list_price,
             'product_uom_qty': item['number'],
-            'model_glb_file':  base64.b64decode(item['model_file']),
+            'model_glb_file': base64.b64decode(item['model_file']),
         }
         return self.env['sale.order.line'].create(vals)
 

sf_sale/views/quick_easy_order_view.xml

@@ -22,10 +22,12 @@
                     <field name="customer_id" string="客户"/>
                     <field name="material_id"/>
                     <field name="material_model_id"/>
-<!--                    <field name="parameter_ids" string="表面工艺参数" widget="many2many_tags"/>-->
+                    <!--                    <field name="parameter_ids" string="表面工艺参数" widget="many2many_tags"/>-->
                     <field name="quantity"/>
                     <field name="unit_price"/>
                     <field name="price"/>
+                    <field name="create_uid" string="创建人"/>
+                    <field name="create_date" string="创建时间"/>
                     <field optional="hide" name="delivery_time"/>
                 </tree>
             </field>
@@ -74,6 +76,7 @@
                                            options="{'format': false}"/>
                                 </div>
                                 <field name="model_volume" attrs="{'invisible': [('model_file', '=', False)]}"/>
+                                <field name="processing_time"/>
                             </group>
                         </group>
                     </sheet>

sf_sale/views/sale_order_view.xml

@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
-        <record id="view_order_tree_inherit_sf" model="ir.ui.view">
-            <field name="name">sale.order.tree</field>
-            <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale_stock.view_order_tree"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='name']" position="after">
-<!--                    <attribute name="string">订单号</attribute>-->
-                    <field name="deadline_of_delivery"/>
-                </xpath>
-            </field>
-        </record>
 
         <record model="ir.ui.view" id="view_sale_order_form_inherit_sf">
             <field name="name">sale.order.form.inherit.sf</field>
@@ -20,6 +9,8 @@
             <field name="arch" type="xml">
                 <field name="payment_term_id" position="after">
                     <field name="deadline_of_delivery"/>
+                    <field name="payments_way"/>
+                    <field name="pay_way"/>
                 </field>
                 <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="before">
                     <field name="model_glb_file" widget="Viewer3D" optional="show"
@@ -37,6 +28,9 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale_management.sale_order_form_quote"/>
             <field name="arch" type="xml">
+                <field name="date_order" position="attributes">
+                    <attribute name="string">下单日期</attribute>
+                </field>
                 <field name="sale_order_template_id" position="after">
                     <!--                    <label for="person_of_delivery" string="交货信息"/>-->
                     <!--                    <div>-->
@@ -52,19 +46,28 @@
             </field>
         </record>
 
+        <record id="view_quotation_with_onboarding_tree_inherit_sf" model="ir.ui.view">
+            <field name="name">sale.order.quotation.tree.inherit.sf</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_quotation_tree_with_onboarding"/>
+            <field name="arch" type="xml">
+                <field name="name" position="attributes">
+                    <attribute name="string">订单号</attribute>
+                </field>
+                <field name="create_date" position="attributes">
+                    <attribute name="string">下单时间</attribute>
+                </field>
+            </field>
+        </record>
 
-        <record id="view_quotation_tree_inherit_sf" model="ir.ui.view">
+        <record id="view_order_tree_inherit_sf" model="ir.ui.view">
             <field name="name">sale.order.tree</field>
             <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale.view_quotation_tree"/>
-            <field name="mode">primary</field>
+            <field name="inherit_id" ref="sale.view_order_tree"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='name']" position="attributes">
+                <field name="name" position="attributes">
                     <attribute name="string">订单号</attribute>
-                </xpath>
-                <xpath expr="//field[@name='create_date']" position="attributes">
-                    <attribute name="string">下单时间</attribute>
-                </xpath>
+                </field>
             </field>
         </record>