From d22f08d1875bfd15baea4ece4f316abc3bb65fed Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Tue, 21 May 2024 21:41:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E5=88=80?= =?UTF-8?q?=E5=85=B7=E9=A2=84=E8=B0=83=E4=BB=AA=E6=8E=A5=E5=8F=A3=EF=BC=9B?= =?UTF-8?q?2=E3=80=81=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=A7=8B=E9=A2=84=E8=B0=83=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96=E7=BB=84=E8=A3=85=E6=8C=89?= =?UTF-8?q?=E9=94=AE=EF=BC=9B3=E3=80=81=E4=BC=98=E5=8C=96=E7=BB=84?= =?UTF-8?q?=E8=A3=85=E5=8D=95=E7=BB=84=E8=A3=85=E6=97=B6=E7=9A=84=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E6=8C=89=E9=92=AE=E7=94=A8=E6=9D=A5=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=88=80=E5=85=B7=E9=A2=84=E8=B0=83=E4=BB=AA=E7=9A=84=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BF=A1=E6=81=AF=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/controllers/controllers.py | 30 +++++++ sf_tool_management/models/base.py | 31 +++++++ sf_tool_management/views/tool_base_views.xml | 61 +------------- sf_tool_management/wizard/wizard.py | 62 +++++++++----- sf_tool_management/wizard/wizard_view.xml | 82 ++++++++++--------- 5 files changed, 151 insertions(+), 115 deletions(-) diff --git a/sf_tool_management/controllers/controllers.py b/sf_tool_management/controllers/controllers.py index a524f0bc..fedaa25f 100644 --- a/sf_tool_management/controllers/controllers.py +++ b/sf_tool_management/controllers/controllers.py @@ -36,3 +36,33 @@ class Manufacturing_Connect(http.Controller): res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} logging.info('get_functional_tool_groups_Info error:%s' % e) return json.JSONEncoder().encode(res) + + @http.route('/AutoDeviceApi/PutToolParameter', type='json', auth='none', methods=['GET', 'POST'], csrf=False, + cors="*") + def put_tool_preset_parameter_port(self, **kw): + """ + 刀具预调仪接口 + :param kw: + :return: + """ + logging.info('put_tool_preset_parameter_port:%s' % kw) + res = {'Succeed': True, 'Datas': []} + try: + datas = request.httprequest.data + ret = json.loads(datas) + tool_assembly = request.env['sf.functional.tool.assembly'].sudo().search([('start_preset_bool', '=', True)]) + tool_assembly_order = request.env['sf.functional.tool.assembly.order'].sudo().search([]) + if not tool_assembly: + return json.JSONEncoder().encode( + {'Succeed': False, 'ErrorCode': 201, 'Error': '没有找到正在组装的组装单！'}) + tool_assembly.write({ + 'after_assembly_tool_loading_length': ret['loading_length'], + 'after_assembly_functional_tool_length': ret['functional_tool_length'], + 'after_assembly_max_lifetime_value': ret['max_lifetime_value'], + 'after_assembly_alarm_value': 100, + 'after_assembly_effective_length': 100 + }) + except Exception as e: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '缺少%s字段信息' % e} + logging.info('put_tool_preset_parameter_port error:%s' % e) + return json.JSONEncoder().encode(res) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 4a440df6..be10f803 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -538,6 +538,7 @@ class FunctionalToolAssembly(models.Model): chuck_name = fields.Char('') # ============================================== # 组装功能刀具参数信息 + start_preset_bool = fields.Boolean('开始预调', default=False) barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True) after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', @@ -574,6 +575,36 @@ class FunctionalToolAssembly(models.Model): active = fields.Boolean(string='已归档', default=True) + def put_start_preset(self): + self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False}) + self.write({'start_preset_bool': True}) + return { + 'type': 'ir.actions.act_window', + 'res_model': 'sf.functional.tool.assembly.order', + 'name': '功能刀具组装单', + 'view_mode': 'form', + 'target': 'new', + 'context': {'default_name': self.name, + 'default_assembly_order_code': self.assembly_order_code, + 'default_production_line_name_id': self.production_line_name_id, + 'default_machine_tool_name_id': self.machine_tool_name_id, + 'default_cutter_spacing_code_id': self.cutter_spacing_code_id, + 'default_functional_tool_name': self.functional_tool_name, + 'default_functional_tool_type_id': self.functional_tool_type_id, + 'default_tool_groups_id': self.tool_groups_id, + 'default_functional_tool_diameter': self.functional_tool_diameter, + 'default_knife_tip_r_angle': self.knife_tip_r_angle, + 'default_tool_loading_length': self.tool_loading_length, + 'default_functional_tool_length': self.functional_tool_length, + 'default_effective_length': self.effective_length, + 'default_whether_standard_knife': self.whether_standard_knife, + 'default_coarse_middle_thin': self.coarse_middle_thin, + 'default_new_former': self.new_former, + 'default_use_tool_time': self.use_tool_time, + 'default_reason_for_applying': self.reason_for_applying + } + } + def _get_code(self, loading_task_source): """ 自动生成组装单编码 diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 06a60b1c..e0f13596 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -451,36 +451,9 @@ - - -