Merge branch refs/heads/develop into refs/heads/feature/7249
This commit is contained in:
@@ -72,6 +72,8 @@ class SfDemandPlan(models.Model):
|
||||
('4', '低'),
|
||||
], string='优先级', default='3')
|
||||
|
||||
overdelivery_allowed = fields.Boolean('可超量发货', default=False)
|
||||
|
||||
hide_button_release_plan = fields.Boolean(
|
||||
string='显示下达计划按钮',
|
||||
compute='_compute_hide_button_release_plan',
|
||||
@@ -148,9 +150,8 @@ class SfDemandPlan(models.Model):
|
||||
for line in self:
|
||||
sum_plan_uom_qty = sum(line.line_ids.mapped('plan_uom_qty'))
|
||||
pending_qty = line.product_uom_qty - sum_plan_uom_qty
|
||||
rounding = line.product_id.uom_id.rounding or 0.01
|
||||
if float_compare(pending_qty, 0,
|
||||
precision_rounding=rounding) == -1:
|
||||
precision_rounding=line.product_id.uom_id.rounding) == -1:
|
||||
line.pending_qty = 0
|
||||
else:
|
||||
line.pending_qty = pending_qty
|
||||
@@ -170,7 +171,9 @@ class SfDemandPlan(models.Model):
|
||||
def _compute_state(self):
|
||||
for line in self:
|
||||
status_line = line.line_ids.filtered(lambda p: p.status == '60')
|
||||
if line.sale_order_id.state == 'cancel':
|
||||
if not line.line_ids:
|
||||
line.state = '10'
|
||||
elif line.sale_order_id.state == 'cancel':
|
||||
line.state = '50'
|
||||
line.line_ids.status = '100'
|
||||
elif len(line.line_ids) == len(status_line):
|
||||
@@ -187,16 +190,38 @@ class SfDemandPlan(models.Model):
|
||||
lambda p: p.status in ('50', '60') and p.new_supply_method == 'custom_made')
|
||||
line.readonly_custom_made_type = bool(production_demand_plan)
|
||||
|
||||
@api.constrains('line_ids')
|
||||
def check_line_ids(self):
|
||||
for item in self:
|
||||
if not item.line_ids:
|
||||
raise ValidationError('计划不能为空!')
|
||||
|
||||
def write(self, vals):
|
||||
res = super(SfDemandPlan, self).write(vals)
|
||||
if 'line_ids' in vals:
|
||||
for line in self.line_ids:
|
||||
if not line.sale_order_id:
|
||||
line.sale_order_id = self.sale_order_id
|
||||
if not line.sale_order_line_id:
|
||||
line.sale_order_line_id = self.sale_order_line_id
|
||||
return res
|
||||
|
||||
def name_get(self):
|
||||
result = []
|
||||
for plan in self:
|
||||
result.append((plan.id, plan.sale_order_id.name))
|
||||
result.append((plan.id, plan.product_id.name))
|
||||
return result
|
||||
|
||||
def button_production_release_plan(self):
|
||||
line_ids = self.line_ids.filtered(lambda p: p.status == '30')
|
||||
sum_product_uom_qty = sum(line_ids.mapped('plan_uom_qty'))
|
||||
if sum_product_uom_qty > self.product_uom_qty:
|
||||
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:
|
||||
raise ValidationError(f"已禁止向合作伙伴/客户超量发货,请更换“补货原因”或将“可超量发货”设置为“是”。")
|
||||
elif float_compare(sum_product_uom_qty, self.product_uom_qty,
|
||||
precision_rounding=self.product_id.uom_id.rounding) == 1:
|
||||
return {
|
||||
'name': _('需求计划'),
|
||||
'type': 'ir.actions.act_window',
|
||||
|
||||
Reference in New Issue
Block a user