From 3559d67c052c0ba539e31a7d5fc7731a44fdcd7e Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 28 Oct 2024 11:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E6=98=BE=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/product_template.py | 8 ++------
 sf_sale/models/quick_easy_order_old.py      | 4 ++++
 sf_sale/models/sale_order.py                | 8 ++++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 62744db9..0476c7c7 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -881,10 +881,6 @@ class ResProductMo(models.Model):
             'manual_quotation': item['manual_quotation'] or False,
             'part_number': item.get('part_number') or '',
             'active': True,
-            # 'machining_drawings_name': item['machining_drawings_name'],
-            # 'quality_standard_name': item['quality_standard_name'],
-            # 'machining_drawings_mimetype': item['machining_drawings_mimetype'],
-            # 'quality_standard_mimetype': item['quality_standard_mimetype'],
             'machining_drawings': '' if not item['machining_drawings'] else base64.b64decode(
                 item['machining_drawings']),
             'quality_standard': '' if not item['quality_standard'] else base64.b64decode(item['quality_standard']),
@@ -895,10 +891,10 @@ class ResProductMo(models.Model):
             vals.update({'taxes_id': [(6, 0, [int(tax_id)])]})
         copy_product_id.sudo().write(vals)
         product_id.product_tmpl_id.active = False
-        if item['machining_drawings'] and item['machining_drawings_name']:
+        if item['machining_drawings'] and item['machining_drawings_name'] and item['machining_drawings_mimetype']:
             self.attachment_update(item['machining_drawings_name'], copy_product_id.product_tmpl_id.id,
                                    'machining_drawings', item['machining_drawings_mimetype'])
-        if item['quality_standard'] and item['quality_standard_name']:
+        if item['quality_standard'] and item['quality_standard_name'] and item['machining_drawings_mimetype']:
             self.attachment_update(item['quality_standard_name'], copy_product_id.product_tmpl_id.id,
                                    'quality_standard', item['quality_standard_mimetype'])
         return copy_product_id
diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py
index ab0e9449..e974c5d4 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -222,6 +222,10 @@ class QuickEasyOrder(models.Model):
                     'manual_quotation': True,
                     'barcode': barcode,
                     'part_number': item.part_drawing_number,
+                    'machining_drawings_name': '',
+                    'quality_standard_name': '',
+                    'machining_drawings_mimetype': '',
+                    'quality_standard_mimetype': '',
                     'machining_drawings': item.machining_drawings,
                     'quality_standard': '',
                 })
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index acd1d60c..53f73aef 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -118,12 +118,16 @@ class ReSaleOrder(models.Model):
 
     # 业务平台分配工厂时在创建完产品后再创建销售明细信息
     def sale_order_create_line(self, product, item):
+        machining_accuracy_name = ''
+        if product.model_machining_precision:
+            machining_accuracy_name = self.env['sf.machining.accuracy'].sudo().search(
+                [('sync_id', '=', product.model_machining_precision)]).name
         vals = {
             'order_id': self.id,
             'product_id': product.id,
-            'name': '%s/%s/%s/%s/±%s/%s' % (
+            'name': '%s/%s/%s/%s/%s/%s' % (
                 product.model_long, product.model_width, product.model_height, product.model_volume,
-                product.model_machining_precision,
+                machining_accuracy_name,
                 product.materials_id.name),
             'price_unit': product.list_price,
             'product_uom_qty': item['number'],