From 4dfac9e96f4f700677e0f09861f5286d268b17da Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Tue, 25 Mar 2025 13:26:12 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=8C=87=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality_control/controllers/main.py | 28 +++---- quality_control/models/quality.py | 112 +++++++++++++--------------- 2 files changed, 64 insertions(+), 76 deletions(-) diff --git a/quality_control/controllers/main.py b/quality_control/controllers/main.py index 5bbe71a9..39d9457b 100644 --- a/quality_control/controllers/main.py +++ b/quality_control/controllers/main.py @@ -90,25 +90,25 @@ class QualityController(http.Controller): ('Access-Control-Allow-Headers', 'Content-Type, Authorization') ] ) - + + class QualityReportController(http.Controller): - - @http.route('/quality/report/', type='http', auth='public') - def get_public_report(self, attachment_id, **kw): + @http.route('/quality/report/', type='http', auth='public') + def get_public_report(self, document_id, **kw): """提供公开访问PDF报告的控制器""" - attachment = request.env['ir.attachment'].sudo().browse(int(attachment_id)) - - # 安全检查：确保只有质检报告附件可以被访问 - if attachment.exists() and 'QC-' in attachment.name: - # 解码Base64数据为二进制数据 - pdf_content = base64.b64decode(attachment.datas) - - # 返回解码后的PDF内容 + document = request.env['documents.document'].sudo().browse(int(document_id)) + + # 安全检查：确保只有质检报告文档可以被访问 + if document.exists() and document.res_model == 'quality.check': + # 获取PDF内容 + pdf_content = document.raw + + # 返回PDF内容 return request.make_response( pdf_content, headers=[ ('Content-Type', 'application/pdf'), - ('Content-Disposition', f'inline; filename={attachment.name}') + ('Content-Disposition', f'inline; filename={document.name}.pdf') ] ) - return request.not_found() \ No newline at end of file + return request.not_found() diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py index 022dc6b7..010c5d95 100644 --- a/quality_control/models/quality.py +++ b/quality_control/models/quality.py @@ -183,10 +183,12 @@ class QualityCheck(models.Model): report_number_name = fields.Char('出厂检验报告编号名称', compute='_compute_report_number_name') old_report_name = fields.Char('旧出厂检验报告编号', default='') + @api.depends('serial_number', 'part_number') def _compute_report_number_name(self): for record in self: - str_serial_number = '0' + str(record.serial_number) if record.serial_number < 10 else str(record.serial_number) + str_serial_number = '0' + str(record.serial_number) if record.serial_number < 10 else str( + record.serial_number) str_part_number = record.part_number if record.part_number else '' record.report_number_name = f'FQC{str_part_number}{str_serial_number}' @@ -284,25 +286,7 @@ class QualityCheck(models.Model): """实际执行发布操作的方法""" self.ensure_one() - # 1. 获取报告动作 - report_action = self.env.ref('sf_quality.action_report_quality_inspection') - - # 2. 生成PDF报告 - 修改这里的调用方式 - pdf_content, _ = report_action._render_qweb_pdf( - report_ref=report_action.report_name, # 添加report_ref参数 - res_ids=self.ids - ) - - # attachment = self.env['ir.attachment'].create({ - # 'name': f'{self.name}.pdf', - # 'type': 'binary', - # 'datas': b64encode(pdf_content), - # 'res_model': self._name, - # 'res_id': self.id, - # 'mimetype': 'application/pdf', - # }) - - # 获取已发布的文档文件夹 + # 1. 获取已发布的文档文件夹 workspace = self.env['documents.folder'].search( [('parent_folder_id', '=', self.env.ref('sf_quality.documents_purchase_contracts_folder').id), ('name', '=', '已发布')], limit=1) @@ -310,11 +294,9 @@ class QualityCheck(models.Model): if self.serial_number > 99: raise UserError(_('流水号不能大于99')) - # 3. 创建文档记录 + # 2. 先创建空文档记录 doc_vals = { 'name': self.report_number_name, - 'raw': pdf_content, - # 'attachment_id': attachment.id, 'mimetype': 'application/pdf', 'res_id': self.id, 'folder_id': workspace.id, @@ -322,13 +304,26 @@ class QualityCheck(models.Model): } doc = self.env['documents.document'].create(doc_vals) - # 关联到当前质检记录 + + # 3. 关联文档到质检记录 self.write({ 'report_number_id': doc.id, 'quality_state': 'pass' }) - # 记录发布历史 + # 4. 获取报告动作并生成PDF（此时二维码将包含正确的文档ID） + report_action = self.env.ref('sf_quality.action_report_quality_inspection') + pdf_content, _ = report_action._render_qweb_pdf( + report_ref=report_action.report_name, + res_ids=self.ids + ) + + # 5. 更新文档内容 + doc.write({ + 'raw': pdf_content + }) + + # 6. 记录发布历史 self.env['quality.check.report.history'].create({ 'check_id': self.id, 'report_number_id': doc.id, @@ -339,18 +334,17 @@ class QualityCheck(models.Model): 'sequence': len(self.report_history_ids) + 1 }) - # 更新流水号 + # 7. 更新其他信息 self.serial_number += 1 self.quality_manager = self.env.user.id if self.publish_status == 'canceled' and self.picking_id.state == 'done': self.upload_factory_report() - + self.write({ 'publish_status': 'published', }) - # 返回成功消息 return True # 发布前检验零件图号、操机员、质检员 @@ -397,7 +391,7 @@ class QualityCheck(models.Model): self.report_number_id.write({ 'folder_id': self.env.ref('sf_quality.documents_purchase_contracts_folder_canceled').id, }) - + # 3. 记录发布历史 self.env['quality.check.report.history'].create({ 'check_id': self.id, @@ -408,7 +402,7 @@ class QualityCheck(models.Model): 'document_status': 'canceled', 'sequence': len(self.report_history_ids) + 1 }) - + self.write({ 'old_report_name': self.report_number_id.name }) @@ -442,7 +436,7 @@ class QualityCheck(models.Model): width=140, height=140) ) ) - + def get_latest_report_attachment(self, check_id): """获取指定质检记录的最新报告附件，并删除旧的报告附件""" # 查找特定质检记录的所有附件 @@ -459,20 +453,14 @@ class QualityCheck(models.Model): # 返回最新的附件（如果存在） return attachments and attachments[0] or False - + def get_report_url(self): - """生成报告访问URL，确保获取最新版本""" - base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') - report_url = f"{base_url}/web/content/ir.attachment" - - # 获取最新附件的ID - latest_attachment = self.get_latest_report_attachment(self.id) - if latest_attachment: - # 生成包含附件ID的URL - print(f"{base_url}/quality/report/{latest_attachment.id}") - return f"{base_url}/quality/report/{latest_attachment.id}" + """生成报告访问URL""" + self.ensure_one() + if self.report_number_id: + return f'/quality/report/{self.report_number_id.id}' return False - + def upload_factory_report(self): """ 上传出厂检验报告到加工订单明细中 @@ -481,39 +469,40 @@ class QualityCheck(models.Model): self.ensure_one() if not self.report_content: raise UserError(_('当前质检单没有出厂检验报告，请先发布报告')) - + if not self.product_id.model_name: raise UserError(_('产品模型名称为空')) - + if not self.picking_id or not self.picking_id.origin: raise UserError(_('无法找到相关的调拨单或来源单据')) - + # 获取订单号（从调拨单的来源字段获取） order_ref = self.picking_id.retrospect_ref - + try: # 准备请求数据 payload = { "order_ref": order_ref, "model_name": self.product_id.model_name, - "report_file": self.report_content.decode('utf-8') if isinstance(self.report_content, bytes) else self.report_content + "report_file": self.report_content.decode('utf-8') if isinstance(self.report_content, + bytes) else self.report_content } - + # 将Python字典转换为JSON字符串 json_data = json.dumps(payload) - + # 获取服务器URL base_url = self.env['ir.config_parameter'].sudo().get_param('bfm_url_new') api_url = f"{base_url}/api/report/create" - + # 设置请求头 headers = { 'Content-Type': 'application/json', } - + # 发送POST请求 response = requests.post(api_url, data=json_data, headers=headers) - + # 处理响应 if response.status_code == 200: result = response.json() @@ -536,10 +525,10 @@ class QualityCheck(models.Model): else: # HTTP请求失败 raise UserError(_('请求失败，状态码: %s') % response.status_code) - + except Exception as e: raise UserError(_('上传过程中发生错误: %s') % str(e)) - + def delete_factory_report(self): """ 删除加工订单明细中的出厂检验报告 @@ -549,7 +538,7 @@ class QualityCheck(models.Model): if not order_ref: raise UserError(_('无法找到相关的调拨单或来源单据')) - + if not self.product_id.model_name: raise UserError(_('产品模型名称为空')) @@ -558,11 +547,11 @@ class QualityCheck(models.Model): payload = { "order_ref": order_ref, "model_name": self.product_id.model_name - } - + } + # 将Python字典转换为JSON字符串 json_data = json.dumps(payload) - + # 获取服务器URL base_url = self.env['ir.config_parameter'].sudo().get_param('bfm_url_new') api_url = f"{base_url}/api/report/delete" @@ -597,10 +586,9 @@ class QualityCheck(models.Model): else: # HTTP请求失败 raise UserError(_('请求失败，状态码: %s') % response.status_code) - + except Exception as e: - raise UserError(_('删除过程中发生错误: %s') % str(e)) - + raise UserError(_('删除过程中发生错误: %s') % str(e)) @depends('product_id') def _compute_material_name(self): From 2275f7a384528beda6374497bd33bf125be1d3ff Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Tue, 25 Mar 2025 13:28:31 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7=E8=B7=B3=E8=BD=AC=E9=93=BE?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_purchase_request/__manifest__.py | 1 + jikimo_purchase_request/models/__init__.py | 1 + .../models/mrp_production.py | 39 +++++++++++++++++++ .../views/mrp_production.xml | 21 ++++++++++ 4 files changed, 62 insertions(+) create mode 100644 jikimo_purchase_request/models/mrp_production.py create mode 100644 jikimo_purchase_request/views/mrp_production.xml diff --git a/jikimo_purchase_request/__manifest__.py b/jikimo_purchase_request/__manifest__.py index d919b25d..dad34ddc 100644 --- a/jikimo_purchase_request/__manifest__.py +++ b/jikimo_purchase_request/__manifest__.py @@ -9,6 +9,7 @@ 'depends': ['sf_manufacturing', 'purchase_request'], 'data': [ 'views/sale_order_view.xml', + 'views/mrp_production.xml', 'views/purchase_request_view.xml', 'wizard/purchase_request_line_make_purchase_order_view.xml', ], diff --git a/jikimo_purchase_request/models/__init__.py b/jikimo_purchase_request/models/__init__.py index d27a3cd0..433b063d 100644 --- a/jikimo_purchase_request/models/__init__.py +++ b/jikimo_purchase_request/models/__init__.py @@ -2,5 +2,6 @@ from . import product_template from . import purchase_request from . import sale_order +from . import mrp_production from . import purchase_order from . import stock_rule diff --git a/jikimo_purchase_request/models/mrp_production.py b/jikimo_purchase_request/models/mrp_production.py new file mode 100644 index 00000000..c1c0feb9 --- /dev/null +++ b/jikimo_purchase_request/models/mrp_production.py @@ -0,0 +1,39 @@ +from odoo import fields, models, api, _ + + +class MrpProduction(models.Model): + _inherit = 'mrp.production' + + pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True) + + @api.depends('state') + def _compute_pr_mp_count(self): + for item in self: + pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', item.name)]) + if pr_ids: + item.pr_mp_count = len(pr_ids) + else: + item.pr_mp_count = 0 + + def action_view_pr_mp(self): + """ + 采购请求 + """ + self.ensure_one() + pr_ids = self.env['purchase.request'].sudo().search([('origin', 'like', self.name)]) + action = { + 'res_model': 'purchase.request', + 'type': 'ir.actions.act_window', + } + if len(pr_ids) == 1: + action.update({ + 'view_mode': 'form', + 'res_id': pr_ids[0].id, + }) + else: + action.update({ + 'name': _("从 %s生成采购请求单", self.name), + 'domain': [('id', 'in', pr_ids)], + 'view_mode': 'tree,form', + }) + return action diff --git a/jikimo_purchase_request/views/mrp_production.xml b/jikimo_purchase_request/views/mrp_production.xml new file mode 100644 index 00000000..6b0e3c2b --- /dev/null +++ b/jikimo_purchase_request/views/mrp_production.xml @@ -0,0 +1,21 @@ + + + + mrp.production.inherited.form.purchase.request + mrp.production + + + + + + + + \ No newline at end of file From 73ae2cd5c369ab98cff681dec65a94b61745018d Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Tue, 25 Mar 2025 14:06:23 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality_control/models/quality.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py index 010c5d95..a3fe0460 100644 --- a/quality_control/models/quality.py +++ b/quality_control/models/quality.py @@ -457,8 +457,10 @@ class QualityCheck(models.Model): def get_report_url(self): """生成报告访问URL""" self.ensure_one() + base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') if self.report_number_id: - return f'/quality/report/{self.report_number_id.id}' + print(f"{base_url}/quality/report/{self.report_number_id.id}") + return f"{base_url}/quality/report/{self.report_number_id.id}" return False def upload_factory_report(self): From f011c1efda068943f11ac75464b6a126f4f60f9b Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Tue, 25 Mar 2025 15:00:18 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality_control/controllers/main.py | 6 +++++ quality_control/models/quality.py | 3 ++- .../data/insepection_report_template.xml | 25 +++++++++++++------ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/quality_control/controllers/main.py b/quality_control/controllers/main.py index 39d9457b..95b11f5c 100644 --- a/quality_control/controllers/main.py +++ b/quality_control/controllers/main.py @@ -112,3 +112,9 @@ class QualityReportController(http.Controller): ] ) return request.not_found() + + @http.route('/quality/report/not_published', type='http', auth='public') + def get_not_published_report(self, **kw): + """提供未发布报告的控制器""" + return "报告尚未发布" + diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py index a3fe0460..412305b2 100644 --- a/quality_control/models/quality.py +++ b/quality_control/models/quality.py @@ -461,7 +461,8 @@ class QualityCheck(models.Model): if self.report_number_id: print(f"{base_url}/quality/report/{self.report_number_id.id}") return f"{base_url}/quality/report/{self.report_number_id.id}" - return False + else: + return f"{base_url}/quality/report/not_published" def upload_factory_report(self): """ diff --git a/sf_quality/data/insepection_report_template.xml b/sf_quality/data/insepection_report_template.xml index f605b3e4..8362a589 100644 --- a/sf_quality/data/insepection_report_template.xml +++ b/sf_quality/data/insepection_report_template.xml @@ -16,13 +16,24 @@
- -
- 报告编号：ceshi -
-
- 扫描二维码查看PDF报告 -
+ + +
+ 报告编号： +
+
+ 扫描二维码查看PDF报告 +
+ + + +
+ 报告编号：ceshi +
+
+ 扫描二维码查看PDF报告 +
+
From 3e9a11dd7b278f254ca5094dd08dcaa4204ae13d Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Tue, 25 Mar 2025 15:02:26 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_purchase_request/views/mrp_production.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jikimo_purchase_request/views/mrp_production.xml b/jikimo_purchase_request/views/mrp_production.xml index 6b0e3c2b..0f59a396 100644 --- a/jikimo_purchase_request/views/mrp_production.xml +++ b/jikimo_purchase_request/views/mrp_production.xml @@ -5,8 +5,8 @@ mrp.production - - From 6a70f3b88a4dd937dc95d1987ed56edd593650a6 Mon Sep 17 00:00:00 2001 From: guanhuan Date: Wed, 26 Mar 2025 14:32:53 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E5=9D=AF=E6=96=99=E5=86=97=E4=BD=99?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8F=8F=E8=BF=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/base.py | 1 + sf_base/views/base_view.xml | 1 + sf_mrs_connect/models/sync_common.py | 2 ++ 3 files changed, 4 insertions(+) diff --git a/sf_base/models/base.py b/sf_base/models/base.py index d7a71e1e..54a1fe1f 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -421,3 +421,4 @@ class EmbryoRedundancy(models.Model): width = fields.Float('宽度(mm)', required=True) height = fields.Float('高度(mm)', required=True) active = fields.Boolean('有效', default=True) + remark = fields.Char('描述') diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index bd6f103b..ccac31c9 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -645,6 +645,7 @@ + diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index cd0d8405..652ec3eb 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -3214,6 +3214,7 @@ class EmbryoRedundancySync(models.Model): embryo_redundancy.width = item['width'] embryo_redundancy.height = item['height'] embryo_redundancy.active = item['active'] + embryo_redundancy.remark = item['remark'] else: self.env['sf.embryo.redundancy'].sudo().create({ "name": item['name'], @@ -3222,4 +3223,5 @@ class EmbryoRedundancySync(models.Model): "width": item['width'], "height": item['height'], "active": item['active'], + "remark": item['remark'], }) \ No newline at end of file