From af348c4d8f98b2d4e79994bb3e37bb82929d4104 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Fri, 19 Jan 2024 17:11:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=B9=B3=E5=8F=B0=E6=B4=BE?= =?UTF-8?q?=E5=8D=95=E9=87=87=E8=B4=AD=E5=8D=95=E6=97=A0=E4=B9=B0=E5=AE=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=982.=E8=BF=98=E5=8E=9F=E8=8E=B7=E5=8F=96CNC?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_production.py | 2 +- sf_sale/models/sale_order.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index 44bd0c04..cb326ee8 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -247,7 +247,7 @@ class MrpProduction(models.Model): 'state': 'pending', }] if production.product_id.categ_id.type == '成品': - # production.fetchCNC() + production.fetchCNC() # 根据加工面板的面数及对应的工序模板生成工单 i = 0 processing_panel_len = len(production.product_id.model_processing_panel.split(',')) diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index 7e991132..8a7e68f6 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -128,10 +128,22 @@ class RePurchaseOrder(models.Model): check_status = fields.Selection([('pending', '待审核'), ('approved', '已审核'), ('fail', '不通过')], '审核状态') remark = fields.Text('备注') + user_id = fields.Many2one( + 'res.users', string='买家', index=True, tracking=True, + compute='_compute_user_id', + store=True) def button_confirming(self): self.write({'state': 'purchase', 'check_status': 'pending'}) + @api.depends('partner_id') + def _compute_user_id(self): + if not self.user_id: + if self.partner_id: + self.user_id = self.partner_id.purchase_user_id.id + else: + self.user_id = self.env.user.id + @api.constrains('order_line') def check_order_line(self): for item in self: