解决冲突

2025-06-09 10:01:57 +08:00
parent f164488e48 484fab85be
commit 23dd88b7ba
72 changed files with 1311 additions and 360 deletions
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -795,7 +795,7 @@ class ResProductMo(models.Model):
        for record in self:
            if record.categ_id.name == '坯料':
                product_name = ''
-                match = re.search(r'(S\d{5}-\d)', record.name)
+                match = re.search(r'(S\d{5}-\d+)', record.name)
                # 如果匹配成功，提取结果
                if match:
                    product_name = match.group(0)