From aa810bbda2d5d3de5010f46c3dea6797150ae4f2 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Thu, 18 Jan 2024 17:26:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E8=B4=A8=E6=A3=80=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=20=E4=BF=AE=E6=94=B9coding=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/security/ir.model.access.csv | 35 +++ sf_manufacturing/controllers/controllers.py | 39 ++++ sf_warehouse/views/view.xml | 236 ++++++++++---------- 3 files changed, 192 insertions(+), 118 deletions(-) diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index 1490b9ef..7911552c 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -35,6 +35,41 @@ access_sf_feed_per_tooth,sf_feed_per_tooth,model_sf_feed_per_tooth,base.group_us access_sf_ramping_angle,sf_ramping_angle,model_sf_ramping_angle,base.group_user,1,1,1,1 access_sf_cutting_width_depth,sf_cutting_width_depth,model_sf_cutting_width_depth,base.group_user,1,1,1,1 +access_sf_machine_tool,sf_machine_tool,model_sf_machine_tool,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_machine_tool_type,sf_machine_tool_type,model_sf_machine_tool_type,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_machine_brand,sf_machine_brand,model_sf_machine_brand,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_machine_brand_tags,sf_machine_brand_tags,model_sf_machine_brand_tags,base.group_user,1,1,1,1 +access_sf_machine_control_system,sf_machine_control_system,model_sf_machine_control_system,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_processing_order,sf_processing_order,model_sf_processing_order,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_production_process,sf_production_process,model_sf_production_process,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_production_materials,sf_production_materials,model_sf_production_materials,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_materials_model,sf_materials_model,model_sf_materials_model,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_processing_technology,sf_processing_technology,model_sf_processing_technology,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_supplier_sort,sf_supplier_sort,model_sf_supplier_sort,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_production_process_parameter,sf_production_process_parameter,model_sf_production_process_parameter,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_production_process_category,sf_production_process_category,model_sf_production_process_category,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_machine_tool_category,sf_machine_tool_category,model_sf_machine_tool_category,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_cutting_tool_material,sf_cutting_tool_material,model_sf_cutting_tool_material,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_cutting_tool_type,sf_cutting_tool_type,model_sf_cutting_tool_type,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_functional_cutting_tool,sf_functional_cutting_tool,model_sf_functional_cutting_tool,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_functional_cutting_tool_model,sf_functional_cutting_tool_model,model_sf_functional_cutting_tool_model,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_fixture_material,sf_fixture_material,model_sf_fixture_material,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_fixture_materials_basic_parameters,sf_fixture_materials_basic_parameters,model_sf_fixture_materials_basic_parameters,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_multi_mounting_type,sf_multi_mounting_type,model_sf_multi_mounting_type,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_fixture_model,sf_fixture_model,model_sf_fixture_model,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_functional_fixture_type,sf_functional_fixture_type,model_sf_functional_fixture_type,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_functional_fixture,sf_functional_fixture,model_sf_functional_fixture,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_sync_common,sf_sync_common,model_sf_sync_common,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_international_standards,sf_international_standards,model_sf_international_standards,sf_base.group_sf_mrp_user,1,0,0,0 +access_material_apply,material_apply,model_material_apply,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_cutting_tool_standard_library,sf_cutting_tool_standard_library,model_sf_cutting_tool_standard_library,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_tool_groups,sf_tool_groups,model_sf_tool_groups,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_tool_materials_basic_parameters,sf_tool_materials_basic_parameters,model_sf_tool_materials_basic_parameters,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_cutting_speed,sf_cutting_speed,model_sf_cutting_speed,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_feed_per_tooth,sf_feed_per_tooth,model_sf_feed_per_tooth,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_ramping_angle,sf_ramping_angle,model_sf_ramping_angle,sf_base.group_sf_mrp_user,1,0,0,0 +access_sf_cutting_width_depth,sf_cutting_width_depth,model_sf_cutting_width_depth,sf_base.group_sf_mrp_user,1,0,0,0 + access_maintenance_equipment_image,maintenance_equipment_image,model_maintenance_equipment_image,base.group_user,1,1,1,1 access_purchase_order_group_purchase,access_purchase_order_group_purchase,purchase.model_purchase_order,sf_base.group_purchase,1,1,1,0 access_purchase_order_group_purchase_director,access_purchase_order_group_purchase_director,purchase.model_purchase_order,sf_base.group_purchase_director,1,1,1,0 diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index 221d620b..88bbe016 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -109,3 +109,42 @@ class Manufacturing_Connect(http.Controller): res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} logging.info('get_Work_Info error:%s' % e) return json.JSONEncoder().encode(res) + + + @http.route('/AutoDeviceApi/QcCheck', type='json', auth='none', methods=['GET', 'POST'], csrf=False, + cors="*") + def Workorder_QcCheck(self, **kw): + """ + 零件质检 + :param kw: + :return: + """ + logging.info('get_Work_Info:%s' % kw) + try: + res = {'Succeed': True, 'Datas': []} + datas = request.httprequest.data + ret = json.loads(datas) + if not ret['BillId']: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未传制造订单号'} + return json.JSONEncoder().encode(res) + if not ret['CraftId']: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未传工序名称'} + return json.JSONEncoder().encode(res) + if not ret['DeviceId']: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未传设备号'} + return json.JSONEncoder().encode(res) + if not ret['Quality']: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未传检测结果'} + return json.JSONEncoder().encode(res) + if not ret['ReportPaht']: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未传检查报告文件(地址)'} + return json.JSONEncoder().encode(res) + production_id = ret['BillId'] + routing_type = ret['CraftId'] + request.env['mrp.workorder'].sudo().search( + [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1) + + except Exception as e: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} + logging.info('get_Work_Info error:%s' % e) + return json.JSONEncoder().encode(res) \ No newline at end of file diff --git a/sf_warehouse/views/view.xml b/sf_warehouse/views/view.xml index e4a2ea85..6cd95483 100644 --- a/sf_warehouse/views/view.xml +++ b/sf_warehouse/views/view.xml @@ -206,17 +206,17 @@ - - stock.warehouse.tree.sf.inherit - stock.warehouse - - - - - - - + + + + + + + + + + + @@ -238,17 +238,17 @@ - - stock.route.tree.sf.inherit - stock.route - - - - - - - + + + + + + + + + + + @@ -269,17 +269,17 @@ - - stock.rule.tree.sf.inherit - stock.rule - - - - - - - + + + + + + + + + + + @@ -300,17 +300,17 @@ - - stock.picking.type.tree.sf.inherit - stock.picking.type - - - - - - - + + + + + + + + + + + @@ -332,17 +332,17 @@ - - product.category.tree.sf.inherit - product.category - - - - - - - + + + + + + + + + + + @@ -363,17 +363,17 @@ - - uom.category.tree.sf.inherit - uom.category - - - - - - - + + + + + + + + + + + @@ -394,17 +394,17 @@ - - barcode.nomenclature.tree.sf.inherit - barcode.nomenclature - - - - - - - + + + + + + + + + + + @@ -426,40 +426,40 @@ - - stock.warehouse.orderpoint.tree.sf.inherit - stock.warehouse.orderpoint - - - - -