jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理 bfm内部下单包含坯料尺寸时，生成的产品的加工参数-体积数据不正确问题

Browse Source
This commit is contained in:
yuxianghui
2025-06-19 16:29:31 +08:00
parent 78edf1f7eb
commit 8bd1c8a095
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sf_manufacturing/models/product_template.py
View File

@@ -894,15 +894,20 @@ class ResProductMo(models.Model):
if not embryo_redundancy_id:
raise UserError('请先配置模型类型内的坯料冗余')
product_name = self.generate_product_name(order_id, item, i)
# 判断参数中是否包含 坯料尺寸(长、宽、高)
blank_bool = any(value is not None and value != 0 for value in (
item.get('blank_length'), item.get('blank_width'), item.get('blank_height'))) if all(
key in item for key in ('blank_length', 'blank_width', 'blank_height')) else False
vals = {
'name': product_name,
'blank_type': item.get('blank_type'),
'model_long': item.get('blank_length') if item.get('blank_length') else self.format_float(item['model_long'] + embryo_redundancy_id.long),
'model_width': item.get('blank_width') if item.get('blank_width') else self.format_float(item['model_width'] + embryo_redundancy_id.width),
'model_height': item.get('blank_height') if item.get('blank_height') else self.format_float(item['model_height'] + embryo_redundancy_id.height),
'model_volume': self.format_float((item['model_long'] + embryo_redundancy_id.long) * (
item['model_width'] + embryo_redundancy_id.width) * (
item['model_height'] + embryo_redundancy_id.height)),
'model_long': item.get('blank_length') if blank_bool else self.format_float(item['model_long'] + embryo_redundancy_id.long),
'model_width': item.get('blank_width') if blank_bool else self.format_float(item['model_width'] + embryo_redundancy_id.width),
'model_height': item.get('blank_height') if blank_bool else self.format_float(item['model_height'] + embryo_redundancy_id.height),
'model_volume': self.format_float(((item['model_long'] + model_type.embryo_tolerance) *
(item['model_width'] + model_type.embryo_tolerance) *
(item['model_height'] + model_type.embryo_tolerance))) if not blank_bool else (
item.get('blank_length') * item.get('blank_width') * item.get('blank_height')),
'product_model_type_id': model_type.id,
'model_processing_panel': item['processing_panel_detail'],
'model_machining_precision': item['model_machining_precision'],