From 359fd40ed334724c64399780ae9adf73b3f85cac Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 11 Nov 2024 17:55:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E8=89=BA=E9=80=80?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     | 27 +++++++++++++++++++
 sf_manufacturing/models/mrp_workorder.py      |  5 +---
 sf_manufacturing/models/product_template.py   |  4 +--
 .../models/sf_technology_design.py            |  2 +-
 .../views/mrp_production_addional_change.xml  |  3 +++
 sf_sale/models/quick_easy_order.py            |  4 +--
 sf_sale/models/quick_easy_order_old.py        |  4 +--
 7 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index fa81837f..b3cc92e4 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -257,6 +257,33 @@ class MrpProduction(models.Model):
             if production.tool_state == '2':
                 production.state = 'rework'
 
+    def technology_back_adjust(self):
+        special_design = self.technology_design_ids.filtered(
+            lambda a: a.routing_tag == 'special' and a.is_auto is False and a.active in [True,False])
+        workorders_values = []
+        for item in special_design:
+            if item.active is False:
+                domain = [('production_id','=',self.id)]
+                if item.surface_technics_parameters_id:
+                    domain += [('surface_technics_parameters_id', '=', item.process_parameters_id)]
+                else:
+                    domain += [('name', '=', item.route_id.name)]
+                workorder = self.env['mrp.workorder'].search(domain)
+                if workorder:
+                    workorder.write({'state': 'cancel'})
+            else:
+                workorder = self.env['mrp.workorder'].search([('name', '=', item.route_id.name)])
+                if not workorder:
+                    workorders_values.append(
+                        self.env[
+                            'mrp.workorder']._json_workorder_surface_process_str(
+                            production, route, product_production_process.seller_ids[0].partner_id.id))
+        if workorders_values:
+            self.workorders.write({})
+
+
+
+
     # 工艺确认
     def technology_confirm(self):
         process_parameters = []
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 9bfc82e1..11232595 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -38,13 +38,10 @@ class ResMrpWorkOrder(models.Model):
     processing_panel = fields.Char('加工面')
     sequence = fields.Integer(string='工序')
     routing_type = fields.Selection([
-        # ('获取CNC加工程序', '获取CNC加工程序'),
         ('装夹预调', '装夹预调'),
-        # ('前置三元定位检测', '前置三元定位检测'),
         ('CNC加工', 'CNC加工'),
-        # ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),
-        ('切割', '切割'), ('表面工艺', '表面工艺')
+        ('切割', '切割'), ('表面工艺', '表面工艺'), ('线切割', '线切割')
     ], string="工序类型")
     results = fields.Char('结果')
     state = fields.Selection([
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index a96de2fc..4dce6896 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -9,8 +9,8 @@ from odoo.exceptions import ValidationError, UserError
 from odoo.modules import get_resource_path
 
 
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_manufacturing/models/sf_technology_design.py b/sf_manufacturing/models/sf_technology_design.py
index 6aa49f5a..da9c88ee 100644
--- a/sf_manufacturing/models/sf_technology_design.py
+++ b/sf_manufacturing/models/sf_technology_design.py
@@ -20,7 +20,7 @@ class sf_technology_design(models.Model):
         workorders_values_str = [0, '', {
             'route_id': route.id,
             'panel': k,
-            'process_parameters_id': False if route.routing_type.id != '表面工艺' else self.env[
+            'process_parameters_id': False if route.routing_type != '表面工艺' else self.env[
                 'sf.production.process.parameter'].search(
                 [('process_id', '=', route.surface_technics_id.id)]).id,
             'sequence': i,
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index b0bbb924..ee5aac42 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -129,6 +129,9 @@
                     ></button>
                 </xpath>
                 <xpath expr="(//header//button[@name='button_scrap'])" position="replace">
+                    <button name="technology_confirm" string="工艺确认" type="object" class="oe_highlight"
+                            attrs="{'invisible': [('workorder_ids', '!=', [])]}"></button>
+                    <button name="technology_back_adjust" string="退回调整" type="object" class="oe_highlight"></button>
                     <button name="button_scrap" invisible="1"/>
                     <button name="do_update_program" string="更新程序" type="object" groups="sf_base.group_sf_mrp_user"
                             confirm="是否确认更新程序"
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 081807a4..cb1886a1 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -8,8 +8,8 @@ from datetime import datetime
 import requests
 from odoo import http
 from odoo.http import request
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError
diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py
index 863dc96a..34500a29 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -6,8 +6,8 @@ import os
 from datetime import datetime
 from stl import mesh
 # from OCC.Core.GProp import GProp_GProps
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 from odoo.addons.sf_base.commons.common import Common
 from odoo import models, fields, api
 from odoo.modules import get_resource_path