Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化

# Conflicts: # jikimo_frontend/static/src/scss/custom_style.scss # sf_manufacturing/views/mrp_workcenter_views.xml
2023-09-15 10:40:30 +08:00
parent 2cc03c21ed 480d628125
commit db5d9863b1
20 changed files with 449 additions and 292 deletions
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -49,24 +49,29 @@ td.o_required_modifier {
  display: flex;
  flex-direction: column;
  position: absolute;
-  top: 0;
+  top: 28px;
  bottom: 0;
-  right: 8px;
+  right: 18px;
  margin: auto;
-  height: 34px;
+  //height: 34px;
+  height: unset !important;
+  align-items: center;
 }

 .show_state > div {
-  width: 12px;
+  width: 20px;
  height: 12px;
  border: 1px solid #000
 }

-.show_state > div:nth-child(2) {
-  border-top: none;
+.show_state > div:nth-child(1) {
  border-bottom: none;
 }

+.show_state > div:nth-child(2) {
+  border-top: 1px solid black !important;
+}
+
 .oe_kanban_card.kanban_color_2 {
  background-color: #FF4343 !important;
  color: #fff;
@@ -83,6 +88,11 @@ td.o_required_modifier {
  color: #fff;
 }

+.my-image div {
+  width: 122px !important;
+  height: 122px !important;
+}
+
 .my-image img {
  width: 100%;
  height: 100%;
@@ -149,6 +159,7 @@ td.o_required_modifier {
 }

 //-----------------------------------------------------------
+
 //图文展示换行及对齐
 .many2many_flex  {
  flex-wrap: wrap;
@@ -161,3 +172,63 @@ td.o_required_modifier {
  flex-direction: column;
  align-items: flex-start;
 }
+
+div[class="o_content o_component_with_search_panel"] .oe_kanban_color_0 {
+  position: relative;
+  padding: 0 !important;
+}
+
+div[class="o_content o_component_with_search_panel"] img[name="equipment_image"] {
+  width: 150px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_card_content button {
+  position: absolute;
+  top: -52px;
+  left: -55px;
+  width: 80px;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_primary > span:nth-of-type(1) {
+  position: absolute;
+  top: 10px;
+  left: 168px;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_primary > span:nth-of-type(2) {
+  margin-left: 18px;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_dashboard:not(.o_legacy_kanban_view) .o_kanban_record > div .o_kanban_manage_toggle_button {
+  top: 10px !important;
+  right: 17px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_record_headings .ml8 {
+  margin-left: 0px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_dashboard:not(.o_legacy_kanban_view) .o_kanban_record > div .o_kanban_card_content {
+  min-height: 0 !important;
+  height: 0 !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_dashboard:not(.o_legacy_kanban_view) .o_kanban_record > div .o_kanban_card_header + .container.o_kanban_card_content {
+  margin-top: -5px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_primary_left {
+  right: 10px;
+  padding: 0 !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .show_state {
+  right: 10px !important;
+  top: 45px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .show_state span {
+  margin-top: 10px;
+  font-size: 12px;
+}
+
--- a/sf_bf_connect/controllers/controllers.py
+++ b/sf_bf_connect/controllers/controllers.py
@@ -27,7 +27,7 @@ class Sf_Bf_Connect(http.Controller):
            bfm_process_order_list = json.loads(kw['bfm_process_order_list'])
            order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create(
                company_id, kw['delivery_name'], kw['delivery_telephone'], kw['delivery_address'],
-                kw['delivery_end_date'])
+                kw['delivery_end_date'], kw['payments_way'], kw['pay_way'])
            i = 1
            # 给sale_order的default_code字段赋值
            aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)])
--- a/sf_dlm/manifest.py
+++ b/sf_dlm/manifest.py
@@ -11,7 +11,7 @@
    'category': 'sf',
    'website': 'https://www.sf.jikimo.com',
    'depends': ['mrp', 'base', 'sale', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting', 'purchase_stock',
-                'uom'],
+                'uom','jikimo_frontend'],
    'data': [
        'data/product_data.xml',
        'data/uom_data.xml',
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -336,23 +336,24 @@
                        </group>
                        <group col="1" attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
                            <group string="适合加工方式">
-                                <field name="suitable_machining_method_ids" string="" widget="many2many_checkboxes"/>
+                                <field name="suitable_machining_method_ids" string=""
+                                       widget="custom_many2many_checkboxes"/>
                            </group>
                            <group>
                                <group string="刀尖特征">
                                    <field name="blade_tip_characteristics_ids" string=""
-                                           widget="many2many_checkboxes"/>
+                                           widget="custom_many2many_checkboxes"/>
                                </group>
                                <group string="柄部类型">
-                                    <field name="handle_type_ids" string="" widget="many2many_checkboxes"/>
+                                    <field name="handle_type_ids" string="" widget="custom_many2many_checkboxes"/>
                                </group>
                            </group>
                            <group>
                                <group string="走刀方向">
-                                    <field name="cutting_direction_ids" string="" widget="many2many_checkboxes"/>
+                                    <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"/>
                                </group>
                                <group string="适合冷却液">
-                                    <field name="suitable_coolant_ids" string="" widget="many2many_checkboxes"/>
+                                    <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"/>
                                </group>
                            </group>
                            <notebook>
--- a/sf_maintenance/models/sf_equipment_maintenance_standards.py
+++ b/sf_maintenance/models/sf_equipment_maintenance_standards.py
@@ -62,7 +62,6 @@ class SfSaintenanceStandards(models.Model):
    fault_type = fields.Selection(
        [('电气类', '电气类'), ('机械类', '机械类'), ('程序类', '程序类'), ('系统类', '系统类')], string='类别')
    equipment_maintenance_standards_id = fields.Many2one('equipment.maintenance.standards', string='设备维保标准')
-    maintenance_request_id = fields.Many2one('maintenance.request', string='设备维保计划')
    images = fields.One2many('maintenance.standard.image', 'standard_id', string='反馈图片')
    Period = fields.Integer('周期/频次(天)')
    remark = fields.Char('备注说明')
--- a/sf_maintenance/models/sf_maintenance.py
+++ b/sf_maintenance/models/sf_maintenance.py
@@ -44,11 +44,9 @@ class SfMaintenanceEquipment(models.Model):
    overhaul_period = fields.Integer(string='预防检修频次')
    overhaul_duration = fields.Float(string='检修时长')

-
    overhaul_id = fields.Many2one('equipment.maintenance.standards', string='设备检修标准',
                                  domain="[('maintenance_type','=','检修')]")

-
    @api.onchange('eq_maintenance_id', 'overhaul_id')
    def _compute_equipment_maintenance_standards_ids(self):
        for record in self:
@@ -145,7 +143,6 @@ class SfMaintenanceEquipment(models.Model):
    machine_tool_id = fields.Many2one('sf.machine_tool', '机床')
    sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_id', '设备故障日志')

-
    def name_get(self):
        result = []
        for parameter in self:
@@ -156,7 +153,6 @@ class SfMaintenanceEquipment(models.Model):
            result.append((parameter.id, name))
        return result

-
    @api.constrains('rotate_speed')
    def _check_rotate_speed(self):
        if self.rotate_speed <= 0:
@@ -478,14 +474,17 @@ class SfMaintenanceEquipment(models.Model):

    image_id = fields.Many2many('maintenance.equipment.image', 'equipment_id', string='设备图文')

+
 class MaintenanceStandardImage(models.Model):
    _name = 'maintenance.equipment.image'
-    _description = '设备图文展示'
-
+    _description = '能力特征库'

    active = fields.Boolean('有效', default=True)
-    name = fields.Char('加工能力')
-    image = fields.Binary(string='设备图文')
+    name = fields.Char('名称')
+    image = fields.Binary(string='图文')
+    type = fields.Selection(
+        [('加工能力', '加工能力'), ('刀尖特征', '刀尖特征'), ('柄部类型', '柄部类型'), ('走刀方向', '走刀方向'), ('冷却液', '冷却液')],
+        string='特征')
    equipment_id = fields.Many2many('maintenance.equipment', 'image_id', string='设备')

    @api.model
@@ -518,6 +517,3 @@ class MaintenanceStandardImage(models.Model):
            new_res.append([id, name, data_uri])
        # 返回新的结果列表
        return new_res
-
-
-
--- a/sf_maintenance/models/sf_maintenance_requests.py
+++ b/sf_maintenance/models/sf_maintenance_requests.py
@@ -25,7 +25,7 @@ class SfMaintenanceEquipmentCategory(models.Model):
            if not record.equipment_maintenance_id:
                record.equipment_maintenance_id = False

-    maintenance_standards = fields.One2many('maintenance.standards', 'maintenance_request_id', string='维保标准')
+    maintenance_standards = fields.Many2many('maintenance.standards', string='维保标准')

    @api.constrains('equipment_maintenance_id')
    def _check_equipment_maintenance_id(self):
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -381,8 +381,9 @@
        <field name="name">maintenance.equipment.image.tree</field>
        <field name="model">maintenance.equipment.image</field>
        <field name="arch" type="xml">
-            <tree string="设备图文">
+            <tree string="能力特征库">
                <field name="name"/>
+                <field name="type"/>
                <field name="image" widget="image"/>
                <field name="equipment_id" invisible="1"/>
                <field name="active" invisible="1"/>
@@ -394,11 +395,12 @@
        <field name="name">maintenance.equipment.image.form</field>
        <field name="model">maintenance.equipment.image</field>
        <field name="arch" type="xml">
-            <form string="设备图文">
+            <form string="能力特征库">
                <sheet>
                    <group>
-                        <field name="name"/>
-                        <field name="image" widget="image"/>
+                        <field name="name" required="1"/>
+                        <field name="type" required="1"/>
+                        <field name="image" widget="image" required="1"/>
                        <field name="equipment_id" invisible="1"/>
                        <field name="active" invisible="1"/>
                    </group>
@@ -408,14 +410,14 @@
    </record>

    <record id="action_maintenance_equipment_image" model="ir.actions.act_window">
-        <field name="name">设备图文图文</field>
+        <field name="name">能力特征库</field>
        <field name="res_model">maintenance.equipment.image</field>
        <field name="view_mode">tree,form</field>
        <field name="domain">[]</field>
    </record>
    <menuitem
            id="maintenance_equipment_image_form"
-            name="设备图文展示"
+            name="能力特征库"
            parent="maintenance.menu_m_request"
            action="action_maintenance_equipment_image"
            groups="maintenance.group_equipment_manager,base.group_user"
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -1,8 +1,8 @@
 from odoo import models, fields, api
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 import logging
 import base64
 import hashlib
@@ -91,15 +91,19 @@ class ResProductMo(models.Model):
    cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
    cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
    cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
-    suitable_machining_method_ids = fields.Many2many('sf.suitable.machining.method',
-                                                     'rel_suitable_machining_method_product_template', '适合加工方式')
-    blade_tip_characteristics_ids = fields.Many2many('sf.blade.tip.characteristics',
-                                                     'rel_blade_tip_characteristics_product_template', '刀尖特征')
-    handle_type_ids = fields.Many2many('sf.handle.type', 'rel_handle_type_product_template', '柄部类型')
-    cutting_direction_ids = fields.Many2many('sf.cutting.direction', 'rel_cutting_direction_product_template',
-                                             '走刀方向')
-    suitable_coolant_ids = fields.Many2many('sf.suitable.coolant', 'rel_suitable_coolant_product_template',
-                                            '适合冷却液')
+    suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
+                                                     'rel_machining_product_template', '适合加工方式',
+                                                     domain=[('type', '=', '加工能力')])
+    blade_tip_characteristics_ids = fields.Many2many('maintenance.equipment.image',
+                                                     'rel_blade_tip_product_template', '刀尖特征',
+                                                     domain=[('type', '=', '刀尖特征')])
+    handle_type_ids = fields.Many2many('maintenance.equipment.image', 'rel_handle_product_template', '柄部类型',
+                                       domain=[('type', '=', '柄部类型')])
+    cutting_direction_ids = fields.Many2many('maintenance.equipment.image', 'rel_cutting_product_template',
+                                             '走刀方向', domain=[('type', '=', '走刀方向')])
+    suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'rel_coolant_product_template',
+                                            '适合冷却液', domain=[('type', '=', '冷却液')])
+

    # @api.constrains('suitable_machining_method_ids')
    # def _check_suitable_machining_method_ids(self):
@@ -734,7 +738,7 @@ class ResProductMo(models.Model):
    def transition_glb_file(self, report_path, code):
        shapes = read_step_file(report_path)
        output_file = os.path.join('/tmp', str(code) + '.stl')
-        write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
+        # write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
        # 转化为glb
        output_glb_file = os.path.join('/tmp', str(code) + '.glb')
        util_path = get_resource_path('sf_dlm', 'static/util')
@@ -797,6 +801,7 @@ class ResMrpBomMo(models.Model):
        else:
            return False

+
        # 查询材料型号默认排第一的供应商

    def get_supplier(self, materials_type):
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -189,6 +189,8 @@ class StockRule(models.Model):
                        'mail.message_origin_link',
                        values={'self': production, 'origin': origin_production},
                        subtype_id=self.env.ref('mail.mt_note').id)
+
+
                '''
                创建生产计划
                '''
@@ -211,7 +213,6 @@ class StockRule(models.Model):
                    'product_id': production.product_id.id,
                    'state': 'draft',
                })
-
        return True


--- a/sf_manufacturing/views/mrp_workcenter_views.xml
+++ b/sf_manufacturing/views/mrp_workcenter_views.xml
@@ -44,6 +44,47 @@
            </field>
        </record>

+    <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">
+        <field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>
+        <field name="model">mrp.workcenter</field>
+        <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
+        <field name="arch" type="xml">
+            <!-- Desktop view -->
+            <xpath expr='(//field[@name="name"])[1]' position="before">
+                <field name="equipment_status"/>
+                <field name="equipment_image"/>
+            </xpath>
+            <xpath expr='(//field[@name="name"])[2]' position="before">
+                <field name="equipment_image" widget="image"/>
+
+            </xpath>
+            <xpath expr='(//a[@name="unblock"])' position="after">
+<!--                <div class="czyg">绿色：正常，红色：故障，黄色：下线/暂停</div>-->
+            </xpath>
+        </field>
+    </record>
+<!--&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;-->
+    <record id="mrp_workcenter_kanban_inherit1" model="ir.ui.view">
+        <field name="name">mrp.workcenter.kanban.inherit</field>
+        <field name="model">mrp.workcenter</field>
+        <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
+        <field name="arch" type="xml">
+            <xpath expr="//kanban//templates//t" position="inside">
+                <p class="show_state" t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click
+                ">
+                    <div t-attf-class="#{record.equipment_status.raw_value == '正常' ? 'color_1' : ''}"></div>
+                    <div t-attf-class="#{record.equipment_status.raw_value == '故障' ? 'color_2' : ''}"></div>
+                    <div t-attf-class="#{record.equipment_status.raw_value == '不可用' ? 'color_3' : ''}"></div>
+                    <span t-attf-class="#{record.equipment_status.raw_value == '正常' ? 'font_color_1' : ''}
+                        #{record.equipment_status.raw_value == '故障' ? 'font_color_2' : ''}
+                        #{record.equipment_status.raw_value == '不可用' ? 'font_color_3' : ''}">
+                        <field name="equipment_status"/>
+                    </span>
+                </p>
+            </xpath>
+        </field>
+    </record>
+
 <!--         继承原有的看板视图 -->
    <record id="mrp_workcenter_kanban_inherit1" model="ir.ui.view">
        <field name="name">mrp.workcenter.kanban.inherit</field>
@@ -163,7 +204,8 @@
    <!--                         <t t-name="kanban-box" -->
    <!--                            t-if="record.production_line_id.value == record.production_line_show.raw_value"> -->
    <!--                            <div t-on-click="console.log(record.production_line_id,'11111111111')"></div>--> -->
-<!--                            <div t-on-click="console.log(record.production_line_show,'22222222222')"></div>--> -->
+    <!--                            <div t-on-click="console.log(record.production_line_show,'22222222222')"></div>-->
+    -->
    <!--                             <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}"> -->
    <!--                                 <div t-attf-class="o_kanban_card_header o_kanban_record_top"> -->
    <!--                                     <div class="o_kanban_record_headings o_kanban_card_header_title"> -->
--- a/sf_sale/manifest.py
+++ b/sf_sale/manifest.py
@@ -10,7 +10,7 @@
    """,
    'category': 'sf',
    'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale_management', 'web_widget_model_viewer',],
+    'depends': ['sale', 'web_widget_model_viewer'],
    'data': [
        'security/group_security.xml',
        'security/ir.model.access.csv',
--- a/sf_sale/models/quick_easy_order.py
+++ b/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):
@@ -77,10 +79,10 @@ class QuickEasyOrder(models.Model):
                    model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
                    report_path = attachment._full_path(attachment.store_fname)
                    vals['model_file'] = self.transition_glb_file(report_path, model_code)
-                    logging.info('create-model_file:%s' % len(vals['model_file']))
+                    # logging.info('create-model_file:%s' % len(vals['model_file']))

        obj = super(QuickEasyOrder, self).create(vals)
-        self.model_coloring(obj)
+        # self.model_coloring(obj)
        self.distribute_to_factory(obj)
        obj.state = '待接单'
        return obj
@@ -88,14 +90,14 @@ class QuickEasyOrder(models.Model):
    # 将attach的datas内容转为glb文件
    def transition_glb_file(self, report_path, model_code):
        shapes = read_step_file(report_path)
-        # output_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.stl')
-        output_file = os.path.join('/tmp', str(model_code) + '.stl')
+        output_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.stl')
+        # output_file = os.path.join('/tmp', str(model_code) + '.stl')
        write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
        # 转化为glb
-        # output_glb_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.glb')
-        output_glb_file = os.path.join('/tmp', str(model_code) + '.glb')
+        output_glb_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.glb')
+        # output_glb_file = os.path.join('/tmp', str(model_code) + '.glb')
        util_path = get_resource_path('sf_dlm', 'static/util')
-        cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file)
+        cmd = 'python %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file)
        os.system(cmd)
        # 转base64
        with open(output_glb_file, 'rb') as fileObj:
@@ -120,17 +122,17 @@ class QuickEasyOrder(models.Model):
                model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
                logging.info("模型编码: %s" % model_code)
                item.model_file = self.transition_glb_file(report_path, model_code)
-                ret = self.feature_recognition(report_path, model_code)
-                logging.info("自动报价返回值: %s" % ret)
-                boxshape = ret['boxshape'].tolist()
-                logging.info("自动报价boxshape: %s" % boxshape)
-                logging.info('自动报价feature_infos:%s' % ret['feature_infos'])
-                item.model_length = boxshape[0]  # 长 单位mm
-                item.model_width = boxshape[1]  # 宽
-                item.model_height = boxshape[2]  # 高
-                item.model_volume = boxshape[0] * boxshape[1] * boxshape[2]
-                item.model_feature = json.dumps(ret['feature_infos'], ensure_ascii=False)
-                self._get_price(item)
+                # ret = self.feature_recognition(report_path, model_code)
+                # logging.info("自动报价返回值: %s" % ret)
+                # boxshape = ret['boxshape'].tolist()
+                # logging.info("自动报价boxshape: %s" % boxshape)
+                # logging.info('自动报价feature_infos:%s' % ret['feature_infos'])
+                # item.model_length = boxshape[0]  # 长 单位mm
+                # item.model_width = boxshape[1]  # 宽
+                # item.model_height = boxshape[2]  # 高
+                # item.model_volume = boxshape[0] * boxshape[1] * boxshape[2]
+                # item.model_feature = json.dumps(ret['feature_infos'], ensure_ascii=False)
+                # self._get_price(item)
            else:
                item.model_file = False
                item.model_feature = False
@@ -151,7 +153,7 @@ class QuickEasyOrder(models.Model):
                base64_data = base64.b64encode(attachment.datas)
                base64_datas = base64_data.decode('utf-8')
                barcode = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
-                logging.info('model_file-size: %s' % len(item.model_file))
+                # logging.info('model_file-size: %s' % len(item.model_file))
                res['bfm_process_order_list'].append({
                    'model_long': item.model_length,
                    'model_width': item.model_width,
--- a/sf_sale/models/sale_order.py
+++ b/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

--- a/sf_sale/views/quick_easy_order_view.xml
+++ b/sf_sale/views/quick_easy_order_view.xml
@@ -16,16 +16,18 @@
            <field name="model">quick.easy.order</field>
            <field name="arch" type="xml">
                <tree string="快速订单">
-                    <field name="state" widget="label_selection"
+                    <field name="state" widget="label_selection" string="状态"
                           options="{'classes': {'待接单': 'default', '加工中':'primary','物流中':'warning','已交付': 'success'}}"/>
                    <field name="name" string="订单号"/>
                    <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>
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
    <data>
+
        <record model="ir.ui.view" id="view_sale_order_form_inherit_sf">
            <field name="name">sale.order.form.inherit.sf</field>
            <field name="model">sale.order</field>
@@ -8,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"
@@ -25,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>-->
@@ -39,5 +45,31 @@
                </field>
            </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_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_order_tree"/>
+            <field name="arch" type="xml">
+                <field name="name" position="attributes">
+                    <attribute name="string">订单号</attribute>
+                </field>
+            </field>
+        </record>
+
    </data>
 </odoo>
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -551,7 +551,7 @@ class MachineTableToolChangingApply(models.Model):

    name = fields.Many2one('maintenance.equipment', string='CNC机床',required=True, readonly=False,
                           group_expand='_read_group_names')
-    machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=True,
+    machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', readonly=True,
                                            compute='_compute_name')
    machine_tool_code = fields.Char(string='机台号', invisible=True, readonly=True, compute='_compute_name')
    cutter_spacing_code = fields.Char(string='刀位号', readonly=False)
@@ -595,7 +595,7 @@ class MachineTableToolChangingApply(models.Model):
    def _compute_name(self):
        for record in self:
            if record:
-                record.machine_table_type_id = record.name.machine_tool_category.id
+                record.machine_table_type_id = record.name.category_id.id
                record.machine_tool_code = record.name.code

    @api.depends('functional_tool_name_id')
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -870,7 +870,7 @@
                    <sheet>
                        <div class="oe_title">
                            <h1>
-                                <field name="name" readonly="1"/>
+                                <field name="name" readonly="0" placeholder="请选择"/>
                            </h1>
                        </div>
                        <group>
@@ -879,7 +879,7 @@
                                <field name="machine_tool_code" invisible="True"/>
                                <field name="cutter_spacing_code"/>
                                <field name="functional_tool_code"/>
-                                <field name="functional_tool_name_id"/>
+                                <field name="functional_tool_name_id" placeholder="请选择"/>
                                <field name="functional_tool_type_id"/>
                            </group>
                        </group>
@@ -999,19 +999,19 @@
                    <sheet>
                        <div class="oe_title">
                            <h1>
-                                <field name="name" readonly="1"/>
+                                <field name="name" readonly="0" placeholder="请输入工单任务编号"/>
                            </h1>
                        </div>
                        <group>
                            <group>
                                <field name="cam_procedure_code"/>
                                <field name="cam_cutter_spacing_code"/>
-                                <field name="machine_table_name_id"/>
+                                <field name="machine_table_name_id" placeholder="请选择"/>
                            </group>
                            <group>
                                <field name="functional_tool_code"/>
-                                <field name="functional_tool_name_id"/>
-                                <field name="functional_tool_type_id"/>
+                                <field name="functional_tool_name_id" placeholder="请选择"/>
+                                <field name="functional_tool_type_id" placeholder="请选择"/>
                                <field name="machine_tool_cutter_spacing_code"/>
                            </group>
                        </group>
@@ -1027,7 +1027,7 @@
                                        <field name="coarse_middle_thin"/>
                                    </group>
                                    <group>
-                                        <field name="need_knife_time"/>
+                                        <field name="need_knife_time" placeholder="请选择"/>
                                        <field name="required_cutting_time"/>
                                        <field name="whether_standard_tool"/>
                                        <field name="applicant"/>
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -23,15 +23,15 @@
                        </group>
                        <group string="功能刀具信息">
                            <group>
-                                <field name="replacement_tool_name_id"/>
+                                <field name="replacement_tool_name_id" placeholder="请选择"/>
                                <field name="replacement_tool_type_id"/>
-                                <field name="replacement_tool_coarse_middle_thin"/>
+                                <field name="replacement_tool_coarse_middle_thin" placeholder="请选择"/>
                                <field name="applicant"/>
                            </group>
                            <group>
                                <field name="replacement_tool_code"/>
-                                <field name="used_tool_time"/>
-                                <field name="new_former"/>
+                                <field name="used_tool_time" placeholder="请选择"/>
+                                <field name="new_former" placeholder="请选择"/>
                                <field name="reason_for_applying"/>

                            </group>
--- a/web_widget_model_viewer/static/src/js/3d_viewer.xml
+++ b/web_widget_model_viewer/static/src/js/3d_viewer.xml
@@ -25,7 +25,7 @@
            </model-viewer>
        </t>
        <t t-if="!props.value">
-           <div style="color:#D23F3A">当前制造订单暂无模型</div>
+           <div style="color:#D23F3A">暂无模型</div>
        </t>

        <!--	    <model-viewer-->