Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单问题

2024-11-25 14:00:04 +08:00
parent 25002406b8 ed3ea32f45
commit 696d0e2a40
4 changed files with 13 additions and 5 deletions
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -131,7 +131,7 @@ class ReSaleOrder(models.Model):
                product.materials_id.name),
            'price_unit': product.list_price,
            'product_uom_qty': item['number'],
-            'model_glb_file': base64.b64decode(item['model_file']),
+            'model_glb_file': base64.b64decode(item['model_file']) if item['model_file'] else None,
            'remark': item.get('remark'),
            'embryo_redundancy_id': item.get('embryo_redundancy_id'),
            'is_incoming_material': True if item.get('embryo_redundancy_id') else False,