From 5eacc017555a5329a7635156c9e01ec7d816c744 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Wed, 8 May 2024 16:50:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=20=E8=A3=85?= =?UTF-8?q?=E5=A4=B9=E9=A2=84=E8=B0=83=E5=B7=A5=E5=8D=95=E6=89=AB=E6=8F=8F?= =?UTF-8?q?Rfid=E7=A0=81=E6=97=B6=E6=8F=90=E7=A4=BA=E8=AF=AD=E7=9A=84?= =?UTF-8?q?=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=BA=86=20=E7=9A=84=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=EF=BC=8C=20=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8D=95=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E7=9A=84Rfid=E4=B8=8D=E6=98=AF=E6=89=98=E7=9B=98?= =?UTF-8?q?=E6=98=AF=E5=85=B6=E4=BB=96=E7=89=A9=E6=96=99=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=EF=BC=9B2=E3=80=81=E8=A7=A3=E5=86=B3=E5=88=80?= =?UTF-8?q?=E5=85=B7=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E7=9A=84=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98=EF=BC=9B3?= =?UTF-8?q?=E3=80=81=E7=AE=A1=E7=90=86=E5=91=98=E6=B7=BB=E5=8A=A0=E8=B4=A7?= =?UTF-8?q?=E4=BD=8D=E7=9A=84=E6=93=8D=E4=BD=9C=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 9 ++++++--- sf_tool_management/__manifest__.py | 2 +- .../views/fixture_material_search_views.xml | 8 -------- sf_tool_management/views/menu_view.xml | 8 ++++++++ sf_warehouse/security/ir.model.access.csv | 1 + 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 25436081..8d42f33f 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1040,10 +1040,11 @@ class SfWorkOrderBarcodes(models.Model): workorder = self.env['mrp.workorder'].browse(self.ids) # workorder_preset = self.env['mrp.workorder'].search( # [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)]) - workorder_old = self.env['mrp.workorder'].search([('rfid_code', '=', barcode)]) - if workorder_old: + workorder_olds = self.env['mrp.workorder'].search( + [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)]) + if workorder_olds: name = '' - for workorder in workorder_old: + for workorder in workorder_olds: name = '%s %s' % (name, workorder.production_id.name) raise UserError('该托盘已绑定【%s】制造订单，请先解除绑定！！！' % name) if workorder: @@ -1073,6 +1074,8 @@ class SfWorkOrderBarcodes(models.Model): for item in workorder_rfid: item.write({'rfid_code': barcode}) logging.info("Rfid绑定成功！！！") + else: + raise UserError('该Rfid【%s】绑定的是【%s】, 不是托盘！！！' % (barcode, lot.product_id.name)) self.process_state = '待检测' self.date_start = datetime.now() else: diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py index fc556283..64d08d05 100644 --- a/sf_tool_management/__manifest__.py +++ b/sf_tool_management/__manifest__.py @@ -19,9 +19,9 @@ 'views/functional_tool_views.xml', 'views/mrp_workcenter_views.xml', 'views/sf_maintenance_equipment.xml', - 'views/menu_view.xml', 'views/tool_material_search.xml', 'views/fixture_material_search_views.xml', + 'views/menu_view.xml', 'data/tool_data.xml', ], 'demo': [ diff --git a/sf_tool_management/views/fixture_material_search_views.xml b/sf_tool_management/views/fixture_material_search_views.xml index 546d968e..429be323 100644 --- a/sf_tool_management/views/fixture_material_search_views.xml +++ b/sf_tool_management/views/fixture_material_search_views.xml @@ -95,12 +95,4 @@ sf.fixture.material.search tree,form - - \ No newline at end of file diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml index c964bb35..1228fe07 100644 --- a/sf_tool_management/views/menu_view.xml +++ b/sf_tool_management/views/menu_view.xml @@ -120,5 +120,13 @@ parent="menu_sf_tool_material" /> + + diff --git a/sf_warehouse/security/ir.model.access.csv b/sf_warehouse/security/ir.model.access.csv index 3d7d9a98..8755d7a1 100644 --- a/sf_warehouse/security/ir.model.access.csv +++ b/sf_warehouse/security/ir.model.access.csv @@ -137,6 +137,7 @@ access_sf_shelf_location_wizard_group_sf_stock_user_group_sf_stock_user,sf_shelf access_sf_shelf_location_wizard_group_sf_stock_manager,sf_shelf_location_wizard_group_sf_stock_manager,model_sf_shelf_location_wizard,sf_warehouse.group_sf_stock_manager,1,1,1,0 access_sf_shelf_location_group_sf_tool_user,sf.shelf.location.group_sf_tool_user,model_sf_shelf_location,sf_base.group_sf_tool_user,1,1,0,0 +access_sf_shelf_group_user,sf.shelf.location.group_user,model_sf_shelf_location,base.group_user,1,1,0,0