From db7fbed177291fd225ce73d75576b5574dca78fa Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 27 Jun 2024 20:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=8D=E6=96=B0=E7=BC=96?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=8B=E5=8F=91=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=88=B6=E9=80=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=97=A0=E9=87=87=E8=B4=AD=E8=B0=83=E6=8B=A8=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E7=A8=8B=E5=BA=8F=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/views/compensation.xml     | 12 ++---
 sf_manufacturing/models/mrp_production.py     |  8 ---
 sf_manufacturing/models/mrp_workorder.py      | 53 +++++++++----------
 sf_manufacturing/models/product_template.py   |  4 +-
 sf_manufacturing/models/stock.py              |  2 +-
 sf_manufacturing/views/mrp_workorder_view.xml | 12 ++---
 sf_mrs_connect/controllers/controllers.py     |  6 +--
 sf_sale/models/quick_easy_order.py            |  4 +-
 sf_sale/models/quick_easy_order_old.py        |  4 +-
 9 files changed, 47 insertions(+), 58 deletions(-)

diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index 7668d818..55036c8d 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -20,12 +20,12 @@
                             <field name="button_compensation_state" attrs='{"invisible": ["|",
                                     ("state","!=","progress"),("user_permissions","=",False)]}'/>
                             <!--                                <span>&#32;</span>-->
-                            <button name="button_send_program_again" type="object" string="重新下发NC程序"
-                                    class="btn-primary"
-                                    confirm="是否确认重新下发NC程序？"
-                                    groups="sf_base.group_sf_order_user,sf_base.group_sf_equipment_user"
-                                    attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','in',['done', 'cancel',
-                                                                                                   'progress']),('processing_drawing','=',False),('is_send_program_again','=',True)]}"/>
+<!--                            <button name="button_send_program_again" type="object" string="重新下发NC程序"-->
+<!--                                    class="btn-primary"-->
+<!--                                    confirm="是否确认重新下发NC程序？"-->
+<!--                                    groups="sf_base.group_sf_order_user,sf_base.group_sf_equipment_user"-->
+<!--                                    attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','in',['done', 'cancel',-->
+<!--                                                                                                   'progress']),('processing_drawing','=',False),('is_send_program_again','=',True)]}"/>-->
                             <!--                                <button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿"-->
                             <!--                                    class="btn-primary" attrs='{"invisible": ["|",-->
                             <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 70db2915..f2876350 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -311,14 +311,6 @@ class MrpProduction(models.Model):
     # 其他规则限制： 默认只分配给工作中心状态为非故障的工作中心；
 
     def _create_workorder3(self, item):
-        # 根据product_id对self进行分组
-        grouped_product_ids = {k: list(g) for k, g in groupby(self, key=lambda x: x.product_id.id)}
-        # 初始化一个字典来存储每个product_id对应的生产订单名称列表
-        product_id_to_production_names = {}
-        # 对于每个product_id，获取其所有生产订单的名称
-        for product_id, productions in grouped_product_ids.items():
-            # 为同一个product_id创建一个生产订单名称列表
-            product_id_to_production_names[product_id] = [production.name for production in productions]
         for production in self:
             if not production.bom_id or not production.product_id:
                 continue
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index b4c7170f..09270dae 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -207,7 +207,7 @@ class ResMrpWorkOrder(models.Model):
         [("programming", "编程"), ("clamping", "返工"), ("cutter", "刀具"), ("operate computer", "操机"),
          ("technology", "工艺"), ("customer redrawing", "客户改图"), ("other", "其他"), ], string="原因", tracking=True)
     detailed_reason = fields.Text('详细原因')
-    is_send_program_again = fields.Boolean(string='是否重新下发NC程序', default=False)
+    # is_send_program_again = fields.Boolean(string='是否重新下发NC程序', default=False)
 
     @api.onchange('rfid_code')
     def _onchange(self):
@@ -1036,7 +1036,7 @@ class ResMrpWorkOrder(models.Model):
                     if raw_move:
                         raw_move.write({'state': 'done'})
                 record.production_id.button_mark_done1()
-                # self.production_id.state = 'done'
+                record.production_id.state = 'done'
 
     # 将FTP的检测报告文件下载到临时目录
     def download_reportfile_tmp(self, workorder, reportpath):
@@ -1079,31 +1079,30 @@ class ResMrpWorkOrder(models.Model):
                     return True
 
     # 重新下发nc程序
-    def button_send_program_again(self):
-        try:
-            res = {'programming_no': self.production_id.programming_no}
-            configsettings = self.env['res.config.settings'].get_values()
-            config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
-            url = '/api/intelligent_programming/reset_state_again'
-            config_url = configsettings['sf_url'] + url
-            r = requests.post(config_url, json=res, data=None, headers=config_header)
-            r = r.json()
-            result = json.loads(r['result'])
-            if result['status'] == 1:
-                productions = self.env['mrp.production'].search(
-                    [('programming_no', '=', self.production_id.programming_no), ('programming_state', '=', '已编程')])
-                if productions:
-                    workorder = productions.workorder_ids.filtered(
-                        lambda ap: ap.routing_type in ['装夹预调', 'CNC加工'] and ap.state not in ['done', 'cancel',
-                                                                                                   'progress'])
-                    if workorder:
-                        workorder.write({'is_send_program_again': True})
-                        productions.write({'work_state': '编程中', 'programming_state': '编程中'})
-            else:
-                raise UserError(result['message'])
-        except Exception as e:
-            logging.info('button_send_program_again error:%s' % e)
-            raise UserError("重新下发nc程序失败,请联系管理员")
+    # def button_send_program_again(self):
+    #     try:
+    #         res = {'programming_no': self.production_id.programming_no}
+    #         configsettings = self.env['res.config.settings'].get_values()
+    #         config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
+    #         url = '/api/intelligent_programming/reset_state_again'
+    #         config_url = configsettings['sf_url'] + url
+    #         r = requests.post(config_url, json=res, data=None, headers=config_header)
+    #         r = r.json()
+    #         result = json.loads(r['result'])
+    #         if result['status'] == 1:
+    #             productions = self.env['mrp.production'].search(
+    #                 [('programming_no', '=', self.production_id.programming_no), ('programming_state', '=', '已编程')])
+    #             if productions:
+    #                 workorder = productions.workorder_ids.filtered(
+    #                     lambda ap: ap.routing_type in ['装夹预调', 'CNC加工'] and ap.state not in ['done', 'cancel',
+    #                                                                                                'progress'])
+    #                 if workorder:
+    #                     productions.write({'work_state': '编程中', 'programming_state': '编程中'})
+    #         else:
+    #             raise UserError(result['message'])
+    #     except Exception as e:
+    #         logging.info('button_send_program_again error:%s' % e)
+    #         raise UserError("重新下发nc程序失败,请联系管理员")
 
 
 class CNCprocessing(models.Model):
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 71522528..cea53c64 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -7,8 +7,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 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/stock.py b/sf_manufacturing/models/stock.py
index c7ae6ecc..ee24b72c 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -211,7 +211,7 @@ class StockRule(models.Model):
             '''
             # productions._create_workorder()
             #
-            self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+            # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
             productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
                                            (
                                                    p.move_dest_ids.procure_method != 'make_to_order' and not
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 790c0551..bf353a40 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -124,7 +124,7 @@
                 <field name='user_permissions' invisible="1"/>
                 <field name='name' invisible="1"/>
                 <field name='is_delivery' invisible="1"/>
-                <field name='is_send_program_again' invisible="1"/>
+<!--                <field name='is_send_program_again' invisible="1"/>-->
                 <!--                 工单form页面的开始停工按钮等 -->
                 <!--                 <button name="button_start" type="object" string="开始" class="btn-success" -->
                 <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','ready'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
@@ -160,11 +160,11 @@
                 <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked'),('state','=','done')]}"/> -->
                 <button name="button_workpiece_delivery" type="object" string="工件配送" class="btn-primary"
                         attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('is_delivery','=',True),('state','!=','done')]}"/>
-                <button name="button_send_program_again" type="object" string="重新下发NC程序" class="btn-primary"
-                        confirm="是否确认重新下发NC程序？"
-                        groups="sf_base.group_sf_order_user,sf_base.group_sf_equipment_user"
-                        attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','in',['done', 'cancel',
-                                                                                                   'progress']),('cnc_worksheet','=',False),('is_send_program_again','=',True)]}"/>
+<!--                <button name="button_send_program_again" type="object" string="重新下发NC程序" class="btn-primary"-->
+<!--                        confirm="是否确认重新下发NC程序？"-->
+<!--                        groups="sf_base.group_sf_order_user,sf_base.group_sf_equipment_user"-->
+<!--                        attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','in',['done', 'cancel',-->
+<!--                                                                                                   'progress']),('cnc_worksheet','=',False),('is_send_program_again','=',True)]}"/>-->
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="开料要求" attrs='{"invisible": [("routing_type","!=","切割")]}'>
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index b6d4c659..4666fd99 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -73,8 +73,7 @@ class Sf_Mrs_Connect(http.Controller):
                                             panel_file_path = os.path.join(program_path_tmp_panel, file)
                                             logging.info('panel_file_path:%s' % panel_file_path)
                                 cnc_workorder.write(
-                                    {'is_send_program_again': False,
-                                     'cnc_ids': cnc_workorder.cnc_ids.sudo()._json_cnc_processing(panel, ret),
+                                    {'cnc_ids': cnc_workorder.cnc_ids.sudo()._json_cnc_processing(panel, ret),
                                      'cmm_ids': cnc_workorder.cmm_ids.sudo()._json_cmm_program(panel, ret),
                                      'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
                                 pre_workorder = production.workorder_ids.filtered(
@@ -82,8 +81,7 @@ class Sf_Mrs_Connect(http.Controller):
                                                                                                   'cancel'] and ap.processing_panel == panel)
                                 if pre_workorder:
                                     pre_workorder.write(
-                                        {'is_send_program_again': False,
-                                         'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
+                                        {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
                 productions.write({'programming_state': '已编程', 'work_state': '已编程'})
                 cnc_program_ids = [item.id for item in productions]
                 workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 11acc06f..e3bf3002 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 92f6cda2..3ae65db3 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