Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化夹具产品模板

# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/__manifest__.py

sf_manufacturing/__manifest__.py

@@ -10,16 +10,17 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['mrp', 'sf_base', 'mrp_maintenance', 'web_widget_model_viewer', 'stock'],
+    'depends': ['mrp', 'sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'stock'],
     'data': [
         'data/stock_data.xml',
         'security/group_security.xml',
         'security/ir.model.access.csv',
         'report/tray_report.xml',
-        'views/mrp_maintenance_views.xml',
+        # 'views/mrp_maintenance_views.xml',
         'views/mrp_routing_workcenter_view.xml',
         'views/mrp_workcenter_views.xml',
         'views/mrp_workorder_view.xml',
+        'views/production_line_view.xml',
         'views/tray_view.xml',
         'views/model_type_view.xml',
 

sf_manufacturing/models/__init__.py

@@ -8,6 +8,7 @@ from . import mrp_maintenance
 from . import mrp_routing_workcenter
 from . import stock
 from . import res_user
+from . import production_line_base
 
 
 

sf_manufacturing/models/mrp_production.py

@@ -6,11 +6,14 @@ from odoo import api, fields, models, _
 class MrpProduction(models.Model):
     _inherit = 'mrp.production'
     _description = "制造订单"
+    _order = 'create_date desc'
 
     tray_ids = fields.One2many('sf.tray', 'production_id', string="托盘")
     maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Number of maintenance requests")
     request_ids = fields.One2many('maintenance.request', 'production_id')
     model_file = fields.Binary('模型文件', related='product_id.model_file')
+    schedule_state = fields.Selection([('未排', '未排'), ('已排', '已排')],
+                                      string='排程状态', default='未排')
 
     @api.depends('request_ids')
     def _compute_maintenance_count(self):
@@ -336,7 +339,7 @@ class MrpProduction(models.Model):
                 current_sequence += 1
                 if work.name == '获取CNC加工程序':
                     work.button_start()
-                    work.fetchCNC()
+                    #work.fetchCNC()
 
     # 创建工单并进行排序
     def _create_workorder(self):

sf_manufacturing/models/mrp_workcenter.py

@@ -6,12 +6,14 @@ from odoo.addons.resource.models.resource import Intervals
 
 class ResWorkcenter(models.Model):
     _inherit = "mrp.workcenter"
-    machine_tool_id = fields.Many2one('sf.machine_tool', '机床')
+    equipment_id = fields.Many2one('maintenance.equipment', string='设备')
+    machine_tool_id = fields.Many2one('sf.machine_tool', string='机床')
+    production_line_id = fields.Many2one('sf.production.line', string='生产线')
     is_process_outsourcing = fields.Boolean('工艺外协')
     users_ids = fields.Many2many("res.users", 'users_workcenter')
 
-    equipment_ids = fields.One2many(
-        'maintenance.equipment', 'workcenter_id', string="Maintenance Equipment",
+    equipment_id = fields.Many2one(
+        'maintenance.equipment', string="设备",
         check_company=True)
 
     # 查询工艺外协加工中心

sf_manufacturing/models/mrp_workorder.py

@@ -16,7 +16,7 @@ from odoo.addons.sf_mrs_connect.models.ftp_operate import FtpController
 
 class ResMrpWorkOrder(models.Model):
     _inherit = 'mrp.workorder'
-    _order = 'sequence'
+    _order = 'sequence asc,create_date desc'
 
     product_tmpl_id_length = fields.Float(related='production_id.product_tmpl_id.length', readonly=True, store=True,
                                           check_company=True, string="坯料长度(mm)")
@@ -28,7 +28,7 @@ class ResMrpWorkOrder(models.Model):
                                                    store=True, check_company=True, string="材料")
     product_tmpl_id_materials_type_id = fields.Many2one(related='production_id.product_tmpl_id.materials_type_id',
                                                         readonly=True, store=True, check_company=True, string="型号")
-    workcenter_id = fields.Many2one('mrp.workcenter', required=False)
+    workcenter_id = fields.Many2one('mrp.workcenter', string='工作中心', required=False)
     users_ids = fields.Many2many("res.users", 'users_workorder', related="workcenter_id.users_ids")
     processing_panel = fields.Char('加工面')
     sequence = fields.Integer(string='工序')
@@ -106,6 +106,35 @@ class ResMrpWorkOrder(models.Model):
     picking_in_id = fields.Many2one('stock.picking', string='外协入库单')
     picking_out_id = fields.Many2one('stock.picking', string='外协出库单')
     supplier_id = fields.Many2one('res.partner', string='外协供应商')
+    equipment_id = fields.Many2one('maintenance.equipment', string='加工设备')
+    schedule_state = fields.Selection(related='production_id.schedule_state', store=True)
+    # 工件装夹信息
+    functional_fixture_code = fields.Char(string="功能夹具编码", readonly=True)
+    functional_fixture_serial_number = fields.Char(string="功能夹具序列号", readonly=True)
+    functional_fixture_id = fields.Many2one('sf.functional.fixture', string="功能夹具")
+    functional_fixture_type_id = fields.Many2one('sf.functional.fixture.type', string="功能夹具类型", readonly=True)
+    chuck_serial_number = fields.Char(string="卡盘序列号")
+    chuck_name = fields.Char(string="卡盘名称")
+    chuck_brand_id = fields.Many2one('sf.machine.brand', string="卡盘品牌")
+    chuck_type_id = fields.Char(string="卡盘类型")
+    chuck_model_id = fields.Char(string="卡盘型号")
+    tray_serial_number = fields.Char(string="卡盘序列号")
+    tray_name = fields.Char(string="托盘名称")
+    tray_brand_id = fields.Many2one('sf.machine.brand', string="托盘品牌")
+    tray_type_id = fields.Char(string="托盘类型")
+    tray_model_id = fields.Char(string="托盘型号")
+    total_wight = fields.Float(string="总重量")
+    maximum_carrying_weight = fields.Char(string="最大承载重量[kg]")
+    maximum_clamping_force = fields.Char(string="最大夹持力[n]")
+    production_line = fields.Char(string="生产线")
+    preset_program_information = fields.Char(string="预调程序信息")
+
+    @api.onchange('functional_fixture_id')
+    def _onchange_functional_fixture_id(self):
+        if self.functional_fixture_id:
+            self.functional_fixture_code = self.functional_fixture_id.code
+            self.functional_fixture_type_id = self.functional_fixture_id.type_id.id
+
 
     def get_no_data(self, production_id):
         process_parameter_workorder = self.search(
@@ -165,7 +194,7 @@ class ResMrpWorkOrder(models.Model):
             'operation_id': False,
             'name': route.route_workcenter_id.name,
             'processing_panel': k,
-            'quality_point_ids':route.route_workcenter_id.quality_point_ids,
+            'quality_point_ids': route.route_workcenter_id.quality_point_ids,
             'routing_type': route.routing_type,
             'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
             'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,

sf_manufacturing/models/production_line_base.py

@@ -0,0 +1,30 @@
+from odoo import models,fields
+
+
+class ProductionLine(models.Model):
+    _name = 'sf.production.line'
+    _description = '生产线'
+
+    def _get_code(self):
+        """
+        自动生成编码
+        :return:
+        """
+        fixture_material = self.env['sf.production.line'].sudo().search(
+            [('code', '!=', '')],
+            limit=1,
+            order="id desc")
+        if not fixture_material:
+            num = "%03d" % 1
+        else:
+            m = int(fixture_material.code) + 1
+            num = "%03d" % m
+        return num
+
+    name = fields.Char('生产线')
+    code = fields.Char('编码', default=_get_code, readonly=True)
+    remark = fields.Char('备注')
+
+
+
+

sf_manufacturing/models/stock.py

@@ -231,18 +231,8 @@ class ProductionLot(models.Model):
                     1]
         now = datetime.now().strftime("%Y-%m-%d")
         # formatted_date = now.strftime("%Y-%m-%d")
-        if product.integral_cutting_tool_type_id:
-            return "%s-%s-%03d" % (product.integral_cutting_tool_type_id.code, now, 1)
-        if product.blade_type_id:
-            return "%s-%s-%03d" % (product.blade_type_id.code, now, 1)
-        if product.cutter_bar_type_id:
-            return "%s-%s-%03d" % (product.cutter_bar_type_id.code, now, 1)
-        if product.cutter_pad_type_id:
-            return "%s-%s-%03d" % (product.cutter_pad_type_id.code, now, 1)
-        if product.handle_type_id:
-            return "%s-%s-%03d" % (product.handle_type_id.code, now, 1)
-        if product.chuck_type_id:
-            return "%s-%s-%03d" % (product.chuck_type_id.code, now, 1)
+        if product.cutting_tool_model_id:
+            return "%s-%s-%03d" % (product.cutting_tool_model_id.code, now, 1)
         return "%s-%03d" % (product.name, 1)
 
 

sf_manufacturing/security/ir.model.access.csv

@@ -5,7 +5,7 @@ access_sf_product_model_type_routing_sort,sf_product_model_type_routing_sort,mod
 access_sf_embryo_model_type_routing_sort,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,base.group_user,1,1,1,1
 access_sf_surface_technics_model_type_routing_sort,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,base.group_user,1,1,1,1
 
-
+access_sf_production_line,sf.production.line,model_sf_production_line,base.group_user,1,1,1,1
 
 
 

sf_manufacturing/views/mrp_maintenance_views.xml

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="maintenance_equipment_view_form_inherit_mrp" model="ir.ui.view">
-        <field name="name">maintenance.equipment.view.form.inherit.mrp</field>
-        <field name="model">maintenance.equipment</field>
-        <field name="inherit_id" ref="maintenance.hr_equipment_view_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//div[@name='button_box']" position="inside">
-                <button name="button_mrp_workcenter" type="object" class="oe_stat_button"
-                        icon="fa-cogs" string="Work Center" attrs="{'invisible': [('workcenter_id', '=', False)]}"
-                        groups="mrp.group_mrp_routings">
-                </button>
-            </xpath>
-            <xpath expr="//field[@name='location']" position="after">
-                <field name="workcenter_id" context="{'default_company_id':company_id}"
-                       groups="mrp.group_mrp_routings"/>
-            </xpath>
-            <xpath expr="//group[@name='maintenance']" position="after">
-                <group name="statistics">
-                    <label for="expected_mtbf" string="Expected Mean Time Between Failure"/>
-                    <div class="o_row">
-                        <field name="expected_mtbf"/>
-                        days
-                    </div>
-                    <label for="mtbf" string="Mean Time Between Failure"/>
-                    <div class="o_row">
-                        <field name="mtbf"/>
-                        days
-                    </div>
-                    <label for="estimated_next_failure" string="Estimated Next Failure"/>
-                    <div class="o_row">
-                        <field name="estimated_next_failure"/>
-                    </div>
-                    <field name="latest_failure_date" string="Latest Failure"/>
-                    <label for="mttr" string="Mean Time To Repair"/>
-                    <div class="o_row">
-                        <field name="mttr"/>
-                        days
-                    </div>
-                </group>
-            </xpath>
-        </field>
-    </record>
-
-    <record id="maintenance_request_view_form_inherit_mrp" model="ir.ui.view">
-        <field name="name">maintenance.request.view.form.inherit.mrp</field>
-        <field name="model">maintenance.request</field>
-        <field name="inherit_id" ref="maintenance.hr_equipment_request_view_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='maintenance_type']" position="after">
-                <field name="production_company_id" invisible="1"/>
-                <field name="workorder_id" invisible="1"/>
-                <field name="production_id" options="{'no_create': True, 'no_open': True}"/>
-                <field name="workorder_id" attrs="{'invisible': [('production_id', '=', False)]}"
-                       options="{'no_create': True, 'no_open': True}" domain="[('production_id', '=', production_id)]"
-                       groups="mrp.group_mrp_routings"/>
-                <!-- <field name="repair_id"/> -->
-            </xpath>
-            <xpath expr="//div[hasclass('oe_chatter')]" position="after">
-                <div invisible="not context.get('discard_on_footer_button', False)">
-                    <footer class="oe_edit_only">
-                        <button special="save" data-hotkey="v" string="Save" class="oe_highlight"/>
-                        <button string="Discard" special="cancel" data-hotkey="z"/>
-                    </footer>
-                </div>
-            </xpath>
-            <field name="equipment_id" position="attributes">
-                <attribute name="domain">['|', (not workorder_id and 1 or 0, '=', 1), '|', ('workcenter_id', '=',
-                    False), ('workcenter_id.order_ids', 'in', workorder_id)]
-                </attribute>
-            </field>
-        </field>
-    </record>
-
-    <record id="maintenance_request_view_search_inherit_mrp" model="ir.ui.view">
-        <field name="name">maintenence.request.view.search.inherit.mrp</field>
-        <field name="model">maintenance.request</field>
-        <field name="inherit_id" ref="maintenance.hr_equipment_request_view_search"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='maintenance_team_id']" position="after">
-                <field name="production_id" string="Operation"
-                       filter_domain="['|', ('production_id', 'ilike', self), ('workorder_id', 'ilike', self)]"/>
-            </xpath>
-        </field>
-    </record>
-
-    <menuitem
-            id="maintenance.menu_equipment_form"
-            name="Equipments"
-            parent="maintenance.menu_maintenance_title"
-            groups="maintenance.group_equipment_manager,base.group_user"
-            sequence="2"/>
-    <menuitem id="menu_workcenter_tree"
-              action="mrp.mrp_workcenter_action"
-              groups="mrp.group_mrp_routings"
-              parent="maintenance.menu_equipment_form"
-              sequence="1"/>
-    <menuitem
-            id="menu_equipment_dashboard"
-            name="Machines &amp; Tools"
-            parent="maintenance.menu_equipment_form"
-            action="maintenance.hr_equipment_action"
-            sequence="2"/>
-
-</odoo>

sf_manufacturing/views/mrp_workcenter_views.xml

@@ -88,26 +88,12 @@
         <field name="model">mrp.workcenter</field>
         <field name="inherit_id" ref="mrp.mrp_workcenter_view"/>
         <field name="arch" type="xml">
-            <xpath expr="//notebook" position="inside">
-                <page string="Equipment" name="equipment">
-                    <field name="equipment_ids" widget="many2many">
-                        <tree string="Equipments">
-                            <field name="name"/>
-                            <field name="technician_user_id"/>
-                            <field name="category_id"/>
-                            <field name="mtbf"/>
-                            <field name="mttr"/>
-                            <field name="estimated_next_failure" string="Est. Next Failure"/>
-                        </tree>
-                    </field>
-                </page>
-            </xpath>
             <xpath expr="//field[@name='company_id']" position="after">
                 <field name="users_ids" widget="many2many_tags" string="可操作用户"/>
             </xpath>
-
             <xpath expr="//field[@name='alternative_workcenter_ids']" position="after">
-                <field name="machine_tool_id" domain="[('is_binding','=',False)]"/>
+                <field name="production_line_id"/>
+                <field name="equipment_id"/>
             </xpath>
             <xpath expr="//field[@name='resource_calendar_id']" position="after">
                 <field name="is_process_outsourcing"/>

sf_manufacturing/views/mrp_workorder_view.xml

@@ -7,6 +7,7 @@
         <field name="arch" type="xml">
             <field name="name" position="replace">
                 <field name="is_subcontract" invisible="1"/>
+
                 <field name="name" decoration-success="is_subcontract" decoration-bf="is_subcontract"/>
             </field>
             <field name="name" position="before">
@@ -19,6 +20,9 @@
             <field name="state" position="after">
                 <field name="work_state" optional="hide"/>
             </field>
+            <field name="product_id" position="after">
+                <field name="equipment_id" optional="hide"/>
+            </field>
             <xpath expr="//field[@name='date_planned_start']" position="replace">
                 <field name="date_planned_start" string="计划开始日期" optional="show"/>
             </xpath>
@@ -73,7 +77,7 @@
             (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')}) ]"/>
         <!--        <field name="target">fullscreen</field>-->
         <field name="target">current</field>
-        <field name="domain">[('state', '!=', 'cancel')]</field>
+        <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>
         <field name="context">{'search_default_workcenter_id': active_id}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_workorder">
@@ -91,17 +95,6 @@
         </field>
     </record>
 
-    <!--    <record model="ir.ui.view" id="view_mrp_production_workorder_form_inherit_sf">-->
-    <!--        <field name="name">mrp.production.workorder.form.inherit.sf</field>-->
-    <!--        <field name="model">mrp.workorder</field>-->
-    <!--        <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>-->
-    <!--        <field name="arch" type="xml">-->
-    <!--            <field name="production_id" position="after">-->
-    <!--                <field name="processing_panel" readonly="1"/>-->
-    <!--            </field>-->
-    <!--        </field>-->
-    <!--    </record>-->
-
     <record id="view_mrp_production_workorder_tray_form_inherit_sf" model="ir.ui.view">
         <field name="name">mrp.production.workorder.tray.form.inherit.sf</field>
         <field name="model">mrp.workorder</field>
@@ -111,13 +104,15 @@
 
                 <field name='user_permissions' invisible="1"/>
                 <field name='name' invisible="1"/>
+                <field name='routing_type' invisible="1"/>
                 <button name="button_start" type="object" string="开始" class="btn-success"
                         attrs="{'invisible': ['|', '|', '|','|','|', ('production_state','in', ('draft', 'done',
                     'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),
                     ('is_user_working', '!=', False),('user_permissions','=',False),('name','=','获取CNC加工程序')]}"/>
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
                         attrs="{'invisible': ['|', '|','|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False),('name','=','获取CNC加工程序')]}"/>
-                <button name="button_finish" type="object" string="完成" class="btn-success"/>
+                <button name="button_finish" type="object" string="完成" class="btn-success"
+                        attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
                 <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="停工"
                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
                         attrs="{'invisible': ['|', '|','|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'),('user_permissions','=',False),('name','=','获取CNC加工程序')]}"/>
@@ -125,12 +120,15 @@
                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked'),('name','=','获取CNC加工程序')]}"/>
             </xpath>
-            <!--            隐藏物料清单-->
-<!--            <xpath expr="//page[@name='components']" position="attributes">-->
-<!--                <attribute name="invisible">1</attribute>-->
-<!--            </xpath>-->
-            <!--            隐藏物料清单-->
 
+            <!--            隐藏物料清单-->
+            <!--            <xpath expr="//page[@name='components']" position="attributes">-->
+            <!--                <attribute name="invisible">1</attribute>-->
+            <!--            </xpath>-->
+            <!--            隐藏物料清单-->
+            <xpath expr="//page[@name='components']" position="attributes">
+                <attribute name="string">物料</attribute>
+            </xpath>
             <field name="production_id" position="after" invisible="0">
                 <group>
                     <field name="date_planned_start" invisible="1"/>
@@ -141,6 +139,14 @@
                            sum="real duration"/>
                     <field name="processing_panel" readonly="1"
                            attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
+                    <field name="equipment_id"
+                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
+                    <field name="functional_fixture_id"
+                           attrs='{"invisible": [("routing_type","!=","装夹")]}'/>
+                    <field name="functional_fixture_code" force_save="1"
+                           attrs='{"invisible": [("routing_type","!=","装夹")]}'/>
+                    <field name="functional_fixture_type_id" force_save="1"
+                           attrs='{"invisible": [("routing_type","!=","装夹")]}'/>
                 </group>
                 <group attrs='{"invisible": [("routing_type","=","获取CNC加工程序")]}'>
                     <div>
@@ -165,36 +171,55 @@
                     <group>
                         <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">
                             <button type="object" class="oe_highlight" name="fetchCNC" string="获取CNC程序代码"
-                                    />
+                            />
                         </div>
                     </group>
-
-
                 </page>
-
             </xpath>
             <!--            <page string="Components" name="components">-->
             <xpath expr="//page[1]" position="before">
-                <page string="装夹托盘" attrs='{"invisible": [("routing_type","!=","装夹")]}'>
-                    <group>
-                        <field name="routing_type" invisible="1"/>
-                        <field name="tray_code"/>
-                        <field name="tray_id" readonly="1"/>
-                    </group>
-                    <group>
-                        <field name="pro_code" readonly="1" attrs='{"invisible": [("pro_code_ok","=",False)]}'
-                               style="color:green"/>
-                        <field name="pro_code" readonly="1" attrs='{"invisible": [("pro_code_ok","!=",False)]}'/>
-                        <div>
-                            <field name="pro_code_ok" invisible="1"/>
-                        </div>
+                <!--                <page string="装夹托盘" attrs='{"invisible": [("routing_type","!=","装夹")]}'>-->
+                <!--                    <group>-->
+                <!--                        <field name="routing_type" invisible="1"/>-->
+                <!--                        <field name="tray_code"/>-->
+                <!--                        <field name="tray_id" readonly="1"/>-->
+                <!--                    </group>-->
+                <!--                    <group>-->
+                <!--                        <field name="pro_code" readonly="1" attrs='{"invisible": [("pro_code_ok","=",False)]}'-->
+                <!--                               style="color:green"/>-->
+                <!--                        <field name="pro_code" readonly="1" attrs='{"invisible": [("pro_code_ok","!=",False)]}'/>-->
+                <!--                        <div>-->
+                <!--                            <field name="pro_code_ok" invisible="1"/>-->
+                <!--                        </div>-->
 
-                    </group>
-                    <div class="col-12 col-lg-6 o_setting_box">
-                        <button type="object" class="oe_highlight" name="gettray" string="绑定托盘"
-                                attrs='{"invisible": ["|","|",("tray_id","!=",False),("state","!=","progress"),("production_id","=",False)]}'/>
+                <!--                    </group>-->
+                <!--                    <div class="col-12 col-lg-6 o_setting_box">-->
+                <!--                        <button type="object" class="oe_highlight" name="gettray" string="绑定托盘"-->
+                <!--                                attrs='{"invisible": ["|","|",("tray_id","!=",False),("state","!=","progress"),("production_id","=",False)]}'/>-->
 
-                    </div>
+                <!--                    </div>-->
+                <!--                </page>-->
+                <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹")]}'>
+                    <group>
+                        <group string="卡盘">
+                            <field name="chuck_serial_number"/>
+                            <field name="chuck_name"/>
+                            <field name="chuck_brand_id"/>
+                            <field name="chuck_type_id"/>
+                            <field name="chuck_model_id"/>
+                        </group>
+                        <group string="托盘">
+                            <field name="tray_serial_number"/>
+                            <field name="tray_name"/>
+                            <field name="tray_brand_id"/>
+                            <field name="tray_type_id"/>
+                            <field name="tray_model_id"/>
+                        </group>
+                    </group>
+                    <group string="预调程序信息">
+                        <field name="preset_program_information" colspan="2" nolabel="1"
+                               placeholder="如有预调程序信息请在此处输入....."/>
+                    </group>
                 </page>
 
             </xpath>
@@ -410,5 +435,25 @@
             </xpath>
         </field>
     </record>
+
+    <record id="mrp_workorder_action_schedule" model="ir.actions.act_window">
+        <field name="name">工单</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">mrp.workorder</field>
+        <field name="view_mode">tree,kanban,form</field>
+        <field name="view_id" ref="mrp.mrp_production_workorder_tree_editable_view"/>
+        <field name="search_view_id" ref="mrp.view_mrp_production_work_order_search"/>
+        <field name="domain">[('schedule_state', '=', '已排')]</field>
+    </record>
+
+    <menuitem id="menu_mrp_workorder_schedule_todo"
+              name="工单"
+              action="mrp_workorder_action_schedule"
+              parent="mrp.menu_mrp_manufacturing"
+              sequence="15"/>
+
+    <record id="mrp.menu_mrp_workorder_todo" model="ir.ui.menu">
+        <field name="active" eval="False"/>
+    </record>
 </odoo>
 

sf_manufacturing/views/production_line_view.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="sf_production_line_tree" model="ir.ui.view">
+        <field name="name">生产线</field>
+        <field name="model">sf.production.line</field>
+        <field name="arch" type="xml">
+            <tree string="生产线">
+                <field name="name"/>
+                <field name="code"/>
+                <field name="remark"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_production_line_form" model="ir.ui.view">
+        <field name="name">生产线</field>
+        <field name="model">sf.production.line</field>
+        <field name="arch" type="xml">
+            <form string="生产线">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="remark"/>
+                        </group>
+                        <group>
+                            <field name="code"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_production_line_search" model="ir.ui.view">
+        <field name="name">生产线</field>
+        <field name="model">sf.production.line</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name"/>
+            </search>
+        </field>
+    </record>
+
+    <record id="sf_production_line_kanban" model="ir.ui.view">
+        <field name="name">生产线看板</field>
+        <field name="model">sf.production.line</field>
+        <field name="arch" type="xml">
+            <kanban>
+                <field name="name"/>
+                <templates>
+                <t t-name="kanban-box">
+                    <div class="oe_kanban_global_click">
+                        <!-- 在这里定义每个卡片的内容 -->
+                        <div>
+                            <strong><field name="code"/></strong>
+                            <br/>
+                            <span><field name="name"/></span>
+                            <br/>
+                            <span><field name="remark"/></span>
+                        </div>
+                    </div>
+                </t>
+            </templates>
+
+            </kanban>
+        </field>
+    </record>
+
+    <record id="sf_production_line_act" model="ir.actions.act_window">
+        <field name="name">生产线</field>
+        <field name="res_model">sf.production.line</field>
+        <field name="view_mode">kanban,tree,form</field>
+    </record>
+
+    <menuitem   id="menu_sf_production_line"
+                parent="sf_base.menu_sf_base"
+                name="生产线"
+                sequence="20"
+                action="sf_production_line_act"/>
+</odoo>