From 8ff635e9010b5a8a2b979a2169f343a06a016ee6 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Tue, 19 Dec 2023 16:32:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=8F=9C=E5=8D=95=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_plan/views/view.xml | 14 +++---- sf_plan_management/views/menu_view.xml | 58 +++++++++++++------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml index ee3d441d..6bfdd281 100644 --- a/sf_plan/views/view.xml +++ b/sf_plan/views/view.xml @@ -322,13 +322,13 @@ action="mrp_custom_action" parent="sf_production_plan_menu" /> - + + + + + + + - + + + + + - - + + + + + + + + + + + + - + + + + + + - + + + + + + From ff904ad68c691e2d2ce6558766d413902dcb087c Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Wed, 20 Dec 2023 17:54:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/security/ir.model.access.csv | 1 + sf_maintenance/security/ir.model.access.csv | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index c07cc8c6..3c186a98 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -38,6 +38,7 @@ access_purchase_order_line_group_purchase_director,access_purchase_order_line_gr access_purchase_order,purchase.order,purchase.model_purchase_order,sf_base.group_plan_dispatch,1,0,0,0 +access_res_partner,res.partner,base.model_res_partner,sf_base.group_plan_dispatch,1,0,0,0 access_purchase_order_line,purchase.order.line,purchase.model_purchase_order_line,sf_base.group_plan_dispatch,1,0,0,0 access_account_move_line,account.move.line,account.model_account_move_line,sf_base.group_plan_dispatch,1,0,0,0 diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv index 3396ae59..4f693af2 100644 --- a/sf_maintenance/security/ir.model.access.csv +++ b/sf_maintenance/security/ir.model.access.csv @@ -7,6 +7,8 @@ access_maintenance_standard_image,maintenance_standard_image,model_maintenance_s access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_user,1,1,1,1 -access_maintenance_request,maintenance_request,model_maintenance_request,sf_base.group_plan_dispatch,1,0,0,0 +access_maintenance_request,maintenance.request,maintenance.model_maintenance_request,sf_base.group_plan_dispatch,1,0,0,0 +access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,sf_base.group_plan_dispatch,1,0,0,0 access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,sf_base.group_plan_dispatch,1,0,0,0 +access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_base.group_plan_dispatch,1,0,0,0 access_equipment_maintenance_standards,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_base.group_plan_dispatch,1,0,0,0 \ No newline at end of file From 98c9f3098bbefe87ec35f6060f4c694d25590486 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Thu, 21 Dec 2023 10:53:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=A4=84=E5=A2=9E=E5=8A=A0=E5=AE=9E=E9=99=85=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E5=AE=9E=E9=99=85=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E6=98=AF=E5=90=A6=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E3=80=81=E5=8A=A0=E5=B7=A5=E4=BA=BA=E3=80=81=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E4=BA=BA=E3=80=81=E5=AE=9E=E9=99=85=E5=8A=A0=E5=B7=A5=E6=9C=BA?= =?UTF-8?q?=E5=8F=B0=E7=AD=89=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 5 +++++ sf_manufacturing/security/ir.model.access.csv | 1 + sf_manufacturing/views/mrp_workorder_view.xml | 13 +++++++++++++ 3 files changed, 19 insertions(+) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index d1fae8e6..526f7e26 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -105,6 +105,11 @@ class ResMrpWorkOrder(models.Model): picking_out_id = fields.Many2one('stock.picking', string='外协出库单') supplier_id = fields.Many2one('res.partner', string='外协供应商') equipment_id = fields.Many2one('maintenance.equipment', string='加工设备') + is_ok = fields.Boolean(string='是否合格') + # 加工人 + processing_user_id = fields.Many2one('res.users', string='加工人') + # 检测人 + inspection_user_id = fields.Many2one('res.users', string='检测人') schedule_state = fields.Selection(related='production_id.schedule_state', store=True) # 工件装夹信息 functional_fixture_code = fields.Char(string="功能夹具编码", readonly=True) diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv index f4f8948a..36f54516 100644 --- a/sf_manufacturing/security/ir.model.access.csv +++ b/sf_manufacturing/security/ir.model.access.csv @@ -101,6 +101,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,sf_base.group_plan_dispatch,1,0,0,0 access_sf_surface_technics_model_type_routing_sort,sf.surface_technics.model.type.routing.sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_plan_dispatch,1,0,0,0 access_mrp_workcenter_capacity,mrp.workcenter.capacity,mrp.model_mrp_workcenter_capacity,sf_base.group_plan_dispatch,1,0,0,0 +access_sf_cnc_processing,sf.cnc.processing,model_sf_cnc_processing,sf_base.group_plan_dispatch,1,0,0,0 diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 99a2b69d..53373c51 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -453,6 +453,19 @@ + + + + + + + From e196b6b1e30259d0192cfb1eb31c5bfdaf4edefa Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Fri, 22 Dec 2023 14:58:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mrp_production_addional_change.xml | 8 +-- sf_plan/views/change_manufactuing.xml | 72 +++++++++---------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml index 8f183857..3727bb10 100644 --- a/sf_manufacturing/views/mrp_production_addional_change.xml +++ b/sf_manufacturing/views/mrp_production_addional_change.xml @@ -61,10 +61,10 @@ -