diff --git a/sf_demand_plan/models/sf_demand_plan.py b/sf_demand_plan/models/sf_demand_plan.py index 9473f636..bfdfc022 100644 --- a/sf_demand_plan/models/sf_demand_plan.py +++ b/sf_demand_plan/models/sf_demand_plan.py @@ -38,7 +38,7 @@ class SfDemandPlan(models.Model): related='product_id.blank_type') blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型', related='product_id.blank_precision') - manual_quotation = fields.Boolean('人工编程',related='product_id.manual_quotation', default=False) + manual_quotation = fields.Boolean('人工编程', related='product_id.manual_quotation', default=False) embryo_long = fields.Char('坯料尺寸(mm)', compute='_compute_embryo_long', store=True) is_incoming_material = fields.Boolean('客供料', related='sale_order_line_id.is_incoming_material', store=True) pending_qty = fields.Float( @@ -224,10 +224,10 @@ class SfDemandPlan(models.Model): customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers') if not self.overdelivery_allowed and line_ids.filtered(lambda p: p.location_id.id == customer_location_id): if float_compare(sum_product_uom_qty, self.product_uom_qty, - precision_rounding=self.product_id.uom_id.rounding) == 1: + precision_rounding=self.product_id.uom_id.rounding) == 1: raise ValidationError(f"已禁止向合作伙伴/客户超量发货,请更换“补货原因”或将“可超量发货”设置为“是”。") elif float_compare(sum_product_uom_qty, self.product_uom_qty, - precision_rounding=self.product_id.uom_id.rounding) == 1: + precision_rounding=self.product_id.uom_id.rounding) == 1: return { 'name': _('需求计划'), 'type': 'ir.actions.act_window', @@ -243,11 +243,12 @@ class SfDemandPlan(models.Model): else: for demand_plan_line_id in line_ids: demand_plan_line_id.action_confirm() - #需求要求取值格式是来源+来源明细行ID,但是来源明细行ID取得就是product_id.name得最后一位,所以这里也直接截取product_id.name + + # 需求要求取值格式是来源+来源明细行ID,但是来源明细行ID取得就是product_id.name得最后一位,所以这里也直接截取product_id.name @api.depends('product_id.name') def _compute_demand_plan_number(self): for line in self: - product_name = line.product_id.name or '' + product_name = line.product_id.name or '' plan_no = None if line.product_id: # 使用正则表达式匹配P-后面的所有字符 @@ -256,4 +257,4 @@ class SfDemandPlan(models.Model): plan_no = match.group(1) line.demand_plan_number = plan_no else: - line.demand_plan_number = None \ No newline at end of file + line.demand_plan_number = None diff --git a/sf_demand_plan/views/demand_plan.xml b/sf_demand_plan/views/demand_plan.xml index 2d8215f0..d03f55e7 100644 --- a/sf_demand_plan/views/demand_plan.xml +++ b/sf_demand_plan/views/demand_plan.xml @@ -38,8 +38,8 @@ - +