From 1a384b990207e724fdadf7e15320c3d4abc38513 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Wed, 8 Jan 2025 17:24:58 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=88=B6=E9=80=A0-?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=A8=A1=E5=9D=97=EF=BC=9B2=E3=80=81?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=BA=8F=E4=B8=AA=E6=80=A7=E5=8C=96?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=A8=A1=E5=9E=8B=EF=BC=8C=E5=B9=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=94=9F=E6=88=90=E5=88=9D=E5=A7=8B=E5=8C=96=E5=80=BC?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/__manifest__.py | 1 + sf_manufacturing/data/sf_work_individuation_page.xml | 8 ++++++++ sf_manufacturing/models/mrp_routing_workcenter.py | 9 +++++++++ sf_manufacturing/security/ir.model.access.csv | 5 ++++- sf_manufacturing/views/mrp_routing_workcenter_view.xml | 2 ++ 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 sf_manufacturing/data/sf_work_individuation_page.xml diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py index 936afaaf..cffc789a 100644 --- a/sf_manufacturing/__manifest__.py +++ b/sf_manufacturing/__manifest__.py @@ -16,6 +16,7 @@ 'data/stock_data.xml', 'data/empty_racks_data.xml', 'data/panel_data.xml', + 'data/sf_work_individuation_page.xml', 'data/agv_scheduling_data.xml', 'security/group_security.xml', 'security/ir.model.access.csv', diff --git a/sf_manufacturing/data/sf_work_individuation_page.xml b/sf_manufacturing/data/sf_work_individuation_page.xml new file mode 100644 index 00000000..89bf333b --- /dev/null +++ b/sf_manufacturing/data/sf_work_individuation_page.xml @@ -0,0 +1,8 @@ + + + + PTD + 后置三元检测 + + + \ No newline at end of file diff --git a/sf_manufacturing/models/mrp_routing_workcenter.py b/sf_manufacturing/models/mrp_routing_workcenter.py index 27c8e9d2..a2a884c9 100644 --- a/sf_manufacturing/models/mrp_routing_workcenter.py +++ b/sf_manufacturing/models/mrp_routing_workcenter.py @@ -25,6 +25,8 @@ class ResMrpRoutingWorkcenter(models.Model): bom_id = fields.Many2one('mrp.bom', required=False) surface_technics_id = fields.Many2one('sf.production.process', string="表面工艺") reserved_duration = fields.Float('预留时长', default=30, tracking=True) + is_outsource = fields.Boolean('外协', default=False) + individuation_page = fields.Many2many('sf.work.individuation.page', string='个性化记录') def get_no(self): international_standards = self.search( @@ -101,3 +103,10 @@ class ResMrpRoutingWorkcenter(models.Model): domain = args + [('id', 'not in', route_workcenter_ids)] return self._search(domain, limit=limit, access_rights_uid=name_get_uid) return super()._name_search(name, args, operator, limit, name_get_uid) + + +class WorkIndividuationPage(models.Model): + _name = 'sf.work.individuation.page' + + code = fields.Char('编号') + name = fields.Char('名称') diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv index b8862b8d..4626e3ca 100644 --- a/sf_manufacturing/security/ir.model.access.csv +++ b/sf_manufacturing/security/ir.model.access.csv @@ -186,4 +186,7 @@ access_sf_detection_result_manager,sf_detection_result_manager,model_sf_detectio access_mrp_workorder_batch_replan_wizard_group_plan_dispatch,mrp_workorder_batch_replan_wizard_group_plan_dispatch,model_mrp_workorder_batch_replan_wizard,sf_base.group_plan_dispatch,1,1,1,0 access_mrp_workorder_group_purchase_director,mrp_workorder,model_mrp_workorder,sf_base.group_purchase_director,1,1,0,0 -access_mrp_workorder_group_purchase,mrp_workorder,model_mrp_workorder,sf_base.group_purchase,1,1,0,0 \ No newline at end of file +access_mrp_workorder_group_purchase,mrp_workorder,model_mrp_workorder,sf_base.group_purchase,1,1,0,0 + +access_sf_work_individuation_page,sf_work_individuation_page,model_sf_work_individuation_page,sf_base.group_sf_mrp_user,1,1,1,0 +access_sf_work_individuation_page_group_plan_dispatch,sf_work_individuation_page_group_plan_dispatch,model_sf_work_individuation_page,sf_base.group_plan_dispatch,1,1,0,0 \ No newline at end of file diff --git a/sf_manufacturing/views/mrp_routing_workcenter_view.xml b/sf_manufacturing/views/mrp_routing_workcenter_view.xml index ddb9558c..b6646dfa 100644 --- a/sf_manufacturing/views/mrp_routing_workcenter_view.xml +++ b/sf_manufacturing/views/mrp_routing_workcenter_view.xml @@ -17,6 +17,8 @@ + +