Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

2025-02-17 15:37:58 +08:00
parent 567ea84b00 006152edd9
commit 5d2cadc3d0
43 changed files with 520 additions and 369 deletions
--- a/sf_manufacturing/models/sale_order.py
+++ b/sf_manufacturing/models/sale_order.py
@@ -183,4 +183,6 @@ class SaleOrderLine(models.Model):
            for line in self:
                if vals['supply_method'] == 'automation' and line.manual_quotation:
                    raise UserError('当前（%s）产品为人工编程产品，不能选择自动化产线加工' % ','.join(line.mapped('product_id.name')))
+                if vals['supply_method'] == 'purchase' and line.is_incoming_material:
+                    raise UserError('当前（%s）产品为客供料，不能选择外购' % ','.join(line.mapped('product_id.name')))
        return super(SaleOrderLine, self).write(vals)