From c1935e62b9bc3e3cfd3cf5eca8a655b61d812847 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 13 Jun 2024 17:24:46 +0800
Subject: [PATCH 01/67] =?UTF-8?q?1=E3=80=81=E9=87=8D=E6=9E=84=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=B7=A5=E5=BA=8F=E7=9A=84=E7=94=9F=E6=88=90=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py | 79 ++++++++++++++---------
 1 file changed, 48 insertions(+), 31 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 34e00aee..01067082 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -484,46 +484,63 @@ class MrpProduction(models.Model):
     def _reset_work_order_sequence(self):
         for rec in self:
             sequence_list = {}
+            # 产品模型类型
             model_type_id = rec.product_id.product_model_type_id
+            # 产品加工面板
+            model_processing_panel = rec.product_id.model_processing_panel
             if model_type_id:
-                tmpl_num = 1
-                # 成品工序
-                product_routing_tmpl_ids = model_type_id.product_routing_tmpl_ids
-                if product_routing_tmpl_ids:
-                    for tmpl_id in product_routing_tmpl_ids:
-                        sequence_list.update({tmpl_id.route_workcenter_id.name: tmpl_num})
-                        tmpl_num += 1
-                # 表面工艺工序
-                # 模型类型的表面工艺工序模版
-                surface_tmpl_ids = model_type_id.surface_technics_routing_tmpl_ids
-                # 产品选择的表面工艺
-                model_process_parameters_ids = rec.product_id.model_process_parameters_ids
-                process_dict = {}
-                if model_process_parameters_ids:
-                    for process_parameters_id in model_process_parameters_ids:
-                        process_id = process_parameters_id.process_id
-                        for surface_tmpl_id in surface_tmpl_ids:
-                            if process_id == surface_tmpl_id.route_workcenter_id.surface_technics_id:
-                                surface_tmpl_name = surface_tmpl_id.route_workcenter_id.name
-                                process_dict.update({int(process_id.category_id.code): '%s-%s' % (
-                                    surface_tmpl_name, process_parameters_id.name)})
-                process_list = sorted(process_dict.keys())
-                for process_num in process_list:
-                    sequence_list.update({process_dict.get(process_num): tmpl_num})
-                    tmpl_num += 1
-                # 坯料工序
-                tmpl_num = 1
-                embryo_routing_tmpl_ids = model_type_id.embryo_routing_tmpl_ids
-                if embryo_routing_tmpl_ids:
-                    for tmpl_id in embryo_routing_tmpl_ids:
-                        sequence_list.update({tmpl_id.route_workcenter_id.name: tmpl_num})
+                if model_processing_panel:
+                    tmpl_num = 1
+                    panel_list = model_processing_panel.split(',')
+                    for panel in panel_list:
+                        panel_sequence_list = {}
+                        # 成品工序
+                        product_routing_tmpl_ids = model_type_id.product_routing_tmpl_ids
+                        if product_routing_tmpl_ids:
+                            for tmpl_id in product_routing_tmpl_ids:
+                                panel_sequence_list.update({tmpl_id.route_workcenter_id.name: tmpl_num})
+                                tmpl_num += 1
+                        sequence_list.update({panel: panel_sequence_list})
+                    # 表面工艺工序
+                    # 模型类型的表面工艺工序模版
+                    surface_tmpl_ids = model_type_id.surface_technics_routing_tmpl_ids
+                    # 产品选择的表面工艺
+                    model_process_parameters_ids = rec.product_id.model_process_parameters_ids
+                    process_dict = {}
+                    if model_process_parameters_ids:
+                        for process_parameters_id in model_process_parameters_ids:
+                            process_id = process_parameters_id.process_id
+                            for surface_tmpl_id in surface_tmpl_ids:
+                                if process_id == surface_tmpl_id.route_workcenter_id.surface_technics_id:
+                                    surface_tmpl_name = surface_tmpl_id.route_workcenter_id.name
+                                    process_dict.update({int(process_id.category_id.code): '%s-%s' % (
+                                        surface_tmpl_name, process_parameters_id.name)})
+                    process_list = sorted(process_dict.keys())
+                    for process_num in process_list:
+                        sequence_list.update({process_dict.get(process_num): tmpl_num})
                         tmpl_num += 1
+                    # 坯料工序
+                    tmpl_num = 1
+                    embryo_routing_tmpl_ids = model_type_id.embryo_routing_tmpl_ids
+                    if embryo_routing_tmpl_ids:
+                        for tmpl_id in embryo_routing_tmpl_ids:
+                            sequence_list.update({tmpl_id.route_workcenter_id.name: tmpl_num})
+                            tmpl_num += 1
+                else:
+                    raise ValidationError('该产品【加工面板】为空!')
+
             else:
                 raise ValidationError('该产品没有选择【模版类型】!')
 
             for work in rec.workorder_ids:
                 if sequence_list.get(work.name):
                     work.sequence = sequence_list[work.name]
+                elif sequence_list.get(work.processing_panel):
+                    processing_panel = sequence_list.get(work.processing_panel)
+                    if processing_panel.get(work.name):
+                        work.sequence = processing_panel[work.name]
+                    else:
+                        raise ValidationError('工序【%s】在产品选择的模版类型中不存在!' % work.name)
                 else:
                     raise ValidationError('工序【%s】在产品选择的模版类型中不存在!' % work.name)
                 # if work.name == '获取CNC加工程序':

From 3793d0a17441398b6bb4458faa72e6218104728a Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 18 Jun 2024 11:35:50 +0800
Subject: [PATCH 02/67] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A3=85=E5=A4=B9?=
 =?UTF-8?q?=E9=A2=84=E8=B0=83=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py      | 21 ++++++++++++++++++-
 sf_manufacturing/views/mrp_workorder_view.xml | 21 +++++++++++--------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 002c83aa..07409827 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1,5 +1,5 @@
 import re
-
+import json
 import logging
 import base64
 import urllib.parse
@@ -1066,6 +1066,25 @@ class ResMrpWorkOrder(models.Model):
                     workorder.detection_report = base64.b64encode(open(report_file_path, 'rb').read())
                     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:
+                self.production_id.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):
     _name = 'sf.cnc.processing'
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 11219363..26f8941d 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -151,7 +151,10 @@
                 <!--                         groups="sf_base.group_sf_mrp_user" -->
                 <!--                         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)]}"/>
+                        attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('is_delivery','=',True),('state','!=','done')]}"/>
+                <button name="button_send_program_again" type="object" string="重新下发NC程序" class="btn-primary"
+                        confirm="是否确认重新下发NC程序？"
+                        attrs="{'invisible': ['|', ('routing_type','!=','装夹预调'),('state','=','done')]}"/>
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="开料要求" attrs='{"invisible": [("routing_type","!=","切割")]}'>
@@ -214,7 +217,7 @@
                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                     <field name="functional_fixture_type_id"
                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                    <field name="rfid_code" cache="True"
+                    <field name="rfid_code" force_save="1" readonly="1" cache="True"
                            attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
                     <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
                 </group>
@@ -477,13 +480,13 @@
                 <page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <group>
                         <field name="test_results" attrs='{"invisible":[("results","!=",False)]}'/>
-<!--                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>-->
-<!--                        <field name="is_fetchcnc"-->
-<!--                               attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/>-->
-<!--                        <field name="reason"-->
-<!--                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")]}'/>-->
-<!--                        <field name="detailed_reason" attrs='{"invisible":[("test_results","=","合格")]}'/>-->
-<!--                        <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>-->
+                        <!--                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>-->
+                        <!--                        <field name="is_fetchcnc"-->
+                        <!--                               attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/>-->
+                        <!--                        <field name="reason"-->
+                        <!--                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")]}'/>-->
+                        <!--                        <field name="detailed_reason" attrs='{"invisible":[("test_results","=","合格")]}'/>-->
+                        <!--                        <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>-->
                         <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
                                widget="pdf_viewer"/>
                     </group>

From 47305a2e6146999ab507c3fea638821c3f7d5b37 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 18 Jun 2024 17:17:09 +0800
Subject: [PATCH 03/67] =?UTF-8?q?=E6=B7=BB=E5=8A=A0'=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E4=B8=8B=E5=8F=91NC=E7=A8=8B=E5=BA=8F'?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py      | 2 ++
 sf_manufacturing/views/mrp_workorder_view.xml | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 07409827..401788af 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -205,6 +205,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)
 
     @api.onchange('rfid_code')
     def _onchange(self):
@@ -1078,6 +1079,7 @@ class ResMrpWorkOrder(models.Model):
             r = r.json()
             result = json.loads(r['result'])
             if result['status'] == 1:
+                self.write({'is_send_program_again': True})
                 self.production_id.write({'work_state': '编程中', 'programming_state': '编程中'})
             else:
                 raise UserError(result['message'])
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 26f8941d..a5d902bf 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -117,6 +117,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"/>
                 <!--                 工单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加工', '解除装夹'))]}" -->
@@ -154,7 +155,7 @@
                         attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('is_delivery','=',True),('state','!=','done')]}"/>
                 <button name="button_send_program_again" type="object" string="重新下发NC程序" class="btn-primary"
                         confirm="是否确认重新下发NC程序？"
-                        attrs="{'invisible': ['|', ('routing_type','!=','装夹预调'),('state','=','done')]}"/>
+                        attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','not in',['ready','progress']),('processing_drawing','=',False),('is_send_program_again','=',True)]}"/>
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="开料要求" attrs='{"invisible": [("routing_type","!=","切割")]}'>
@@ -296,7 +297,7 @@
                     </group>
                     <group string="加工图纸">
                         <!--                         隐藏加工图纸字段名 -->
-                        <field name="processing_drawing" widget="pdf_viewer" string=""/>
+                        <field name="processing_drawing" widget="pdf_viewer" string="" readonly="1"/>
                     </group>
                 </page>
                 <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>

From 25dddb5b3b6a16214a965d29661cea4a6a3f9680 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 18 Jun 2024 17:35:41 +0800
Subject: [PATCH 04/67] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=9A=E7=94=9F=E6=88=90=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E5=90=8C=E6=97=B6=E4=B8=8D=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/stock.py | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 95d877b3..5793b806 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -208,7 +208,30 @@ class StockRule(models.Model):
             '''
             创建工单
             '''
-            productions._create_workorder()
+            # # productions._create_workorder()
+            # 根据product_id对self进行分组
+            grouped_product_ids = {k: list(g) for k, g in groupby(self, key=lambda x: x.productions.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_item in productions:
+                if production_item.product_id.id in product_id_to_production_names:
+                    #     # 同一个产品多个制造订单对应一个编程单和模型库
+                    #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
+                    if not production_item.programming_no:
+                        production_programming = self.search(
+                            [('product_id.id', '=', production_item.product_id.id),
+                             ('origin', '=', production_item.origin)],
+                            limit=1, order='id asc')
+                        if not production_programming.programming_no:
+                            production_item.fetchCNC(
+                                ', '.join(product_id_to_production_names[production_item.product_id.id]))
+                        else:
+                            production_item.write({'programming_no': production_programming.programming_no,
+                                                   'programming_state': '编程中'})
 
             productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
                                            (

From c035ab8156fe7cb3385d1763b33f7a166228a503 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 19 Jun 2024 15:32:03 +0800
Subject: [PATCH 05/67] =?UTF-8?q?=E6=B3=A8=E9=87=8AOCC=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/product_template.py | 4 ++--
 sf_manufacturing/models/stock.py            | 5 +++--
 sf_sale/models/quick_easy_order.py          | 4 ++--
 sf_sale/models/quick_easy_order_old.py      | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index cea53c64..71522528 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 5793b806..a454fb51 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import base64
 import qrcode
+from itertools import groupby
 from collections import defaultdict, namedtuple
 import logging
 import io
@@ -208,8 +209,8 @@ class StockRule(models.Model):
             '''
             创建工单
             '''
-            # # productions._create_workorder()
-            # 根据product_id对self进行分组
+            # productions._create_workorder()
+            根据product_id对self进行分组
             grouped_product_ids = {k: list(g) for k, g in groupby(self, key=lambda x: x.productions.product_id.id)}
             # 初始化一个字典来存储每个product_id对应的生产订单名称列表
             product_id_to_production_names = {}
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index e3bf3002..11acc06f 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 3ae65db3..92f6cda2 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

From b3907123085ed24d50d595d8f46e3876c7dbffb8 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 19 Jun 2024 15:39:28 +0800
Subject: [PATCH 06/67] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8B=E5=8F=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_mrs_connect/controllers/controllers.py | 43 ++++++++++++-----------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 78a0c05a..08021b5f 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -47,28 +47,31 @@ class Sf_Mrs_Connect(http.Controller):
                 # if ret['glb_file']:
                 #     cnc_production.glb_file = base64.b64encode(ret['glb_file'])
                 # 拉取所有加工面的程序文件
-                if is_delete_file is True:
-                    program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', 'R')
-                    files_r = os.listdir(program_path_tmp_r)
-                    if files_r:
-                        for file_name in files_r:
-                            file_path = os.path.join(program_path_tmp_r, file_name)
-                            os.remove(file_path)
-                for r in ret['processing_panel']:
-                    download_state = request.env['sf.cnc.processing'].with_user(
-                        request.env.ref("base.user_admin")).download_file_tmp(
-                        ret['folder_name'], r)
-                    if download_state == 0:
-                        res['status'] = -2
-                        res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
-                        return json.JSONEncoder().encode(res)
+                # for r in ret['processing_panel'].split(','):
+                #     if is_delete_file is True:
+                #         program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
+                #         files_r = os.listdir(program_path_tmp_r)
+                #         if files_r:
+                #             for file_name in files_r:
+                #                 file_path = os.path.join(program_path_tmp_r, file_name)
+                #                 os.remove(file_path)
+                #     download_state = request.env['sf.cnc.processing'].with_user(
+                #         request.env.ref("base.user_admin")).download_file_tmp(
+                #         ret['folder_name'], r)
+                #     if download_state == 0:
+                #         res['status'] = -2
+                #         res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
+                #         return json.JSONEncoder().encode(res)
                 logging.info('创建cnc工单')
-                program_path_tmp = os.path.join('/tmp', ret['folder_name'], 'return', r)
-                # program_path_tmp = "C://Users//43484//Desktop//机企猫工作文档//其他//model_analysis"
-                files = os.listdir(program_path_tmp)
                 cnc_processing_arr = []
-                for f in files:
-                    program_path = os.path.join(program_path_tmp, f)
+                cmm_program_arr = []
+                for panel in ret['processing_panel'].split(','):
+                    program_path_tmp = os.path.join('/tmp', ret['folder_name'], 'return', panel)
+                    # program_path_tmp = "C://Users//43484//Desktop//机企猫工作文档//其他//model_analysis"
+                    files = os.listdir(program_path_tmp)
+                    cnc_processing_arr = []
+                    for f in files:
+                        program_path = os.path.join(program_path_tmp, f)
                     logging.info('cnc程序路径 :%s' % program_path)
                     if f.endswith(".doc"):
                         # 插入cmm程序数据

From 1f32aafc9b779cb526a0ebbf324084e87cd392fe Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 19 Jun 2024 16:38:30 +0800
Subject: [PATCH 07/67] =?UTF-8?q?1=E3=80=81=E5=AE=8C=E6=88=90=20=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BB=B6=E8=A3=85=E5=A4=B9=E9=A2=84=E8=B0=83=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?-3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index a5d902bf..d93df718 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -285,20 +285,26 @@
                         <!--                        </group>-->
                         <group string="托盘">
                             <field name="tray_serial_number" readonly="1" string="序列号"/>
+                        </group>
+                    </group>
+                    <group>
+                        <group>
                             <field name="tray_product_id" readonly="1" string="名称"/>
                             <field name="tray_brand_id" readonly="1" string="品牌"/>
+                        </group>
+                        <group>
                             <field name="tray_type_id" readonly="1" string="类型"/>
                             <field name="tray_model_id" readonly="1" string="型号"/>
                         </group>
                     </group>
-                    <group string="预调程序信息">
-                        <field name="preset_program_information" colspan="2" nolabel="1"
-                               placeholder="如有预调程序信息请在此处输入....."/>
-                    </group>
                     <group string="加工图纸">
                         <!--                         隐藏加工图纸字段名 -->
                         <field name="processing_drawing" widget="pdf_viewer" string="" readonly="1"/>
                     </group>
+                    <group string="预调程序信息">
+                        <field name="preset_program_information" colspan="2" nolabel="1"
+                               placeholder="如有预调程序信息请在此处输入....."/>
+                    </group>
                 </page>
                 <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
 

From 67b48814f6b5d146a88e11fab639352871556fa4 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 19 Jun 2024 17:35:13 +0800
Subject: [PATCH 08/67] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=92=8C=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/views/default_delivery.xml |   1 -
 sf_manufacturing/models/mrp_production.py     |  27 +---
 sf_manufacturing/models/mrp_workorder.py      | 120 +++++-------------
 sf_manufacturing/models/stock.py              |  30 ++---
 sf_manufacturing/views/mrp_workorder_view.xml |  13 +-
 sf_mrs_connect/controllers/controllers.py     |  48 ++++---
 6 files changed, 87 insertions(+), 152 deletions(-)

diff --git a/sf_machine_connect/views/default_delivery.xml b/sf_machine_connect/views/default_delivery.xml
index b0890981..0238c736 100644
--- a/sf_machine_connect/views/default_delivery.xml
+++ b/sf_machine_connect/views/default_delivery.xml
@@ -9,7 +9,6 @@
             <tree>
                 <field name="sequence_number"/>
                 <field name="program_name"/>
-                <field name="cnc_id" string="文件"/>
                 <field name="functional_tool_type_id"/>
                 <field name="cutting_tool_name"/>
                 <field name="cutting_tool_no"/>
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 32124b28..7c5c37bc 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -292,7 +292,7 @@ class MrpProduction(models.Model):
     # 则根据设备找到工作中心；否则采用前面描述的工作中心分配机制；
     # 其他规则限制： 默认只分配给工作中心状态为非故障的工作中心；
 
-    def _create_workorder3(self):
+    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对应的生产订单名称列表
@@ -328,19 +328,6 @@ class MrpProduction(models.Model):
                         'state': 'pending',
                     }]
             if production.product_id.categ_id.type == '成品':
-                if production.product_id.id in product_id_to_production_names:
-                    #     # 同一个产品多个制造订单对应一个编程单和模型库
-                    #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
-                    if not production.programming_no:
-                        production_programming = self.search(
-                            [('product_id.id', '=', production.product_id.id), ('origin', '=', production.origin)],
-                            limit=1, order='id asc')
-                        if not production_programming.programming_no:
-                            production.fetchCNC(', '.join(product_id_to_production_names[production.product_id.id]))
-                        else:
-                            production.write({'programming_no': production_programming.programming_no,
-                                              'programming_state': '编程中'})
-
                 # # 根据加工面板的面数及对应的工序模板生成工单
                 i = 0
                 processing_panel_len = len(production.product_id.model_processing_panel.split(','))
@@ -353,10 +340,10 @@ class MrpProduction(models.Model):
                     for route in product_routing_workcenter:
                         if route.is_repeat is True:
                             workorders_values.append(
-                                self.env['mrp.workorder'].json_workorder_str(k, production, route))
-                        if i == processing_panel_len and route.routing_type == '解除装夹':
-                            workorders_values.append(
-                                self.env['mrp.workorder'].json_workorder_str(k, production, route))
+                                self.env['mrp.workorder'].json_workorder_str(k, production, route, item))
+                        # if i == processing_panel_len and route.routing_type == '解除装夹':
+                        #     workorders_values.append(
+                        #         self.env['mrp.workorder'].json_workorder_str(k, production, route))
                 # 表面工艺工序
                 # 获取表面工艺id
                 if production.product_id.model_process_parameters_ids:
@@ -546,8 +533,8 @@ class MrpProduction(models.Model):
                 #     work.button_finish()
 
     # 创建工单并进行排序
-    def _create_workorder(self):
-        self._create_workorder3()
+    def _create_workorder(self, item):
+        self._create_workorder3(item)
         self._reset_work_order_sequence()
         return True
 
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 401788af..cd704eb0 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -472,7 +472,7 @@ class ResMrpWorkOrder(models.Model):
                         raise UserError(_("该工单暂未完成，无法进行工件配送"))
 
     # 拼接工单对象属性值
-    def json_workorder_str(self, k, production, route):
+    def json_workorder_str(self, k, production, route, item):
         # 计算预计时长duration_expected
         if route.routing_type == '切割':
             duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
@@ -514,6 +514,10 @@ class ResMrpWorkOrder(models.Model):
             'date_planned_finished': datetime.now() + timedelta(days=1),
             'duration_expected': duration_expected,
             'duration': 0,
+            'cnc_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cnc.processing']._json_cnc_processing(
+                k, item),
+            'cmc_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cmm.program']._json_cmm_program(k,
+                                                                                                                  item),
             'workpiece_delivery_ids': False if not route.routing_type == '装夹预调' else self._json_workpiece_delivery_list(
                 production)
         }]
@@ -1094,7 +1098,7 @@ class CNCprocessing(models.Model):
     _rec_name = 'program_name'
     _order = 'sequence_number,id'
 
-    cnc_id = fields.Many2one('ir.attachment')
+    # cnc_id = fields.Many2one('ir.attachment')
     sequence_number = fields.Integer('序号')
     program_name = fields.Char('程序名')
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
@@ -1144,24 +1148,26 @@ class CNCprocessing(models.Model):
                 cnc_workorder.write({'programming_state': '已编程', 'work_state': '已编程'})
         return cnc_processing
 
-    def _json_cnc_processing(self, obj):
-        cnc_processing_str = (0, 0, {
-            'sequence_number': obj['sequence_number'],
-            'program_name': obj['program_name'],
-            'cutting_tool_name': obj['cutting_tool_name'],
-            'cutting_tool_no': obj['cutting_tool_no'],
-            'processing_type': obj['processing_type'],
-            'margin_x_y': obj['margin_x_y'],
-            'margin_z': obj['margin_z'],
-            'depth_of_processing_z': obj['depth_of_processing_z'],
-            'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
-            'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
-            'estimated_processing_time': obj['estimated_processing_time'],
-            'program_path': obj['program_path'],
-            'cnc_id': obj['cnc_id'].id,
-            'remark': obj['remark']
-        })
-        return cnc_processing_str
+    def _json_cnc_processing(self, panel, ret):
+        cnc_processing = []
+        for item in ret['programming_list']:
+            if item['processing_panel'] == panel:
+                cnc_processing.append(0, 0, {
+                    'sequence_number': obj['sequence_number'],
+                    'program_name': obj['program_name'],
+                    'cutting_tool_name': obj['cutting_tool_name'],
+                    'cutting_tool_no': obj['cutting_tool_no'],
+                    'processing_type': obj['processing_type'],
+                    'margin_x_y': obj['margin_x_y'],
+                    'margin_z': obj['margin_z'],
+                    'depth_of_processing_z': obj['depth_of_processing_z'],
+                    'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
+                    'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
+                    'estimated_processing_time': obj['estimated_processing_time'],
+                    'program_path': obj['program_path'],
+                    'remark': obj['remark']
+                })
+        return cnc_processing
 
     # 根据程序名和加工面匹配到ftp里对应的Nc程序名,可优化为根据cnc_processing.program_path进行匹配
     def get_cnc_processing_file(self, serverdir, cnc_processing, program_path):
@@ -1602,80 +1608,22 @@ class CMMprogram(models.Model):
     _name = 'sf.cmm.program'
     _description = "CMM程序"
 
-    cmm_id = fields.Many2one('ir.attachment')
     sequence_number = fields.Integer('序号')
     program_name = fields.Char('程序名')
-    cutting_tool_name = fields.Char('刀具名称')
-    cutting_tool_no = fields.Char('刀号')
-    processing_type = fields.Char('加工类型')
-    margin_x_y = fields.Char('余量_X/Y')
-    margin_z = fields.Char('余量_Z')
-    depth_of_processing_z = fields.Char('加工深度(Z)')
-    cutting_tool_extension_length = fields.Char('刀具伸出长度')
-    cutting_tool_handle_type = fields.Char('刀柄型号')
-    estimated_processing_time = fields.Char('预计加工时间')
     remark = fields.Text('备注')
     workorder_id = fields.Many2one('mrp.workorder', string="工单")
     production_id = fields.Many2one('mrp.production', string="制造订单")
     program_path = fields.Char('程序文件路径')
+    program_create_date = fields.Datetime('程序创建日期')
 
-    def cmm_program_create(self, ret, program_path, program_path_tmp):
-        cmm_program = None
-        for obj in ret['programming_list']:
-            workorder = self.env['mrp.workorder'].search(
-                [('production_id.name', '=', ret['production_order_no'].split(',')[0]),
-                 ('processing_panel', '=', obj['processing_panel']),
-                 ('routing_type', '=', 'CNC加工')])
-            if obj['program_name'] in program_path:
-                logging.info('obj:%s' % obj['program_name'])
-                cmm_program = self.sudo().create({
-                    'workorder_id': workorder.id,
+    def _json_cmm_program(self, panel, ret):
+        cmm_program = []
+        for item in ret['programming_list']:
+            if item['processing_panel'] == panel:
+                cmm_program.append(0, 0, {
                     'sequence_number': obj['sequence_number'],
                     'program_name': obj['program_name'],
-                    'cutting_tool_name': obj['cutting_tool_name'],
-                    'cutting_tool_no': obj['cutting_tool_no'],
-                    'processing_type': obj['processing_type'],
-                    'margin_x_y': obj['margin_x_y'],
-                    'margin_z': obj['margin_z'],
-                    'depth_of_processing_z': obj['depth_of_processing_z'],
-                    'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
-                    'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
-                    'estimated_processing_time': obj['estimated_processing_time'],
-                    'remark': obj['remark'],
-                    'program_path': program_path.replace('/tmp', '')
+                    'program_path': obj['program_path'],
+                    'program_create_date': obj['program_create_date']
                 })
-                cmm_program.get_cmm_program_file(program_path_tmp, cmm_program, program_path)
         return cmm_program
-
-    # 根据程序名和加工面匹配到ftp里对应的cmm程序名
-    def get_cmm_program_file(self, serverdir, cmm_program, program_path):
-        logging.info('cmm-serverdir:%s' % serverdir)
-        for root, dirs, files in os.walk(serverdir):
-            for f in files:
-                if f in program_path:
-                    cmm_program_file_path = os.path.join(serverdir, root, f)
-                    self.write_file_cmm(cmm_program_file_path, cmm_program)
-
-    # 创建附件(nc文件)
-    def attachment_create(self, name, data):
-        attachment = self.env['ir.attachment'].create({
-            'datas': base64.b64encode(data),
-            'type': 'binary',
-            'public': True,
-            'description': '程序文件',
-            'name': name
-        })
-        return attachment
-
-    # 将cmm文件存到attach的datas里
-    def write_file_cmm(self, cmm_file_path, cnc):
-        cmm_file_name = cmm_file_path.split('/')
-        logging.info('cmm_file_name:%s' % cmm_file_name[-1])
-        if os.path.exists(cmm_file_path):
-            with open(cmm_file_path, 'rb') as file:
-                data_bytes = file.read()
-                attachment = self.attachment_create(cnc.program_name + cmm_file_name[-1], data_bytes)
-                cnc.write({'cmm_id': attachment.id})
-                file.close()
-        else:
-            return False
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index a454fb51..6d6d8158 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -210,7 +210,7 @@ class StockRule(models.Model):
             创建工单
             '''
             # productions._create_workorder()
-            根据product_id对self进行分组
+            # 根据product_id对self进行分组
             grouped_product_ids = {k: list(g) for k, g in groupby(self, key=lambda x: x.productions.product_id.id)}
             # 初始化一个字典来存储每个product_id对应的生产订单名称列表
             product_id_to_production_names = {}
@@ -219,20 +219,20 @@ class StockRule(models.Model):
                 # 为同一个product_id创建一个生产订单名称列表
                 product_id_to_production_names[product_id] = [production.name for production in productions]
             for production_item in productions:
-                if production_item.product_id.id in product_id_to_production_names:
-                    #     # 同一个产品多个制造订单对应一个编程单和模型库
-                    #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
-                    if not production_item.programming_no:
-                        production_programming = self.search(
-                            [('product_id.id', '=', production_item.product_id.id),
-                             ('origin', '=', production_item.origin)],
-                            limit=1, order='id asc')
-                        if not production_programming.programming_no:
-                            production_item.fetchCNC(
-                                ', '.join(product_id_to_production_names[production_item.product_id.id]))
-                        else:
-                            production_item.write({'programming_no': production_programming.programming_no,
-                                                   'programming_state': '编程中'})
+                # if production_item.product_id.id in product_id_to_production_names:
+                #     # 同一个产品多个制造订单对应一个编程单和模型库
+                #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
+                if not production_item.programming_no:
+                    production_programming = self.env['mrp.production'].search(
+                        [('product_id.id', '=', production_item.product_id.id),
+                         ('origin', '=', production_item.origin)],
+                        limit=1, order='id asc')
+                    if not production_programming.programming_no:
+                        production_item.fetchCNC(
+                            ', '.join(product_id_to_production_names[production_item.product_id.id]))
+                    else:
+                        production_item.write({'programming_no': production_programming.programming_no,
+                                               'programming_state': '编程中'})
 
             productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
                                            (
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index a5d902bf..7e6673ab 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -504,7 +504,6 @@
                         <tree decoration-success="button_state" decoration-bf="button_state">
                             <field name="sequence_number"/>
                             <field name="program_name"/>
-                            <field name="cnc_id" string="文件"/>
                             <field name="cutting_tool_name"/>
                             <field name="cutting_tool_no"/>
                             <field name="processing_type"/>
@@ -527,16 +526,8 @@
                         <tree>
                             <field name="sequence_number"/>
                             <field name="program_name"/>
-                            <field name="cmm_id" string="文件"/>
-                            <field name="cutting_tool_name"/>
-                            <field name="cutting_tool_no"/>
-                            <field name="processing_type"/>
-                            <field name="margin_x_y"/>
-                            <field name="margin_z"/>
-                            <field name="depth_of_processing_z"/>
-                            <field name="cutting_tool_extension_length"/>
-                            <field name="cutting_tool_handle_type"/>
-                            <field name="estimated_processing_time"/>
+                            <field name="program_path"/>
+                            <field name="program_create_date"/>
                             <field name="remark"/>
                         </tree>
                     </field>
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 08021b5f..0208b779 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -24,6 +24,7 @@ class Sf_Mrs_Connect(http.Controller):
             ret = json.loads(datas)
             ret = json.loads(ret['result'])
             logging.info('下发编程单:%s' % ret)
+            all_production = None
             is_delete_file = False
             # 查询状态为进行中且类型为获取CNC加工程序的工单
             cnc_production = request.env['mrp.production'].with_user(
@@ -83,26 +84,35 @@ class Sf_Mrs_Connect(http.Controller):
                     logging.info('cnc_processing111:%s' % cnc_processing)
                     if cnc_processing:
                         cnc_processing_arr.append(cnc_processing._json_cnc_processing(cnc_processing))
+
                 if (cnc_program and cnc_processing_arr) or (not cnc_program and cnc_processing_arr):
-                    cnc_production.workorder_ids.filtered(lambda g: g.routing_type == '装夹预调').write(
-                        {'processing_drawing': cnc_production.workorder_ids.filtered(
-                            lambda g1: g1.routing_type == 'CNC加工').cnc_worksheet})
-                    if cnc_program and cnc_processing_arr:
-                        cnc_program.write({'programming_state': '已编程', 'work_state': '已编程'})
-                        cnc_program.workorder_ids.filtered(lambda d: d.routing_type == '装夹预调').write(
-                            {'processing_drawing': cnc_production.workorder_ids.filtered(
-                                lambda d1: d1.routing_type == 'CNC加工').cnc_worksheet})
-                        cnc_program.workorder_ids.filtered(lambda b: b.routing_type == 'CNC加工').write(
-                            {'cnc_ids': cnc_processing_arr, 'cnc_worksheet': cnc_production.workorder_ids.filtered(
-                                lambda b1: b1.routing_type == 'CNC加工').cnc_worksheet})
-                        cnc_program |= cnc_production
-                    if not cnc_program and cnc_processing_arr:
-                        cnc_program = cnc_production
-                    cnc_program_ids = [item.id for item in cnc_program]
-                    workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
-                        [('production_id', 'in', cnc_program_ids)])
-                    if workpiece_delivery:
-                        workpiece_delivery.write({'is_cnc_program_down': True})
+                    productions = request.env['mrp.production'].with_user(
+                        request.env.ref("base.user_admin")).search(
+                        [('programming_no', '=', cnc_production.programming_no)])
+                    if productions:
+                        if not productions.workorder_ids:
+                            productions.product_id.model_processing_panel = ret['processing_panel']
+                            productions._create_workorder(ret)
+                    #     cnc_workorder = productions.workorder_ids.filtered(lambda g: g.routing_type == '装夹预调')
+                    # cnc_production.workorder_ids.filtered(lambda g: g.routing_type == '装夹预调').write(
+                    #     {'processing_drawing': cnc_production.workorder_ids.filtered(
+                    #         lambda g1: g1.routing_type == 'CNC加工').cnc_worksheet})
+                    # if cnc_program and cnc_processing_arr:
+                    #     cnc_program.write({'programming_state': '已编程', 'work_state': '已编程'})
+                    #     cnc_program.workorder_ids.filtered(lambda d: d.routing_type == '装夹预调').write(
+                    #         {'processing_drawing': cnc_production.workorder_ids.filtered(
+                    #             lambda d1: d1.routing_type == 'CNC加工').cnc_worksheet})
+                    #     cnc_program.workorder_ids.filtered(lambda b: b.routing_type == 'CNC加工').write(
+                    #         {'cnc_ids': cnc_processing_arr, 'cnc_worksheet': cnc_production.workorder_ids.filtered(
+                    #             lambda b1: b1.routing_type == 'CNC加工').cnc_worksheet})
+                    #     cnc_program |= cnc_production
+                    # if not cnc_program and cnc_processing_arr:
+                    #     cnc_program = cnc_production
+                    # cnc_program_ids = [item.id for item in cnc_program]
+                    # workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
+                    #     [('production_id', 'in', cnc_program_ids)])
+                    # if workpiece_delivery:
+                    #     workpiece_delivery.write({'is_cnc_program_down': True})
                 return json.JSONEncoder().encode(res)
             else:
                 res = {'status': 0, 'message': '该制造订单暂未开始'}

From f8c1d75b63bee22ea286de9a4d09115172d11a9d Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 20 Jun 2024 17:30:23 +0800
Subject: [PATCH 09/67] =?UTF-8?q?1=E3=80=81=E5=88=80=E5=85=B7=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/functional_tool.py       | 4 ++--
 sf_tool_management/views/functional_tool_views.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py
index 34f26ff6..45f52f4f 100644
--- a/sf_tool_management/models/functional_tool.py
+++ b/sf_tool_management/models/functional_tool.py
@@ -404,8 +404,8 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
     side_shelf_num = fields.Integer(string='线边刀库数量', compute='_compute_stock_num', store=True)
     on_tool_stock_num = fields.Integer(string='机内刀库数量', compute='_compute_stock_num', store=True)
     tool_stock_total = fields.Integer(string='当前库存量', compute='_compute_tool_stock_total', store=True)
-    min_stock_num = fields.Integer('最低库存量')
-    max_stock_num = fields.Integer('最高库存量')
+    min_stock_num = fields.Integer('最低库存量', tracking=True)
+    max_stock_num = fields.Integer('最高库存量', tracking=True)
     batch_replenishment_num = fields.Integer('批次补货量', readonly=True, compute='_compute_batch_replenishment_num',
                                              store=True)
     unit = fields.Char('单位', default="件")
diff --git a/sf_tool_management/views/functional_tool_views.xml b/sf_tool_management/views/functional_tool_views.xml
index 283eb2cc..6d812368 100644
--- a/sf_tool_management/views/functional_tool_views.xml
+++ b/sf_tool_management/views/functional_tool_views.xml
@@ -531,7 +531,7 @@
                    ref="sf_tool_management.sf_inbound_and_outbound_records_of_functional_tools_view_tree"/>
             <field name="search_view_id"
                    ref="sf_tool_management.sf_inbound_and_outbound_records_of_functional_tools_view_search"/>
-            <field name="domain">[('functional_tool_name', '!=', False)]</field>
+            <field name="domain">[('rfid', '!=', ''),('functional_tool_name', '!=', '')]</field>
         </record>
 
     </data>

From 612906e01da2f50126d62c9aed345a0cc017696a Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 21 Jun 2024 16:00:04 +0800
Subject: [PATCH 10/67] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=9A=E9=9D=A2=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     |  46 ++++++
 sf_manufacturing/models/mrp_workorder.py      |  58 +++----
 sf_manufacturing/models/stock.py              |  46 ------
 sf_manufacturing/security/ir.model.access.csv |   3 +-
 sf_mrs_connect/controllers/controllers.py     | 146 +++++++-----------
 sf_plan/models/custom_plan.py                 |  45 +++---
 6 files changed, 161 insertions(+), 183 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 7c5c37bc..aa1ffae0 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -391,6 +391,52 @@ class MrpProduction(models.Model):
                     workorders_values.append(
                         self.env['mrp.workorder'].json_workorder_str('', production, route))
             production.workorder_ids = workorders_values
+            # for production_item in productions:
+            process_parameter_workorder = self.env['mrp.workorder'].search(
+                [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production.id),
+                 ('is_subcontract', '=', True)])
+            if process_parameter_workorder:
+                is_pick = False
+                consecutive_workorders = []
+                m = 0
+                sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.id)
+                for i in range(len(sorted_workorders) - 1):
+                    if m == 0:
+                        is_pick = False
+                    if sorted_workorders[i].supplier_id.id == sorted_workorders[i + 1].supplier_id.id and \
+                            sorted_workorders[i].is_subcontract == sorted_workorders[i + 1].is_subcontract and \
+                            sorted_workorders[i].id == sorted_workorders[i + 1].id - 1:
+                        if sorted_workorders[i] not in consecutive_workorders:
+                            consecutive_workorders.append(sorted_workorders[i])
+                        consecutive_workorders.append(sorted_workorders[i + 1])
+                        m += 1
+                        continue
+                    else:
+                        if m == len(consecutive_workorders) - 1 and m != 0:
+                            self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
+                                                                                 production_item)
+                            if sorted_workorders[i] in consecutive_workorders:
+                                is_pick = True
+                            consecutive_workorders = []
+                            m = 0
+                        # 当前面的连续工序生成对应的外协出入库单再生成当前工序的外协出入库单
+                        if is_pick is False:
+                            self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i],
+                                                                                 production_item)
+                    if m == len(consecutive_workorders) - 1 and m != 0:
+                        self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
+                                                                             production_item)
+                        if sorted_workorders[i] in consecutive_workorders:
+                            is_pick = True
+                        consecutive_workorders = []
+                        m = 0
+                if m == len(consecutive_workorders) - 1 and m != 0:
+                    self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production_item)
+                if is_pick is False and m == 0:
+                    if len(sorted_workorders) == 1:
+                        self.env['stock.picking'].create_outcontract_picking(sorted_workorders, production_item)
+                    else:
+                        self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i], production_item)
             for workorder in production.workorder_ids:
                 workorder.duration_expected = workorder._get_duration_expected()
 
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index cd704eb0..248e49ce 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -505,7 +505,7 @@ class ResMrpWorkOrder(models.Model):
             'processing_panel': k,
             'quality_point_ids': route.route_workcenter_id.quality_point_ids,
             'routing_type': route.routing_type,
-            'work_state': '待发起',
+            # 'work_state': '待发起',
             'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
                                                                                route.routing_type,
                                                                                production.product_id),
@@ -516,7 +516,7 @@ class ResMrpWorkOrder(models.Model):
             'duration': 0,
             'cnc_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cnc.processing']._json_cnc_processing(
                 k, item),
-            'cmc_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cmm.program']._json_cmm_program(k,
+            'cmm_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cmm.program']._json_cmm_program(k,
                                                                                                                   item),
             'workpiece_delivery_ids': False if not route.routing_type == '装夹预调' else self._json_workpiece_delivery_list(
                 production)
@@ -1098,7 +1098,7 @@ class CNCprocessing(models.Model):
     _rec_name = 'program_name'
     _order = 'sequence_number,id'
 
-    # cnc_id = fields.Many2one('ir.attachment')
+    cnc_id = fields.Many2one('ir.attachment')
     sequence_number = fields.Integer('序号')
     program_name = fields.Char('程序名')
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
@@ -1116,6 +1116,7 @@ class CNCprocessing(models.Model):
     production_id = fields.Many2one('mrp.production', string="制造订单")
     button_state = fields.Boolean(string='是否已经下发')
     program_path = fields.Char('程序文件路径')
+    program_create_date = fields.Datetime('程序创建日期')
 
     # mrs下发编程单创建CNC加工
     def cnc_processing_create(self, cnc_workorder, ret, program_path, program_path_tmp):
@@ -1151,22 +1152,23 @@ class CNCprocessing(models.Model):
     def _json_cnc_processing(self, panel, ret):
         cnc_processing = []
         for item in ret['programming_list']:
-            if item['processing_panel'] == panel:
-                cnc_processing.append(0, 0, {
-                    'sequence_number': obj['sequence_number'],
-                    'program_name': obj['program_name'],
-                    'cutting_tool_name': obj['cutting_tool_name'],
-                    'cutting_tool_no': obj['cutting_tool_no'],
-                    'processing_type': obj['processing_type'],
-                    'margin_x_y': obj['margin_x_y'],
-                    'margin_z': obj['margin_z'],
-                    'depth_of_processing_z': obj['depth_of_processing_z'],
-                    'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
-                    'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
-                    'estimated_processing_time': obj['estimated_processing_time'],
-                    'program_path': obj['program_path'],
-                    'remark': obj['remark']
-                })
+            if item['processing_panel'] == panel and item['ftp_path'].find('.dmi') == -1:
+                cnc_processing.append((0, 0, {
+                    'sequence_number': item['sequence_number'],
+                    'program_name': item['program_name'],
+                    'cutting_tool_name': item['cutting_tool_name'],
+                    'cutting_tool_no': item['cutting_tool_no'],
+                    'processing_type': item['processing_type'],
+                    'margin_x_y': item['margin_x_y'],
+                    'margin_z': item['margin_z'],
+                    'depth_of_processing_z': item['depth_of_processing_z'],
+                    'cutting_tool_extension_length': item['cutting_tool_extension_length'],
+                    'cutting_tool_handle_type': item['cutting_tool_handle_type'],
+                    'estimated_processing_time': item['estimated_processing_time'],
+                    'program_path': item['ftp_path'],
+                    'program_create_date': datetime.strptime(item['program_create_date'], '%Y-%m-%d %H:%M:%S'),
+                    'remark': item['remark']
+                }))
         return cnc_processing
 
     # 根据程序名和加工面匹配到ftp里对应的Nc程序名,可优化为根据cnc_processing.program_path进行匹配
@@ -1197,14 +1199,14 @@ class CNCprocessing(models.Model):
         })
         return attachment
 
-    # 将FTP的nc文件下载到临时目录
+    # 将FTP的多面的程序单文件下载到临时目录
     def download_file_tmp(self, production_no, processing_panel):
         remotepath = os.path.join('/NC', production_no, 'return', processing_panel)
         serverdir = os.path.join('/tmp', production_no, 'return', processing_panel)
         ftp_resconfig = self.env['res.config.settings'].get_values()
         ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'],
                             ftp_resconfig['ftp_password'])
-        download_state = ftp.download_file_tree(remotepath, serverdir)
+        download_state = ftp.download_program_file(remotepath, serverdir)
         logging.info('download_state:%s' % download_state)
         return download_state
 
@@ -1619,11 +1621,11 @@ class CMMprogram(models.Model):
     def _json_cmm_program(self, panel, ret):
         cmm_program = []
         for item in ret['programming_list']:
-            if item['processing_panel'] == panel:
-                cmm_program.append(0, 0, {
-                    'sequence_number': obj['sequence_number'],
-                    'program_name': obj['program_name'],
-                    'program_path': obj['program_path'],
-                    'program_create_date': obj['program_create_date']
-                })
+            if item['processing_panel'] == panel and item['ftp_path'].find('.dmi') != -1:
+                cmm_program.append((0, 0, {
+                    'sequence_number': 1,
+                    'program_name': item['program_name'],
+                    'program_path': item['ftp_path'],
+                    'program_create_date': datetime.strptime(item['program_create_date'], '%Y-%m-%d %H:%M:%S'),
+                }))
         return cmm_program
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 6d6d8158..6d83c011 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -238,52 +238,6 @@ class StockRule(models.Model):
                                            (
                                                    p.move_dest_ids.procure_method != 'make_to_order' and not
                                            p.move_raw_ids and not p.workorder_ids)).action_confirm()
-            for production_item in productions:
-                process_parameter_workorder = self.env['mrp.workorder'].search(
-                    [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production_item.id),
-                     ('is_subcontract', '=', True)])
-                if process_parameter_workorder:
-                    is_pick = False
-                    consecutive_workorders = []
-                    m = 0
-                    sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.id)
-                    for i in range(len(sorted_workorders) - 1):
-                        if m == 0:
-                            is_pick = False
-                        if sorted_workorders[i].supplier_id.id == sorted_workorders[i + 1].supplier_id.id and \
-                                sorted_workorders[i].is_subcontract == sorted_workorders[i + 1].is_subcontract and \
-                                sorted_workorders[i].id == sorted_workorders[i + 1].id - 1:
-                            if sorted_workorders[i] not in consecutive_workorders:
-                                consecutive_workorders.append(sorted_workorders[i])
-                            consecutive_workorders.append(sorted_workorders[i + 1])
-                            m += 1
-                            continue
-                        else:
-                            if m == len(consecutive_workorders) - 1 and m != 0:
-                                self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
-                                                                                     production_item)
-                                if sorted_workorders[i] in consecutive_workorders:
-                                    is_pick = True
-                                consecutive_workorders = []
-                                m = 0
-                            # 当前面的连续工序生成对应的外协出入库单再生成当前工序的外协出入库单
-                            if is_pick is False:
-                                self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i],
-                                                                                     production_item)
-                        if m == len(consecutive_workorders) - 1 and m != 0:
-                            self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
-                                                                                 production_item)
-                            if sorted_workorders[i] in consecutive_workorders:
-                                is_pick = True
-                            consecutive_workorders = []
-                            m = 0
-                    if m == len(consecutive_workorders) - 1 and m != 0:
-                        self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production_item)
-                    if is_pick is False and m == 0:
-                        if len(sorted_workorders) == 1:
-                            self.env['stock.picking'].create_outcontract_picking(sorted_workorders, production_item)
-                        else:
-                            self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i], production_item)
 
             for production in productions:
                 '''
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index 3b75f102..72c211ea 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -1,8 +1,9 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sf_cnc_processing_group_sf_mrp_user,sf_cnc_processing,model_sf_cnc_processing,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_cnc_processing_manager,sf_cnc_processing,model_sf_cnc_processing,sf_base.group_sf_mrp_manager,1,1,1,0
-access_sf_cmm_program_group_sf_mrp_user_group_sf_mrp_user,sf_cmm_program_group_sf_mrp_user,model_sf_cmm_program,sf_base.group_sf_mrp_user,1,0,0,0
+access_sf_cmm_program_group_sf_mrp_user,sf_cmm_program_group_sf_mrp_user,model_sf_cmm_program,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_cmm_program_group_sf_mrp_manager,sf_cmm_program_group_sf_mrp_manager,model_sf_cmm_program,sf_base.group_sf_mrp_manager,1,0,0,0
+access_sf_cmm_program_admin,sf_cmm_program_admin,model_sf_cmm_program,base.group_system,1,1,1,0
 access_sf_model_type_group_sf_mrp_user,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_model_type_admin,sf_model_type_admin,model_sf_model_type,base.group_system,1,1,1,0
 access_sf_model_type_manager,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_manager,1,1,1,0
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 0208b779..35e9a32c 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -24,95 +24,69 @@ class Sf_Mrs_Connect(http.Controller):
             ret = json.loads(datas)
             ret = json.loads(ret['result'])
             logging.info('下发编程单:%s' % ret)
-            all_production = None
             is_delete_file = False
-            # 查询状态为进行中且类型为获取CNC加工程序的工单
-            cnc_production = request.env['mrp.production'].with_user(
-                request.env.ref("base.user_admin")).search([('name', '=', ret['production_order_no'].split(',')[0])])
-            cnc_program = request.env['mrp.production'].with_user(
+            productions = request.env['mrp.production'].with_user(
                 request.env.ref("base.user_admin")).search(
-                [('programming_no', '=', cnc_production.programming_no), ('id', '!=', cnc_production.id)])
-            if cnc_production.workorder_ids.filtered(lambda a: a.routing_type == 'CNC加工').cnc_ids:
-                is_delete_file = True
-                cnc_production.workorder_ids.filtered(
-                    lambda a1: a1.routing_type == 'CNC加工').cnc_ids.sudo().unlink()
-                request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(cnc_production)
-            if cnc_program.workorder_ids.filtered(lambda c: c.routing_type == 'CNC加工').cnc_ids:
-                cnc_program.workorder_ids.filtered(
-                    lambda c1: c1.routing_type == 'CNC加工').cnc_ids.sudo().unlink()
-                request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(cnc_program)
-            # cnc_program = request.env['mrp.production'].with_user(
-            #     request.env.ref("base.user_admin")).search([('programming_no', '=', cnc_production.programming_no)])
-            logging.info('制造订单号:%s' % cnc_production.name)
-            if cnc_production:
-                # if ret['glb_file']:
-                #     cnc_production.glb_file = base64.b64encode(ret['glb_file'])
+                [('programming_no', '=', ret['programming_no'])])
+            if productions:
                 # 拉取所有加工面的程序文件
-                # for r in ret['processing_panel'].split(','):
-                #     if is_delete_file is True:
-                #         program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
-                #         files_r = os.listdir(program_path_tmp_r)
-                #         if files_r:
-                #             for file_name in files_r:
-                #                 file_path = os.path.join(program_path_tmp_r, file_name)
-                #                 os.remove(file_path)
-                #     download_state = request.env['sf.cnc.processing'].with_user(
-                #         request.env.ref("base.user_admin")).download_file_tmp(
-                #         ret['folder_name'], r)
-                #     if download_state == 0:
-                #         res['status'] = -2
-                #         res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
-                #         return json.JSONEncoder().encode(res)
-                logging.info('创建cnc工单')
-                cnc_processing_arr = []
-                cmm_program_arr = []
-                for panel in ret['processing_panel'].split(','):
-                    program_path_tmp = os.path.join('/tmp', ret['folder_name'], 'return', panel)
-                    # program_path_tmp = "C://Users//43484//Desktop//机企猫工作文档//其他//model_analysis"
-                    files = os.listdir(program_path_tmp)
-                    cnc_processing_arr = []
-                    for f in files:
-                        program_path = os.path.join(program_path_tmp, f)
-                    logging.info('cnc程序路径 :%s' % program_path)
-                    if f.endswith(".doc"):
-                        # 插入cmm程序数据
-                        cmm_program = request.env['sf.cmm.program'].with_user(
-                            request.env.ref("base.user_admin")).cmm_program_create(ret, program_path, program_path_tmp)
-                    cnc_processing = request.env['sf.cnc.processing'].with_user(
-                        request.env.ref("base.user_admin")).cnc_processing_create(cnc_production, ret, program_path,
-                                                                                  program_path_tmp)
-                    logging.info('cnc_processing111:%s' % cnc_processing)
-                    if cnc_processing:
-                        cnc_processing_arr.append(cnc_processing._json_cnc_processing(cnc_processing))
-
-                if (cnc_program and cnc_processing_arr) or (not cnc_program and cnc_processing_arr):
-                    productions = request.env['mrp.production'].with_user(
-                        request.env.ref("base.user_admin")).search(
-                        [('programming_no', '=', cnc_production.programming_no)])
-                    if productions:
-                        if not productions.workorder_ids:
-                            productions.product_id.model_processing_panel = ret['processing_panel']
-                            productions._create_workorder(ret)
-                    #     cnc_workorder = productions.workorder_ids.filtered(lambda g: g.routing_type == '装夹预调')
-                    # cnc_production.workorder_ids.filtered(lambda g: g.routing_type == '装夹预调').write(
-                    #     {'processing_drawing': cnc_production.workorder_ids.filtered(
-                    #         lambda g1: g1.routing_type == 'CNC加工').cnc_worksheet})
-                    # if cnc_program and cnc_processing_arr:
-                    #     cnc_program.write({'programming_state': '已编程', 'work_state': '已编程'})
-                    #     cnc_program.workorder_ids.filtered(lambda d: d.routing_type == '装夹预调').write(
-                    #         {'processing_drawing': cnc_production.workorder_ids.filtered(
-                    #             lambda d1: d1.routing_type == 'CNC加工').cnc_worksheet})
-                    #     cnc_program.workorder_ids.filtered(lambda b: b.routing_type == 'CNC加工').write(
-                    #         {'cnc_ids': cnc_processing_arr, 'cnc_worksheet': cnc_production.workorder_ids.filtered(
-                    #             lambda b1: b1.routing_type == 'CNC加工').cnc_worksheet})
-                    #     cnc_program |= cnc_production
-                    # if not cnc_program and cnc_processing_arr:
-                    #     cnc_program = cnc_production
-                    # cnc_program_ids = [item.id for item in cnc_program]
-                    # workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
-                    #     [('production_id', 'in', cnc_program_ids)])
-                    # if workpiece_delivery:
-                    #     workpiece_delivery.write({'is_cnc_program_down': True})
+                for r in ret['processing_panel'].split(','):
+                    if is_delete_file is True:
+                        program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
+                        files_r = os.listdir(program_path_tmp_r)
+                        if files_r:
+                            for file_name in files_r:
+                                file_path = os.path.join(program_path_tmp_r, file_name)
+                                os.remove(file_path)
+                    download_state = request.env['sf.cnc.processing'].with_user(
+                        request.env.ref("base.user_admin")).download_file_tmp(
+                        ret['folder_name'], r)
+                    if download_state == 0:
+                        res['status'] = -2
+                        res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
+                        return json.JSONEncoder().encode(res)
+                for production in productions:
+                    if not production.workorder_ids:
+                        production.product_id.model_processing_panel = ret['processing_panel']
+                        production._create_workorder(ret)
+                    else:
+                        for panel in ret['processing_panel'].split(','):
+                            # 查询状态为进行中且工序类型为CNC加工的工单
+                            cnc_workorder = production.workorder_ids.filtered(
+                                lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done',
+                                                                                             'cancel'] and ac.processing_panel == panel)
+                            if cnc_workorder:
+                                if is_delete_file is True:
+                                    cnc_workorder.cmm_ids.sudo().unlink()
+                                    cnc_workorder.cnc_ids.sudo().unlink()
+                                    request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
+                                        production)
+                                program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
+                                logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
+                                files_panel = os.listdir(program_path_tmp_panel)
+                                if files_panel:
+                                    for file in files_panel:
+                                        file_extension = os.path.splitext(file)[1]
+                                        logging.info('file_extension:%s' % file_extension)
+                                        if file_extension.lower() == '.pdf':
+                                            panel_file_path = os.path.join(program_path_tmp_panel, file)
+                                            logging.info('panel_file_path:%s' % panel_file_path)
+                                cnc_workorder.write(
+                                    {'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(
+                                    lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done',
+                                                                                                  'cancel'] and ap.processing_panel == panel)
+                                if pre_workorder:
+                                    pre_workorder.write(
+                                        {'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(
+                    [('production_id', 'in', cnc_program_ids)])
+                if workpiece_delivery:
+                    workpiece_delivery.write({'is_cnc_program_down': True})
                 return json.JSONEncoder().encode(res)
             else:
                 res = {'status': 0, 'message': '该制造订单暂未开始'}
diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index fd1e231a..fcfb8020 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -200,22 +200,23 @@ class sf_production_plan(models.Model):
                 raise ValidationError("未选择生产线")
             else:
                 workorder_id_list = record.production_id.workorder_ids.ids
-                if record.production_id.workorder_ids:
-                    for item in record.production_id.workorder_ids:
-                        if item.name == 'CNC加工':
-                            item.date_planned_finished = datetime.now() + timedelta(days=100)
-                            # item.date_planned_start = record.date_planned_start
-                            item.date_planned_start = self.date_planned_start if self.date_planned_start else datetime.now()
-                            record.sudo().production_id.plan_start_processing_time = item.date_planned_start
-                            item.date_planned_finished = item.date_planned_start + timedelta(
-                                minutes=record.env['mrp.routing.workcenter'].sudo().search(
-                                    [('name', '=', 'CNC加工')]).time_cycle)
-                            item.duration_expected = record.env['mrp.routing.workcenter'].sudo().search(
-                                [('name', '=', 'CNC加工')]).time_cycle
-                            record.calculate_plan_time_before(item, workorder_id_list)
-                            record.calculate_plan_time_after(item, workorder_id_list)
-                            record.date_planned_start, record.date_planned_finished = \
-                                item.date_planned_start, item.date_planned_finished
+                if record.production_id:
+                    if record.production_id.workorder_ids:
+                        for item in record.production_id.workorder_ids:
+                            if item.name == 'CNC加工':
+                                item.date_planned_finished = datetime.now() + timedelta(days=100)
+                                # item.date_planned_start = record.date_planned_start
+                                item.date_planned_start = self.date_planned_start if self.date_planned_start else datetime.now()
+                                record.sudo().production_id.plan_start_processing_time = item.date_planned_start
+                                item.date_planned_finished = item.date_planned_start + timedelta(
+                                    minutes=record.env['mrp.routing.workcenter'].sudo().search(
+                                        [('name', '=', 'CNC加工')]).time_cycle)
+                                item.duration_expected = record.env['mrp.routing.workcenter'].sudo().search(
+                                    [('name', '=', 'CNC加工')]).time_cycle
+                                record.calculate_plan_time_before(item, workorder_id_list)
+                                record.calculate_plan_time_after(item, workorder_id_list)
+                                record.date_planned_start, record.date_planned_finished = \
+                                    item.date_planned_start, item.date_planned_finished
                     record.state = 'done'
                     # record.production_id.schedule_state = '已排'
                     record.sudo().production_id.schedule_state = '已排'
@@ -231,12 +232,12 @@ class sf_production_plan(models.Model):
                     # record.production_id.date_planned_start = record.date_planned_start
                     # record.production_id.date_planned_finished = record.date_planned_finished
                     record.sudo().production_id.production_line_id = record.production_line_id.id
-                    record.sudo().production_id.workorder_ids.filtered(
-                        lambda b: b.routing_type == "装夹预调").workpiece_delivery_ids.write(
-                        {'production_line_id': record.production_line_id.id,
-                         'plan_start_processing_time': record.date_planned_start})
-                else:
-                    raise ValidationError("未找到工单")
+                    if record.production_id.workorder_ids:
+                        record.sudo().production_id.workorder_ids.filtered(
+                            lambda b: b.routing_type == "装夹预调").workpiece_delivery_ids.write(
+                            {'production_line_id': record.production_line_id.id,
+                             'plan_start_processing_time': record.date_planned_start})
+
                     # record.date_planned_finished = record.date_planned_start + timedelta(days=3)
                     # record.state = 'done'
         return {

From 66b66a935fc9fdc140d2ea1cbc488ac89ebde88c Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 21 Jun 2024 17:15:05 +0800
Subject: [PATCH 11/67] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E4=B8=8B=E5=8F=91=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/views/compensation.xml     | 38 +++++++++----------
 sf_manufacturing/security/ir.model.access.csv |  2 +-
 sf_manufacturing/views/mrp_workorder_view.xml | 19 ++++++----
 sf_mrs_connect/controllers/controllers.py     | 32 ++++++++--------
 4 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index f79c539e..016f3821 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -5,10 +5,10 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
         <field name="arch" type="xml">
-            <xpath expr="//header" position="inside">
-                <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",
-                                    ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>
-            </xpath>
+<!--            <xpath expr="//header" position="inside">-->
+<!--                <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",-->
+<!--                                    ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>-->
+<!--            </xpath>-->
                 <xpath expr="//page//field[@name='cnc_ids']" position="before">
                     <group>
                         <group>
@@ -19,21 +19,21 @@
                             <div>
                                 <field name="button_compensation_state" attrs='{"invisible": ["|",
                                     ("state","!=","progress"),("user_permissions","=",False)]}'/>
-                                <button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿"
-                                    class="btn-primary" attrs='{"invisible": ["|",
-                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
-                                <span>&#32;</span>
-                                <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"
-                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
-                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
-                                <span>&#32;</span>
-                                <button string="合并下发" id="action_up_select" name="%(sf_machine_connect.action_up_select)d"
-                                type="action" class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
-                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
-                                <span>&#32;</span>
-                                <button string="一键合并下发" name="up_merge_all" type="object" style="text-align: right;" confirm="是否确认一键合并下发"
-                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
-                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+<!--                                <button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿"-->
+<!--                                    class="btn-primary" attrs='{"invisible": ["|",-->
+<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
+<!--                                <span>&#32;</span>-->
+<!--                                <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"-->
+<!--                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
+<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
+<!--                                <span>&#32;</span>-->
+<!--                                <button string="合并下发" id="action_up_select" name="%(sf_machine_connect.action_up_select)d"-->
+<!--                                type="action" class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
+<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
+<!--                                <span>&#32;</span>-->
+<!--                                <button string="一键合并下发" name="up_merge_all" type="object" style="text-align: right;" confirm="是否确认一键合并下发"-->
+<!--                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
+<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
                             </div>
                         </div>
                     </group>
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index 72c211ea..ec2d5a76 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -3,7 +3,7 @@ access_sf_cnc_processing_group_sf_mrp_user,sf_cnc_processing,model_sf_cnc_proces
 access_sf_cnc_processing_manager,sf_cnc_processing,model_sf_cnc_processing,sf_base.group_sf_mrp_manager,1,1,1,0
 access_sf_cmm_program_group_sf_mrp_user,sf_cmm_program_group_sf_mrp_user,model_sf_cmm_program,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_cmm_program_group_sf_mrp_manager,sf_cmm_program_group_sf_mrp_manager,model_sf_cmm_program,sf_base.group_sf_mrp_manager,1,0,0,0
-access_sf_cmm_program_admin,sf_cmm_program_admin,model_sf_cmm_program,base.group_system,1,1,1,0
+access_sf_cmm_program_admin,sf_cmm_program_admin,model_sf_cmm_program,base.group_system,1,1,1,1
 access_sf_model_type_group_sf_mrp_user,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_model_type_admin,sf_model_type_admin,model_sf_model_type,base.group_system,1,1,1,0
 access_sf_model_type_manager,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_manager,1,1,1,0
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 7e6673ab..34496a25 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -218,9 +218,6 @@
                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                     <field name="functional_fixture_type_id"
                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                    <field name="rfid_code" force_save="1" readonly="1" cache="True"
-                           attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
-                    <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
                 </group>
                 <!--                <group>-->
                 <!--                    <div>-->
@@ -500,7 +497,8 @@
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
-                    <field name="cnc_ids" widget="one2many" string="工作程序" default_order="sequence_number,id">
+                    <field name="cnc_ids" widget="one2many" string="工作程序" default_order="sequence_number,id"
+                           readonly="1">
                         <tree decoration-success="button_state" decoration-bf="button_state">
                             <field name="sequence_number"/>
                             <field name="program_name"/>
@@ -513,8 +511,10 @@
                             <field name="cutting_tool_extension_length"/>
                             <field name="cutting_tool_handle_type"/>
                             <field name="estimated_processing_time"/>
+                            <field name="program_path"/>
+                            <field name="program_create_date"/>
                             <field name="remark"/>
-                            <field name="button_state" invisible="1"/>
+<!--                            <field name="button_state" invisible="1"/>-->
                         </tree>
                     </field>
                     <group>
@@ -522,7 +522,7 @@
                     </group>
                 </page>
                 <page string="CMM程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
-                    <field name="cmm_ids" widget="one2many" string="CMM程序">
+                    <field name="cmm_ids" widget="one2many" string="CMM程序" readonly="1">
                         <tree>
                             <field name="sequence_number"/>
                             <field name="program_name"/>
@@ -558,8 +558,8 @@
             </xpath>
             <xpath expr="//form//sheet//group//group//div[3]" position="after">
                 <field name="is_ok"/>
-                <field name="processing_user_id"/>
-                <field name="inspection_user_id"/>
+                <!--                <field name="processing_user_id"/>-->
+                <!--                <field name="inspection_user_id"/>-->
                 <field name="save_name" widget="CopyClipboardChar"
                        attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
                 <label for="material_length" string="物料尺寸"/>
@@ -574,6 +574,9 @@
                     <field name="material_height" class="o_address_zip"/>
                 </div>
                 <field name="part_number" string="成品的零件图号"/>
+                <field name="rfid_code" force_save="1" readonly="1" cache="True"
+                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
+                <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
             </xpath>
         </field>
     </record>
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 35e9a32c..2ac534a8 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -24,27 +24,25 @@ class Sf_Mrs_Connect(http.Controller):
             ret = json.loads(datas)
             ret = json.loads(ret['result'])
             logging.info('下发编程单:%s' % ret)
-            is_delete_file = False
             productions = request.env['mrp.production'].with_user(
                 request.env.ref("base.user_admin")).search(
                 [('programming_no', '=', ret['programming_no'])])
             if productions:
                 # 拉取所有加工面的程序文件
                 for r in ret['processing_panel'].split(','):
-                    if is_delete_file is True:
-                        program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
-                        files_r = os.listdir(program_path_tmp_r)
-                        if files_r:
-                            for file_name in files_r:
-                                file_path = os.path.join(program_path_tmp_r, file_name)
-                                os.remove(file_path)
-                    download_state = request.env['sf.cnc.processing'].with_user(
-                        request.env.ref("base.user_admin")).download_file_tmp(
-                        ret['folder_name'], r)
-                    if download_state == 0:
-                        res['status'] = -2
-                        res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
-                        return json.JSONEncoder().encode(res)
+                    program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
+                    files_r = os.listdir(program_path_tmp_r)
+                    if files_r:
+                        for file_name in files_r:
+                            file_path = os.path.join(program_path_tmp_r, file_name)
+                            os.remove(file_path)
+                download_state = request.env['sf.cnc.processing'].with_user(
+                    request.env.ref("base.user_admin")).download_file_tmp(
+                    ret['folder_name'], r)
+                if download_state == 0:
+                    res['status'] = -2
+                    res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
+                    return json.JSONEncoder().encode(res)
                 for production in productions:
                     if not production.workorder_ids:
                         production.product_id.model_processing_panel = ret['processing_panel']
@@ -56,11 +54,13 @@ class Sf_Mrs_Connect(http.Controller):
                                 lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done',
                                                                                              'cancel'] and ac.processing_panel == panel)
                             if cnc_workorder:
-                                if is_delete_file is True:
+                                if cnc_workorder.cnc_ids:
                                     cnc_workorder.cmm_ids.sudo().unlink()
                                     cnc_workorder.cnc_ids.sudo().unlink()
                                     request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
                                         production)
+                                # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
+                                #                                       panel)
                                 program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
                                 logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
                                 files_panel = os.listdir(program_path_tmp_panel)

From eff2032762cfdaf895a2ccc3d4e7f00caa4a2643 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 24 Jun 2024 14:16:42 +0800
Subject: [PATCH 12/67] =?UTF-8?q?=E4=BF=AE=E6=94=B9fetchCNC=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=C2=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 3a08caf9..60f140ac 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -506,7 +506,7 @@
                 <page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <field name="cnc_ids" widget="one2many" string="工作程序" default_order="sequence_number,id"
                            readonly="1">
-                        <tree decoration-success="button_state" decoration-bf="button_state">
+                        <tree>
                             <field name="sequence_number"/>
                             <field name="program_name"/>
                             <field name="cutting_tool_name"/>

From 733b554942d7a886b77572d14355f3f11f35baa6 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 24 Jun 2024 14:16:53 +0800
Subject: [PATCH 13/67] no message

---
 sf_manufacturing/models/stock.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index dfc8b54d..c47d4490 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -219,20 +219,20 @@ class StockRule(models.Model):
                 # 为同一个product_id创建一个生产订单名称列表
                 product_id_to_production_names[product_id] = [production.name for production in productions]
             for production_item in productions:
-                # if production_item.product_id.id in product_id_to_production_names:
-                #     # 同一个产品多个制造订单对应一个编程单和模型库
-                #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
-                if not production_item.programming_no:
-                    production_programming = self.env['mrp.production'].search(
-                        [('product_id.id', '=', production_item.product_id.id),
-                         ('origin', '=', production_item.origin)],
-                        limit=1, order='id asc')
-                    if not production_programming.programming_no:
-                        production_item.fetchCNC(
-                            ', '.join(product_id_to_production_names[production_item.product_id.id]))
-                    else:
-                        production_item.write({'programming_no': production_programming.programming_no,
-                                               'programming_state': '编程中'})
+                if production_item.product_id.id in product_id_to_production_names:
+                    #     # 同一个产品多个制造订单对应一个编程单和模型库
+                    #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
+                    if not production_item.programming_no:
+                        production_programming = self.env['mrp.production'].search(
+                            [('product_id.id', '=', production_item.product_id.id),
+                             ('origin', '=', production_item.origin)],
+                            limit=1, order='id asc')
+                        if not production_programming.programming_no:
+                            production_item.fetchCNC(
+                                ', '.join(product_id_to_production_names[production_item.product_id.id]))
+                        else:
+                            production_item.write({'programming_no': production_programming.programming_no,
+                                                   'programming_state': '编程中'})
 
             productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
                                            (

From 5f4ecf8ff9afe71dd6eae5836933319aa96fc8c8 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 24 Jun 2024 14:46:02 +0800
Subject: [PATCH 14/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/stock.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index c47d4490..be81e110 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -206,12 +206,16 @@ class StockRule(models.Model):
 
             # self.env['stock.move'].sudo().create(productions._get_moves_raw_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
+                                           p.move_raw_ids and not p.workorder_ids)).action_confirm()
             '''
             创建工单
             '''
             # productions._create_workorder()
-            # 根据product_id对self进行分组
-            grouped_product_ids = {k: list(g) for k, g in groupby(self, key=lambda x: x.productions.product_id.id)}
+            #
+            grouped_product_ids = {k: list(g) for k, g in groupby(productions, key=lambda x: x.product_id.id)}
             # 初始化一个字典来存储每个product_id对应的生产订单名称列表
             product_id_to_production_names = {}
             # 对于每个product_id，获取其所有生产订单的名称
@@ -234,11 +238,6 @@ class StockRule(models.Model):
                             production_item.write({'programming_no': production_programming.programming_no,
                                                    'programming_state': '编程中'})
 
-            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
-                                           p.move_raw_ids and not p.workorder_ids)).action_confirm()
-
             for production in productions:
                 '''
                 创建制造订单时生成序列号

From 9110c81c73c14f7aa791c248342b20fd8986f9ab Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 24 Jun 2024 14:46:47 +0800
Subject: [PATCH 15/67] =?UTF-8?q?=E8=BF=98=E5=8E=9FOCC=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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_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

From f67d08fc88a3b0ae1d30a629122a3fba08ec97d2 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 24 Jun 2024 15:00:54 +0800
Subject: [PATCH 16/67] =?UTF-8?q?=E5=B7=A5=E4=BB=B6=E8=A3=85=E5=A4=B9?=
 =?UTF-8?q?=E9=A2=84=E8=B0=83=E5=B7=A5=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=9C=80=E6=B1=82-1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/models/jd_eclp.py               |  2 +-
 sf_manufacturing/views/mrp_workorder_view.xml | 43 +++++++++++++------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py
index e381242a..c2b8deb7 100644
--- a/sf_bf_connect/models/jd_eclp.py
+++ b/sf_bf_connect/models/jd_eclp.py
@@ -14,7 +14,7 @@ _logger = logging.getLogger(__name__)
 class JdEclp(models.Model):
     _inherit = 'stock.picking'
 
-    senderNickName = fields.Char(string='寄件工厂简称', required=True, default='MW')
+    senderNickName = fields.Char(string='寄件工厂简称', required=True, default='XT')
 
     # receiverName = fields.Char(string='收件人姓名')
     # receiverMobile = fields.Char(string='收件人电话')
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index c1ec9193..12ded4cc 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -11,7 +11,7 @@
                 <field name="name" decoration-success="is_subcontract" decoration-bf="is_subcontract"/>
             </field>
             <field name="name" position="before">
-                <field name="sequence"/>
+                <field name="sequence" optional="hide"/>
                 <field name='user_permissions' invisible="1"/>
             </field>
             <field name="name" position="after">
@@ -21,6 +21,12 @@
                 <field name="work_state" optional="hide"/>
                 <field name="product_tmpl_name" invisible="1"/>
             </field>
+            <field name="duration" position="replace">
+                <field name="duration" optional="hide"/>
+            </field>
+            <field name="workcenter_id" position="replace">
+                <field name="workcenter_id" optional="hide"/>
+            </field>
             <field name="product_id" position="after">
                 <field name="equipment_id" optional="hide"/>
             </field>
@@ -31,7 +37,7 @@
                 <field name="date_planned_start" string="计划开始日期" optional="show"/>
             </xpath>
             <xpath expr="//field[@name='date_planned_finished']" position="replace">
-                <field name="date_planned_finished" string="计划结束日期" optional="show"/>
+                <field name="date_planned_finished" string="计划结束日期" optional="hide"/>
             </xpath>
             <xpath expr="//button[@name='button_start']" position="attributes">
                 <attribute name="attrs">{'invisible': ['|', '|', '|','|','|', ('production_state','in', ('draft',
@@ -208,17 +214,17 @@
                     <field name="processing_panel" readonly="1"
                            attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
                     <field name="equipment_id"
-                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
+                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
                     <field name="production_line_id"
                            attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
                     <field name="production_line_state"
-                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
-                    <field name="functional_fixture_id"
-                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                    <field name="functional_fixture_code" force_save="1"
-                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                    <field name="functional_fixture_type_id"
-                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
+                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
+<!--                     <field name="functional_fixture_id" -->
+<!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
+<!--                     <field name="functional_fixture_code" force_save="1" -->
+<!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
+<!--                     <field name="functional_fixture_type_id" -->
+<!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
                     <field name="rfid_code" force_save="1" readonly="1" cache="True"
                            attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
                     <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
@@ -573,9 +579,9 @@
                 </div>
             </xpath>
             <xpath expr="//form//sheet//group//group//div[3]" position="after">
-                <field name="is_ok"/>
-                <field name="processing_user_id"/>
-                <field name="inspection_user_id"/>
+                <field name="is_ok" attrs='{"invisible": [("routing_type","=","装夹预调")]}'/>
+                <field name="processing_user_id" attrs='{"invisible": [("routing_type","=","装夹预调")]}'/>
+                <field name="inspection_user_id" attrs='{"invisible": [("routing_type","=","装夹预调")]}'/>
                 <field name="save_name" widget="CopyClipboardChar"
                        attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
                 <label for="material_length" string="物料尺寸"/>
@@ -594,6 +600,17 @@
         </field>
     </record>
 
+    <record id="workcenter_form_workorder_search" model="ir.ui.view">
+        <field name="name">custom.workorder.search</field>
+        <field name="model">mrp.workorder</field>
+        <field name="inherit_id" ref="mrp.view_mrp_production_work_order_search"/>
+        <field name="arch" type="xml">
+            <field name="product_id" position="after">
+                <field name="part_number" string="成品零件图号"/>
+            </field>
+        </field>
+    </record>
+
     <record id="mrp_workorder_action_schedule" model="ir.actions.act_window">
         <field name="name">工单</field>
         <field name="type">ir.actions.act_window</field>

From a82a54c4641d280bc11afbe34b336c5929408d74 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 24 Jun 2024 15:40:51 +0800
Subject: [PATCH 17/67] =?UTF-8?q?1=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E6=B8=85=E5=8D=95=E5=81=9A=E7=BC=96=E8=BE=91=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=EF=BC=9B2=E3=80=81=E5=88=80=E5=85=B7=E6=8B=86?=
 =?UTF-8?q?=E8=A7=A3=E2=80=94=E2=80=94=E6=8A=A5=E5=BA=9F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=9B3=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=B7=BB=E5=8A=A0=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_base_new.py                  |  2 +-
 sf_base/views/tool_views.xml                     |  4 ++--
 sf_tool_management/models/base.py                | 14 ++++++++++++--
 sf_tool_management/models/functional_tool.py     | 16 ++++++++++++++++
 .../views/functional_tool_views.xml              |  3 ++-
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index 7977ed80..98eea36c 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -331,7 +331,7 @@ class ToolInventory(models.Model):
     work_material = fields.Selection([('钢', '钢'), ('铝', '铝')], string='加工材料')
     life_span = fields.Float('寿命(min)')
 
-    tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组')
+    tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组', required=True)
 
     active = fields.Boolean('已归档', default=True)
 
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index 1e82b8c2..05196a19 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -555,9 +555,9 @@
         <field name="model">sf.tool.inventory</field>
         <field name="arch" type="xml">
             <tree string="功能刀具清单" create="1" edit="1" delete="0" editable="bottom">
-                <field name="name"/>
+                <field name="name"  attrs="{'readonly': [('id', '!=', False)]}"/>
                 <field name="functional_cutting_tool_model_id"/>
-                <field name="tool_groups_id"/>
+                <field name="tool_groups_id" required="1"  attrs="{'readonly': [('id', '!=', True)]}"/>
                 <field name="work_material"/>
                 <field name="life_span"/>
                 <field name="prefix" optional="hide"/>
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 8daf1488..61156536 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -581,6 +581,15 @@ class FunctionalToolAssembly(models.Model):
 
     active = fields.Boolean(string='已归档', default=True)
 
+    def action_open_reference1(self):
+        self.ensure_one()
+        return {
+            'res_model': self._name,
+            'type': 'ir.actions.act_window',
+            'views': [[False, "form"]],
+            'res_id': self.id,
+        }
+
     def put_start_preset(self):
         self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False})
         self.write({
@@ -750,7 +759,8 @@ class FunctionalToolDismantle(models.Model):
         return 'GNDJ-CJD-%s-%s' % (datetime, num)
 
     functional_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', required=True,
-                                         domain=[('functional_tool_status', '!=', '已拆除')])
+                                         domain=[('functional_tool_status', '!=', '已拆除'),
+                                                 ('current_location', '=', '刀具房')])
     tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
                                    compute='_compute_functional_tool_num')
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', compute='_compute_functional_tool_num', store=True)
@@ -1028,7 +1038,7 @@ class ProductProduct(models.Model):
             'product_id': self.id,
             'lot_id': lot_id.id,
             'move_id': stock_move_id.id,
-            'destination_location_id': shelf_location_id.id,
+            'destination_location_id': shelf_location_id.id if shelf_location_id else False,
             'install_tool_time': fields.Datetime.now(),
             'qty_done': 1.0,
             'state': 'done',
diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py
index 45f52f4f..18f0a466 100644
--- a/sf_tool_management/models/functional_tool.py
+++ b/sf_tool_management/models/functional_tool.py
@@ -387,6 +387,22 @@ class StockMoveLine(models.Model):
         names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
         return categories.browse(names)
 
+    def action_open_reference1(self):
+        self.ensure_one()
+        if self.functional_tool_name_id:
+            action = self.functional_tool_name_id.action_open_reference1()
+            return action
+        elif self.move_id:
+            action = self.move_id.action_open_reference()
+            if action['res_model'] != 'stock.move':
+                return action
+        return {
+            'res_model': self._name,
+            'type': 'ir.actions.act_window',
+            'views': [[False, "form"]],
+            'res_id': self.id,
+        }
+
 
 class RealTimeDistributionOfFunctionalTools(models.Model):
     _name = 'sf.real.time.distribution.of.functional.tools'
diff --git a/sf_tool_management/views/functional_tool_views.xml b/sf_tool_management/views/functional_tool_views.xml
index 6d812368..6fde82a0 100644
--- a/sf_tool_management/views/functional_tool_views.xml
+++ b/sf_tool_management/views/functional_tool_views.xml
@@ -477,7 +477,8 @@
             <field name="name">功能刀具出入库记录</field>
             <field name="model">stock.move.line</field>
             <field name="arch" type="xml">
-                <tree string="功能刀具出入库记录" create="0" edit="0" delete="0">
+                <tree string="功能刀具出入库记录" create="0" edit="0" delete="0" default_order="id desc"
+                      action="action_open_reference1" type="object">
                     <field name="reference" string="单据号"/>
                     <field name="lot_id" invisible="1"/>
                     <field name="rfid"/>

From 0af6d7f4cdb95217d326c485397ad28c09b08afa Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 24 Jun 2024 16:48:58 +0800
Subject: [PATCH 18/67] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E7=A8=8B=E5=BA=8F:=E8=A3=85=E5=A4=B9?=
 =?UTF-8?q?=E9=A2=84=E8=B0=83=EF=BC=8Ccnc=E5=8A=A0=E5=B7=A5=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/views/compensation.xml     | 68 ++++++++++---------
 sf_manufacturing/models/mrp_workorder.py      | 11 ++-
 .../views/mrp_production_addional_change.xml  | 26 +++----
 sf_manufacturing/views/mrp_workorder_view.xml |  5 +-
 sf_mrs_connect/controllers/controllers.py     |  6 +-
 5 files changed, 67 insertions(+), 49 deletions(-)

diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index 016f3821..d3b14535 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -5,39 +5,45 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
         <field name="arch" type="xml">
-<!--            <xpath expr="//header" position="inside">-->
-<!--                <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",-->
-<!--                                    ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>-->
-<!--            </xpath>-->
-                <xpath expr="//page//field[@name='cnc_ids']" position="before">
+            <!--            <xpath expr="//header" position="inside">-->
+            <!--                <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",-->
+            <!--                                    ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>-->
+            <!--            </xpath>-->
+            <xpath expr="//page//field[@name='cnc_ids']" position="before">
+                <group>
                     <group>
-                        <group>
-                            <field name="compensation_value_x"/>
-                            <field name="compensation_value_y"/>
-                        </group>
-                        <div>
-                            <div>
-                                <field name="button_compensation_state" attrs='{"invisible": ["|",
-                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
-<!--                                <button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿"-->
-<!--                                    class="btn-primary" attrs='{"invisible": ["|",-->
-<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-<!--                                <span>&#32;</span>-->
-<!--                                <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"-->
-<!--                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
-<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-<!--                                <span>&#32;</span>-->
-<!--                                <button string="合并下发" id="action_up_select" name="%(sf_machine_connect.action_up_select)d"-->
-<!--                                type="action" class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
-<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-<!--                                <span>&#32;</span>-->
-<!--                                <button string="一键合并下发" name="up_merge_all" type="object" style="text-align: right;" confirm="是否确认一键合并下发"-->
-<!--                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
-<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-                            </div>
-                        </div>
+                        <field name="compensation_value_x"/>
+                        <field name="compensation_value_y"/>
                     </group>
-                </xpath>
+                    <div>
+                        <div>
+                            <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程序？"
+                                    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)]}'/>-->
+                            <!--                                <span>&#32;</span>-->
+                            <!--                                <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"-->
+                            <!--                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
+                            <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
+                            <!--                                <span>&#32;</span>-->
+                            <!--                                <button string="合并下发" id="action_up_select" name="%(sf_machine_connect.action_up_select)d"-->
+                            <!--                                type="action" class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
+                            <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
+                            <!--                                <span>&#32;</span>-->
+                            <!--                                <button string="一键合并下发" name="up_merge_all" type="object" style="text-align: right;" confirm="是否确认一键合并下发"-->
+                            <!--                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
+                            <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
+                        </div>
+                    </div>
+                </group>
+            </xpath>
 
         </field>
     </record>
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index b5ed8334..8cc7b1f9 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1090,8 +1090,15 @@ class ResMrpWorkOrder(models.Model):
             r = r.json()
             result = json.loads(r['result'])
             if result['status'] == 1:
-                self.write({'is_send_program_again': True})
-                self.production_id.write({'work_state': '编程中', 'programming_state': '编程中'})
+                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:
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 55dbbe33..e1d0d28c 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -62,16 +62,17 @@
             <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='state']" position="attributes">
-<!--                     <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done -->
-<!--                     </attribute>                -->
-                    <attribute name="statusbar_visible">progress,pending_cam,pending_processing,pending_era_cam,completed,done
+                    <!--                     <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done -->
+                    <!--                     </attribute>                -->
+                    <attribute name="statusbar_visible">
+                        progress,pending_cam,pending_processing,pending_era_cam,completed,done
                     </attribute>
                 </xpath>
 
                 <xpath expr="//sheet//group//group[2]//label" position="before">
-<!--                     <field name="process_state"/> -->
+                    <!--                     <field name="process_state"/> -->
                     <field name="state"/>
-<!--                     <field name="process_state"/> -->
+                    <!--                     <field name="process_state"/> -->
 
                 </xpath>
                 <xpath expr="//sheet//group//group//div[3]" position="after">
@@ -281,7 +282,7 @@
                     <field name="routing_type" invisible="True"/>
                     <button name="button_start" type="object" string="开始" class="btn-success"
                             attrs="{'invisible': ['|', '|', '|','|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False), ('routing_type', '=', 'CNC加工')]}"
-                            groups="sf_base.group_sf_mrp_user"/>
+                            groups="sf_base.group_sf_mrp_user" confirm="是否确认开始?"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='button_pending']" position="replace">
                     <button name="button_pending" type="object" string="Pause" class="btn-warning"
@@ -291,7 +292,8 @@
                 <xpath expr="//tree//button[@name='button_finish']" position="replace">
                     <button name="button_finish" type="object" string="Done" class="btn-success"
                             attrs="{'invisible': ['|', '|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False), ('routing_type', '=', 'CNC加工')]}"
-                            groups="sf_base.group_sf_mrp_user"/>
+                            groups="sf_base.group_sf_mrp_user"
+                            confirm="是否确认完成?"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='%(mrp.act_mrp_block_workcenter_wo)d']" position="replace">
                     <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="Block"
@@ -309,10 +311,10 @@
                     <button name="action_open_wizard" type="object" icon="fa-external-link" class="oe_edit_only"
                             title="Open Work Order"
                             context="{'default_workcenter_id': workcenter_id}" groups="sf_base.group_sf_mrp_user"/>
-<!--                     ======= -->
-<!--                     <button name="button_start" type="object" string="开始" class="btn-success" -->
-<!--                             attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False)]}" -->
-<!--                             groups="sf_base.group_sf_mrp_user"/> -->
+                    <!--                     ======= -->
+                    <!--                     <button name="button_start" type="object" string="开始" class="btn-success" -->
+                    <!--                             attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False)]}" -->
+                    <!--                             groups="sf_base.group_sf_mrp_user"/> -->
                 </xpath>
                 <xpath expr="//tree//button[@name='button_pending']" position="replace">
                     <button name="button_pending" type="object" string="暂停" class="btn-warning"
@@ -322,7 +324,7 @@
                 <xpath expr="//tree//button[@name='button_finish']" position="replace">
                     <button name="button_finish" type="object" string="完成" class="btn-success"
                             attrs="{'invisible': ['|', '|','|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False), ('routing_type', '=', 'CNC加工')]}"
-                            groups="sf_base.group_sf_mrp_user"/>
+                            groups="sf_base.group_sf_mrp_user" confirm="是否确认完成?"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='%(mrp.act_mrp_block_workcenter_wo)d']" position="replace">
                     <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="阻塞"
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 60f140ac..32df1c55 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -156,7 +156,8 @@
                         attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('is_delivery','=',True),('state','!=','done')]}"/>
                 <button name="button_send_program_again" type="object" string="重新下发NC程序" class="btn-primary"
                         confirm="是否确认重新下发NC程序？"
-                        attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','not in',['ready','progress']),('processing_drawing','=',False),('is_send_program_again','=',True)]}"/>
+                        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","!=","切割")]}'>
@@ -521,7 +522,7 @@
                             <field name="program_path"/>
                             <field name="program_create_date"/>
                             <field name="remark"/>
-<!--                            <field name="button_state" invisible="1"/>-->
+                            <!--                            <field name="button_state" invisible="1"/>-->
                         </tree>
                     </field>
                     <group>
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 2ac534a8..5102efdb 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -72,7 +72,8 @@ 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(
-                                    {'cnc_ids': cnc_workorder.cnc_ids.sudo()._json_cnc_processing(panel, ret),
+                                    {'is_send_program_again': False,
+                                     '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(
@@ -80,7 +81,8 @@ class Sf_Mrs_Connect(http.Controller):
                                                                                                   'cancel'] and ap.processing_panel == panel)
                                 if pre_workorder:
                                     pre_workorder.write(
-                                        {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
+                                        {'is_send_program_again': False,
+                                         '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(

From 95e89d8979a72fc57286ad06f1a65f8811378e4d Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 24 Jun 2024 17:10:39 +0800
Subject: [PATCH 19/67] 1

---
 sf_base/views/tool_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index 05196a19..fff58007 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -557,7 +557,7 @@
             <tree string="功能刀具清单" create="1" edit="1" delete="0" editable="bottom">
                 <field name="name"  attrs="{'readonly': [('id', '!=', False)]}"/>
                 <field name="functional_cutting_tool_model_id"/>
-                <field name="tool_groups_id" required="1"  attrs="{'readonly': [('id', '!=', True)]}"/>
+                <field name="tool_groups_id" required="1"  attrs="{'readonly': [('id', '!=', False)]}"/>
                 <field name="work_material"/>
                 <field name="life_span"/>
                 <field name="prefix" optional="hide"/>

From 665ebaab9ea4c0620dcc1df1a21bf45a0480a383 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 24 Jun 2024 17:28:06 +0800
Subject: [PATCH 20/67] =?UTF-8?q?1=E3=80=81=E9=87=8D=E6=96=B0=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91NC=E7=A8=8B=E5=BA=8F=E6=8C=89=E9=94=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/views/compensation.xml     |  1 +
 sf_manufacturing/views/mrp_workorder_view.xml | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index d3b14535..07173c17 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -23,6 +23,7 @@
                             <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="是否确认下发补偿"-->
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index e782e449..a2736834 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -162,6 +162,7 @@
                         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)]}"/>
             </xpath>
@@ -220,12 +221,12 @@
                            attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
                     <field name="production_line_state"
                            attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
-<!--                     <field name="functional_fixture_id" -->
-<!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
-<!--                     <field name="functional_fixture_code" force_save="1" -->
-<!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
-<!--                     <field name="functional_fixture_type_id" -->
-<!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
+                    <!--                     <field name="functional_fixture_id" -->
+                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
+                    <!--                     <field name="functional_fixture_code" force_save="1" -->
+                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
+                    <!--                     <field name="functional_fixture_type_id" -->
+                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
                     <field name="rfid_code" force_save="1" readonly="1" cache="True"
                            attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
                     <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>

From 8b492fc093d7c0fa2043a3458f54542748f0f311 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 25 Jun 2024 09:02:54 +0800
Subject: [PATCH 21/67] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_plan/models/custom_plan.py |  6 +--
 sf_plan/views/view.xml        | 71 +++++++++++++++++++++++------------
 2 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index fcfb8020..db8f4bf9 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -19,7 +19,7 @@ class sf_production_plan(models.Model):
         ('done', '已排程'),
         ('processing', '加工中'),
         ('finished', '已完成')
-    ], string='工单状态', tracking=True)
+    ], string='状态', tracking=True)
 
     state_order = fields.Integer(compute='_compute_state_order', store=True)
 
@@ -36,7 +36,7 @@ class sf_production_plan(models.Model):
 
     _order = 'state_order asc, write_date desc'
 
-    name = fields.Char(string='工单编号')
+    name = fields.Char(string='制造订单')
     active = fields.Boolean(string='已归档', default=True)
     # selected = fields.Boolean(default=False)
     # order_number = fields.Char(string='订单号')
@@ -52,7 +52,7 @@ class sf_production_plan(models.Model):
     schedule_setting = fields.Selection([
         ('reverse', '倒排'), ('positive', '顺排')], string='排程设置', default='reverse')
     product_id = fields.Many2one('product.product', '关联产品')
-    origin = fields.Char(string='订单号')
+    origin = fields.Char(string='销售订单')
     # # 加工时长
     # process_time = fields.Float(string='加工时长', digits=(16, 2))
     # 实际加工时长、实际开始时间、实际结束时间
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 3b53efc2..02e595f7 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -17,18 +17,18 @@
                            decoration-danger="state == 'finished'"/>
                     <field name="name"/>
                     <field name="origin"/>
-                    <field name="order_deadline"/>
+                    <field name="order_deadline" widget="date"/>
                     <field name="product_qty"/>
                     <field name="production_line_id"/>
                     <field name="date_planned_start"/>
                     <field name="date_planned_finished"/>
-                    <field name="actual_start_time"/>
-                    <field name="actual_end_time"/>
-                    <field name="actual_process_time"/>
-                    <field name="schedule_setting"/>
-                    <button name="do_production_schedule" class="btn schedule_done" string="生产排程" type="object"
-                            attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('actual_start_time', '!=', False)]}"
-                            groups="sf_base.group_plan_dispatch"/>
+                    <field name="actual_start_time" optional='hide'/>
+                    <field name="actual_end_time" optional='hide'/>
+                    <field name="actual_process_time" optional='hide'/>
+                    <field name="schedule_setting" optional='hide'/>
+<!--                     <button name="do_production_schedule" class="btn schedule_done" string="生产排程" type="object" -->
+<!--                             attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('actual_start_time', '!=', False)]}" -->
+<!--                             groups="sf_base.group_plan_dispatch"/> -->
                     <button name="cancel_production_schedule" class="btn schedule_cancel" string="取消排程" type="object"
                             attrs="{'invisible': ['|', ('state', '!=', 'done'), ('actual_start_time', '!=', False)]}"
                             groups="sf_base.group_plan_dispatch"/>
@@ -68,7 +68,7 @@
                                 <field name="product_id"/>
                                 <field name="origin"/>
                                 <field name="product_qty"/>
-                                <field name="order_deadline"/>
+                                <field name="order_deadline" widget="date"/>
 <!--                                 <field name="process_time"/> -->
                                 <field name="schedule_setting"/>
                                 <field name="production_line_id" domain="[('name', 'ilike', 'CNC')]"/>
@@ -152,16 +152,27 @@
             <field name="model">sf.production.plan</field>
             <field name="arch" type="xml">
                 <search string="订单计划">
+
                     <!-- Your other filters go here -->
-                    <filter name="archived" string="已归档" domain="[('active','=',False)]"/>
-                    <filter name="not archived" string="未归档" domain="[('active','=',True)]"/>
+<!--                     <filter name="archived" string="已归档" domain="[('active','=',False)]"/> -->
+<!--                     <filter name="not archived" string="未归档" domain="[('active','=',True)]"/> -->
                     <field name="name"/>
                     <field name="product_qty"/>
-                    <field name="date_planned_start"/>
-                    <field name="date_planned_finished"/>
                     <field name="state"/>
-                    <searchpanel class="account_root">
-                        <field name="state" icon="fa-filter"/>
+                    <filter string="待排程" name="draft" domain="[('state','=','draft')]"/>
+                    <filter string="已排程" name="done" domain="[('state','=','done')]"/>
+                    <filter string="加工中" name="processing" domain="[('state','=','processing')]"/>
+                    <filter string="已完成" name="finished" domain="[('state','=','finished')]"/>
+                    <group expand="0" string="Group By">
+                        <filter name="group_by_state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
+                    </group>
+                    <group expand="0" string="Group By">
+                        <filter name="group_by_production_line_id" string="生产线" domain="[]" context="{'group_by': 'production_line_id'}"/>
+                    </group>
+                    <searchpanel>
+<!--                         <field name="state" icon="fa-filter"/> -->
+                        <field name="production_line_id" select="multi" string="生产线" icon="fa-building" enable_counters="1"/>
+                        <field name="state" select="multi" string="状态" icon="fa-building" enable_counters="1"/>
                     </searchpanel>
                 </search>
             </field>
@@ -188,30 +199,41 @@
                     <field name="date_planned_start"/>
                     <field name="date_planned_finished"/>
                     <field name="state"/>
+                    <field name="origin"/>
+                    <field name="order_deadline"/>
+                    <field name="product_id"/>
                     <templates>
                         <div t-name="gantt-popover" class="container-fluid">
                             <div class="row g-0">
                                 <div class="col">
                                     <ul class="ps-1 mb-0 list-unstyled">
                                         <li>
-                                            <strong>开始时间:</strong>
-                                            <t t-out="userTimezoneStartDate.format('L LTS')"/>
+                                            <strong>销售订单号:</strong>
+                                            <t t-out="origin"/>
                                         </li>
                                         <li>
-                                            <strong>结束时间:</strong>
-                                            <t t-out="userTimezoneStopDate.format('L LTS')"/>
-                                        </li>
-                                        <li>
-                                            <strong>名称:</strong>
+                                            <strong>制造订单号:</strong>
                                             <t t-out="name"/>
                                         </li>
+                                        <li>
+                                            <strong>订单交期:</strong>
+                                            <t t-out="order_deadline"/>
+                                        </li>
+                                        <li>
+                                            <strong>产品名称:</strong>
+                                            <t t-out="product_id"/>
+                                        </li>
                                         <li>
                                             <strong>数量:</strong>
                                             <t t-out="product_qty"/>
                                         </li>
                                         <li>
-                                            <strong>状态:</strong>
-                                            <t t-out="state"/>
+                                            <strong>计划开始时间:</strong>
+                                            <t t-out="userTimezoneStartDate.format('L LTS')"/>
+                                        </li>
+                                        <li>
+                                            <strong>计划结束时间:</strong>
+                                            <t t-out="userTimezoneStopDate.format('L LTS')"/>
                                         </li>
                                     </ul>
                                 </div>
@@ -246,6 +268,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.production.plan</field>
             <field name="view_mode">tree,gantt,form</field>
+            <field name="context">{'search_default_group_by_state': 1, 'search_default_draft': 1, 'display_complete': True}</field>
         </record>
 
         <menuitem

From eb2851391baf302db36978df4944493b2ae214ba Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 25 Jun 2024 12:06:28 +0800
Subject: [PATCH 22/67] =?UTF-8?q?=E5=A4=84=E7=90=86"=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=BF=A1=E6=81=AF=E4=B8=8E?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8D=E4=B8=80=E8=87=B4"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_warehouse/models/model.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index 34fa57fe..ea39b757 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -622,6 +622,11 @@ class SfStockMoveLine(models.Model):
         if not qr_code_data:
             raise UserError("没有找到二维码数据。")
         lot_name = self.lot_name
+
+        # 增加"当为坯料时，只打印序列号的前面部分"
+        if self.lot_name:  # 确保 lot_name 存在
+            if self.product_id.categ_id.name == '坯料':
+                lot_name = lot_name.split('[', 1)[0]
         # host = "192.168.50.110"  # 可以根据实际情况修改
         # port = 9100  # 可以根据实际情况修改
 
@@ -1184,6 +1189,12 @@ class CustomStockMove(models.Model):
             # todo 待控制
             if not lot_name:
                 raise ValidationError("请先分配序列号")
+            
+            # 增加"当为坯料时，只打印序列号的前面部分"
+            if record.lot_name:  # 确保 lot_name 存在
+                if record.product_id.categ_id.name == '坯料':
+                    lot_name = lot_name.split('[', 1)[0]
+
             # host = "192.168.50.110"  # 可以根据实际情况修改
             # port = 9100  # 可以根据实际情况修改
 

From 35ac51bc10f17d26f375259172b8cd858a552250 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 25 Jun 2024 14:22:51 +0800
Subject: [PATCH 23/67] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_plan/views/view.xml       | 3 ++-
 sf_warehouse/models/model.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 02e595f7..065c97c4 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -268,7 +268,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.production.plan</field>
             <field name="view_mode">tree,gantt,form</field>
-            <field name="context">{'search_default_group_by_state': 1, 'search_default_draft': 1, 'display_complete': True}</field>
+<!--             <field name="context">{'search_default_group_by_state': 1, 'search_default_draft': 1, 'display_complete': True}</field> -->
+            <field name="context">{'search_default_draft': 1, 'display_complete': True}</field>
         </record>
 
         <menuitem
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index ea39b757..c429a5eb 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -1189,7 +1189,7 @@ class CustomStockMove(models.Model):
             # todo 待控制
             if not lot_name:
                 raise ValidationError("请先分配序列号")
-            
+
             # 增加"当为坯料时，只打印序列号的前面部分"
             if record.lot_name:  # 确保 lot_name 存在
                 if record.product_id.categ_id.name == '坯料':

From f44836705bedab7627e04a919cd1a6eb696a5474 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 25 Jun 2024 16:50:09 +0800
Subject: [PATCH 24/67] =?UTF-8?q?=E6=94=BE=E5=87=BA=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index 07173c17..7668d818 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -5,10 +5,10 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
         <field name="arch" type="xml">
-            <!--            <xpath expr="//header" position="inside">-->
-            <!--                <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",-->
-            <!--                                    ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>-->
-            <!--            </xpath>-->
+           <xpath expr="//header" position="inside">-->
+               <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",
+                                   ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>
+           </xpath>
             <xpath expr="//page//field[@name='cnc_ids']" position="before">
                 <group>
                     <group>

From 88ef9c106ddf9a28dbefb434fdf17a9e4d348f4a Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 25 Jun 2024 17:54:08 +0800
Subject: [PATCH 25/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8B=E5=8F=91ftp=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/models/http.py                |  1 +
 sf_manufacturing/controllers/controllers.py |  1 +
 sf_manufacturing/models/mrp_workorder.py    |  4 +-
 sf_manufacturing/models/product_template.py |  4 +-
 sf_mrs_connect/controllers/controllers.py   | 13 +++---
 sf_mrs_connect/models/ftp_operate.py        | 45 ++++++++++++++++++++-
 sf_sale/models/quick_easy_order.py          |  4 +-
 sf_sale/models/quick_easy_order_old.py      |  4 +-
 8 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/sf_bf_connect/models/http.py b/sf_bf_connect/models/http.py
index aac8ba38..8b10aa21 100644
--- a/sf_bf_connect/models/http.py
+++ b/sf_bf_connect/models/http.py
@@ -21,6 +21,7 @@ class Http(models.AbstractModel):
     def _auth_method_sf_token(cls):
         # 从headers.environ中获取对方传过来的token,timestamp,加密的校验字符串
         datas = request.httprequest.headers.environ
+        _logger.info('datas:%s' % datas)
         if 'HTTP_TOKEN' in datas:
             _logger.info('token:%s' % datas['HTTP_TOKEN'])
             # 查询密钥
diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 61bc83ea..8284f392 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -203,6 +203,7 @@ class Manufacturing_Connect(http.Controller):
             res = {'Succeed': True, 'Datas': ['工单已结束']}
             datas = request.httprequest.data
             ret = json.loads(datas)
+            logging.info('button_Work_End:%s' % ret)
             request.env['center_control.interface.log'].sudo().create(
                 {'content': ret, 'name': 'AutoDeviceApi/FeedBackEnd'})
             production_id = ret['BillId']
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 8cc7b1f9..b4c7170f 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1215,11 +1215,13 @@ class CNCprocessing(models.Model):
 
     # 将FTP的多面的程序单文件下载到临时目录
     def download_file_tmp(self, production_no, processing_panel):
-        remotepath = os.path.join('/NC', production_no, 'return', processing_panel)
+        remotepath = os.path.join('/home/ftp/ftp_root/NC', production_no, 'return', processing_panel)
         serverdir = os.path.join('/tmp', production_no, 'return', processing_panel)
         ftp_resconfig = self.env['res.config.settings'].get_values()
         ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'],
                             ftp_resconfig['ftp_password'])
+        if not ftp.file_exists_1(remotepath):
+            logging.info('目录不存在:%s' % remotepath)
         download_state = ftp.download_program_file(remotepath, serverdir)
         logging.info('download_state:%s' % download_state)
         return download_state
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index cea53c64..71522528 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_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 5102efdb..5b4250d8 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -31,17 +31,18 @@ class Sf_Mrs_Connect(http.Controller):
                 # 拉取所有加工面的程序文件
                 for r in ret['processing_panel'].split(','):
                     program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
-                    files_r = os.listdir(program_path_tmp_r)
-                    if files_r:
-                        for file_name in files_r:
-                            file_path = os.path.join(program_path_tmp_r, file_name)
-                            os.remove(file_path)
+                    if os.path.exists(program_path_tmp_r):
+                        files_r = os.listdir(program_path_tmp_r)
+                        if files_r:
+                            for file_name in files_r:
+                                file_path = os.path.join(program_path_tmp_r, file_name)
+                                os.remove(file_path)
                 download_state = request.env['sf.cnc.processing'].with_user(
                     request.env.ref("base.user_admin")).download_file_tmp(
                     ret['folder_name'], r)
                 if download_state == 0:
                     res['status'] = -2
-                    res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
+                    res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no'])
                     return json.JSONEncoder().encode(res)
                 for production in productions:
                     if not production.workorder_ids:
diff --git a/sf_mrs_connect/models/ftp_operate.py b/sf_mrs_connect/models/ftp_operate.py
index 4cd5e3ba..c92117e7 100644
--- a/sf_mrs_connect/models/ftp_operate.py
+++ b/sf_mrs_connect/models/ftp_operate.py
@@ -21,6 +21,32 @@ class FtpController():
         except Exception:
             logging.info("ftp连接失败")
 
+    def file_exists_1(self, path):
+        # 检查文件是否存在于FTP服务器上
+        try:
+            logging.info("path:%s" % path)
+            logging.info("dirname:%s" % os.path.dirname(path))
+            directories = os.path.normpath(path).split(os.path.sep)
+            # 切换到上级目录
+            logging.info("当前目录: %s" % self.ftp.pwd())
+            current_dir = '/'
+            for directory in directories:
+                if directory:
+                    # 检查目录是否存在
+                    if directory in ['ZM', 'FM', 'YC', 'HC', 'QC', 'ZC']:
+                        self.ftp.cwd(directory)
+                    if directory in ['NC']:
+                        self.ftp.cwd(directory)
+                    if directory not in ['home', 'ftp', 'ftp_root', 'NC']:
+                        # 切换到新的目录
+                        current_dir = os.path.join(current_dir, directory)
+                        logging.info("current_dir:%s" % current_dir)
+                        self.ftp.cwd(directory)
+            return os.path.basename(path)
+        except Exception as e:
+            logging.error(f"Error checking file: {e}")
+            return False
+
     def file_exists(self, path):
         # 检查文件是否存在于FTP服务器上
         try:
@@ -32,8 +58,23 @@ class FtpController():
             logging.error(f"Error checking file: {e}")
             return False
 
-
-
+    # 下载目录下的pdf文件(程序单)
+    def download_program_file(self, target_dir, serverdir):
+        if not os.path.exists(serverdir):
+            os.makedirs(serverdir)
+        try:
+            logging.info('FTP目录:%s' % target_dir)
+            logging.info("进入FTP目录 ")
+            # self.ftp.cwd(target_dir)  # 切换工作路径
+            # logging.info('FTP目录:%s' % target_dir)
+            remotenames = self.ftp.nlst()
+            logging.info('FTP目录文件:%s' % remotenames)
+            for file in remotenames:
+                server = os.path.join(serverdir, file)
+                if file.find(".pdf") != -1:
+                    self.download_file(server, file)
+        except:
+            return False
 
     # # 检测字符串的编码
     # def detect_encoding(self, s):
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index e3bf3002..11acc06f 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 3ae65db3..92f6cda2 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

From dcbb60b08815aa6d449bce263cebd138a6071c6e Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 25 Jun 2024 18:11:45 +0800
Subject: [PATCH 26/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8B=E5=8F=91ftp=E8=B7=AF=E5=BE=84:=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_mrs_connect/models/ftp_operate.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sf_mrs_connect/models/ftp_operate.py b/sf_mrs_connect/models/ftp_operate.py
index c92117e7..8ac9a4b7 100644
--- a/sf_mrs_connect/models/ftp_operate.py
+++ b/sf_mrs_connect/models/ftp_operate.py
@@ -28,20 +28,15 @@ class FtpController():
             logging.info("dirname:%s" % os.path.dirname(path))
             directories = os.path.normpath(path).split(os.path.sep)
             # 切换到上级目录
-            logging.info("当前目录: %s" % self.ftp.pwd())
             current_dir = '/'
             for directory in directories:
                 if directory:
                     # 检查目录是否存在
-                    if directory in ['ZM', 'FM', 'YC', 'HC', 'QC', 'ZC']:
-                        self.ftp.cwd(directory)
                     if directory in ['NC']:
                         self.ftp.cwd(directory)
                     if directory not in ['home', 'ftp', 'ftp_root', 'NC']:
                         # 切换到新的目录
-                        current_dir = os.path.join(current_dir, directory)
-                        logging.info("current_dir:%s" % current_dir)
-                        self.ftp.cwd(directory)
+                        self.ftp.cwd(current_dir)
             return os.path.basename(path)
         except Exception as e:
             logging.error(f"Error checking file: {e}")

From f4eb378bea7cbf1d5fb25982892ee8a1d111c738 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 26 Jun 2024 10:17:00 +0800
Subject: [PATCH 27/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=9A=E6=97=A0=E5=B7=A5=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=A5=E5=8D=95page=E9=9C=80=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/product_template.py               | 4 ++--
 sf_manufacturing/views/mrp_production_addional_change.xml | 7 ++++---
 sf_sale/models/quick_easy_order.py                        | 4 ++--
 sf_sale/models/quick_easy_order_old.py                    | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

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/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index e1d0d28c..58cdb2c4 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -68,7 +68,6 @@
                         progress,pending_cam,pending_processing,pending_era_cam,completed,done
                     </attribute>
                 </xpath>
-
                 <xpath expr="//sheet//group//group[2]//label" position="before">
                     <!--                     <field name="process_state"/> -->
                     <field name="state"/>
@@ -79,8 +78,8 @@
                     <field name="programming_no" readonly="1"/>
                     <field name="work_state" invisible="1"/>
                     <field name="schedule_state" invisible='1'/>
-                    <field name="manual_quotation" readonly="1"/>
                     <field name="programming_state" readonly="1"/>
+                    <field name="manual_quotation" readonly="1"/>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="before">
                     <field name="plan_start_processing_time" readonly="1"/>
@@ -255,7 +254,9 @@
                 </xpath>
 
                 <xpath expr="//sheet//notebook//page[@name='operations']" position="attributes">
-                    <attribute name="attrs">{'invisible': [('schedule_state', '=', '未排')]}</attribute>
+                    <attribute name="attrs">{'invisible': ['|',('schedule_state', '=', '未排'),('workorder_ids', '=',
+                        [])]}
+                    </attribute>
                 </xpath>
             </field>
         </record>
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

From 2ff935f68d44e98e09d0d802cc6f83d4beceea34 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 26 Jun 2024 11:10:54 +0800
Subject: [PATCH 28/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8B=E5=8F=91ftp=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_mrs_connect/controllers/controllers.py | 14 +++++++-------
 sf_mrs_connect/models/ftp_operate.py      |  7 +++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 5b4250d8..ee2ef3e5 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -37,13 +37,13 @@ class Sf_Mrs_Connect(http.Controller):
                             for file_name in files_r:
                                 file_path = os.path.join(program_path_tmp_r, file_name)
                                 os.remove(file_path)
-                download_state = request.env['sf.cnc.processing'].with_user(
-                    request.env.ref("base.user_admin")).download_file_tmp(
-                    ret['folder_name'], r)
-                if download_state == 0:
-                    res['status'] = -2
-                    res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no'])
-                    return json.JSONEncoder().encode(res)
+                    download_state = request.env['sf.cnc.processing'].with_user(
+                        request.env.ref("base.user_admin")).download_file_tmp(
+                        ret['folder_name'], r)
+                    if download_state == 0:
+                        res['status'] = -2
+                        res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no'])
+                        return json.JSONEncoder().encode(res)
                 for production in productions:
                     if not production.workorder_ids:
                         production.product_id.model_processing_panel = ret['processing_panel']
diff --git a/sf_mrs_connect/models/ftp_operate.py b/sf_mrs_connect/models/ftp_operate.py
index 8ac9a4b7..6d7d172c 100644
--- a/sf_mrs_connect/models/ftp_operate.py
+++ b/sf_mrs_connect/models/ftp_operate.py
@@ -32,11 +32,11 @@ class FtpController():
             for directory in directories:
                 if directory:
                     # 检查目录是否存在
-                    if directory in ['NC']:
+                    if (directory in ['NC']) or (directory not in ['home', 'ftp', 'ftp_root', 'NC']):
                         self.ftp.cwd(directory)
                     if directory not in ['home', 'ftp', 'ftp_root', 'NC']:
                         # 切换到新的目录
-                        self.ftp.cwd(current_dir)
+                        self.ftp.cwd(directory)
             return os.path.basename(path)
         except Exception as e:
             logging.error(f"Error checking file: {e}")
@@ -60,14 +60,13 @@ class FtpController():
         try:
             logging.info('FTP目录:%s' % target_dir)
             logging.info("进入FTP目录 ")
-            # self.ftp.cwd(target_dir)  # 切换工作路径
-            # logging.info('FTP目录:%s' % target_dir)
             remotenames = self.ftp.nlst()
             logging.info('FTP目录文件:%s' % remotenames)
             for file in remotenames:
                 server = os.path.join(serverdir, file)
                 if file.find(".pdf") != -1:
                     self.download_file(server, file)
+                    return True
         except:
             return False
 

From d07ab53aeb2f6ea54abb13dc8c2dba8227880236 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 26 Jun 2024 14:10:57 +0800
Subject: [PATCH 29/67] =?UTF-8?q?=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E5=8F=8A=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     | 54 ++++++++++++-------
 .../views/mrp_production_addional_change.xml  |  2 +-
 sf_plan_management/i18n/zh_CN.po              | 13 ++++-
 3 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 15a77160..70db2915 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -30,12 +30,12 @@ class MrpProduction(models.Model):
     #     ('completed', '已完工')
     # ])
     state = fields.Selection([
-        ('draft', 'Draft'),
-        ('confirmed', 'Confirmed'),
-        ('progress', '待排程'),
-        ('pending_cam', '待装夹'),
-        ('pending_processing', '待加工'),
-        ('pending_era_cam', '待解除装夹'),
+        ('draft', '待排程'),
+        ('confirmed', '待加工'),
+        ('progress', '加工中'),
+        # ('pending_cam', '待装夹'),
+        # ('pending_processing', '待加工'),
+        # ('pending_era_cam', '待解除装夹'),
         ('completed', '已完工'),
         ('to_close', 'To Close'),
         ('done', 'Done'),
@@ -113,18 +113,36 @@ class MrpProduction(models.Model):
                 production.state = 'progress'
 
             # 新添加的状态逻辑
-            if production.state == 'progress' and production.schedule_state == '已排' and production.process_state == '待装夹':
-                # production.state = 'pending_processing'
-                production.state = 'pending_cam'
-            if production.state == 'progress' and production.schedule_state == '已排' and production.process_state == '待加工':
-                # if production.state == 'pending_cam' and production.process_state == '待加工':
-                production.state = 'pending_processing'
-            elif production.state == 'progress' and production.process_state == '待解除装夹':
-                production.state = 'pending_era_cam'
-            elif production.state == 'progress' and production.process_state == '已完工':
-                production.state = 'completed'
-            elif production.state == 'progress' and production.work_order_state == '已完成':
-                production.state = 'completed'
+            if production.state == 'to_close' and production.schedule_state == '未排':
+                production.state = 'draft'
+            elif production.state == 'to_close' and production.schedule_state == '已排':
+                production.state = 'confirmed'
+            # if production.schedule_state == '已完成':
+            #     production.state = 'completed'
+            elif any(wo_state in ('progress', 'done') for wo_state in production.workorder_ids.mapped('state')):
+                production.state = 'progress'
+            elif production.product_uom_id and not float_is_zero(production.qty_producing,
+                                                                 precision_rounding=production.product_uom_id.rounding):
+                production.state = 'progress'
+            elif any(not float_is_zero(move.quantity_done,
+                                       precision_rounding=move.product_uom.rounding or move.product_id.uom_id.rounding)
+                     for move in production.move_raw_ids):
+                production.state = 'progress'
+
+
+
+            # if production.state == 'progress' and production.schedule_state == '已排' and production.process_state == '待装夹':
+            #     # production.state = 'pending_processing'
+            #     production.state = 'pending_cam'
+            # if production.state == 'progress' and production.schedule_state == '已排' and production.process_state == '待加工':
+            #     # if production.state == 'pending_cam' and production.process_state == '待加工':
+            #     production.state = 'pending_processing'
+            # elif production.state == 'progress' and production.process_state == '待解除装夹':
+            #     production.state = 'pending_era_cam'
+            # elif production.state == 'progress' and production.process_state == '已完工':
+            #     production.state = 'completed'
+            # elif production.state == 'progress' and production.work_order_state == '已完成':
+            #     production.state = 'completed'
 
     def action_check(self):
         """
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index e1d0d28c..817d5e39 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -65,7 +65,7 @@
                     <!--                     <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done -->
                     <!--                     </attribute>                -->
                     <attribute name="statusbar_visible">
-                        progress,pending_cam,pending_processing,pending_era_cam,completed,done
+                        draft,confirmed,progress,completed,done
                     </attribute>
                 </xpath>
 
diff --git a/sf_plan_management/i18n/zh_CN.po b/sf_plan_management/i18n/zh_CN.po
index ad119fc0..1c34bda6 100644
--- a/sf_plan_management/i18n/zh_CN.po
+++ b/sf_plan_management/i18n/zh_CN.po
@@ -114488,10 +114488,21 @@ msgid "径跳精度(mm)"
 msgstr ""
 
 #. module: sf_manufacturing
-#: model:ir.model.fields.selection,name:sf_manufacturing.selection__mrp_production__state__progress
+#: model:ir.model.fields.selection,name:sf_manufacturing.selection__mrp_production__state__draft
 msgid "待排程"
 msgstr "待排程"
 
+#. module: sf_manufacturing
+#: model:ir.model.fields.selection,name:sf_manufacturing.selection__mrp_production__process_state__待加工
+#: model:ir.model.fields.selection,name:sf_manufacturing.selection__mrp_production__state__confirmed
+msgid "待加工"
+msgstr "待加工"
+
+#. module: sf_manufacturing
+#: model:ir.model.fields.selection,name:sf_manufacturing.selection__mrp_production__state__progress
+msgid "待排程"
+msgstr "加工中"
+
 #. module: sf_base
 #: model:ir.model.fields,field_description:sf_base.field_sf_cutting_tool_model__jump_accuracy
 msgid "径跳精度(um)"

From 7fd3647afbc6bf186405f43bb53ddd3a65e86ae5 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 26 Jun 2024 16:34:04 +0800
Subject: [PATCH 30/67] =?UTF-8?q?sf=E7=89=A9=E6=B5=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/models/jd_eclp.py | 18 ++++++---
 sf_bf_connect/views/view.xml    | 70 ++++++++++++++++++---------------
 2 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py
index c2b8deb7..bdcfba47 100644
--- a/sf_bf_connect/models/jd_eclp.py
+++ b/sf_bf_connect/models/jd_eclp.py
@@ -5,7 +5,7 @@ import requests
 import cpca
 # from odoo.exceptions import UserError
 # from odoo.exceptions import ValidationError
-from odoo import api, fields, models
+from odoo import api, fields, models, _
 from odoo.exceptions import ValidationError
 
 _logger = logging.getLogger(__name__)
@@ -165,11 +165,17 @@ class JdEclp(models.Model):
         self.is_bill = True
         self.logistics_status = '1'
 
-        # # 京东物流下单后，销售订单状态改为待收货
-        # self.env['sale.order'].search([('name', '=', self.origin)]).write({'scheduled_status': 'to receive'})
-
-        # else:
-        #     raise UserError("选择京东物流才能下单呦")
+        notification = {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': _('成功'),
+                'type': 'success',
+                'message': '物流下单成功',
+                'sticky': False,
+            }
+        }
+        return notification
 
     def get_bill(self):
         """
diff --git a/sf_bf_connect/views/view.xml b/sf_bf_connect/views/view.xml
index 6db5cb1d..184d0e71 100644
--- a/sf_bf_connect/views/view.xml
+++ b/sf_bf_connect/views/view.xml
@@ -32,7 +32,7 @@
                 <field name="is_bill" invisible="True"/>
                 <field name="logistics_status" invisible="True"/>
                 <field name="logistics_way" invisible="True"/>
-                <button string="京东物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"
+                <button string="物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"
                 attrs="{'invisible': ['|', '|', '|', ('check_out', '!=', 'OUT'), ('state', '!=', 'assigned'), ('is_bill', '=', True), ('logistics_way', '=', '自提')]}"/>
                 <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"
                 attrs="{'invisible': ['|', '|', '|', '|', ('check_out', '!=', 'OUT'), ('state', '!=', 'assigned'), ('logistics_status', '=', '2'), ('is_bill', '=', False), ('logistics_way', '=', '自提')]}"/>
@@ -45,42 +45,50 @@
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form"/>
         <field name="arch" type="xml">
-
             <field name="location_id" position="after">
                 <field name="logistics_status" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
                 <field name="logistics_way" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
             </field>
+        </field>
+    </record>
 
-            <xpath expr="//group//field[@name='carrier_id']" position="after">
-<!--                 <field name="senderNickName" domain="[('self.name', 'like', '%OUT%')]"/> -->
-                <field name="senderNickName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="expressItemName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="deliveryType" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="receiverName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="receiverMobile" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="receiverProvinceName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="receiverCityName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="receiverCountyName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="receiverTownName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="receiverCompany" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="remark" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="grossWeight" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="grossVolume" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="pickupBeginTime" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="bill_show" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                <field name="logistics_status"/>
+    <record id="tracking_only_view" model="ir.ui.view">
+        <field name="name">tracking only</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//form//sheet//notebook//page[@name='operations']" position="after">
+                <page string="发货信息" name="tracking">
+                    <group>
+                        <group>
+                        <field name="senderNickName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        <field name="expressItemName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        <field name="grossWeight" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        <field name="grossVolume" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        <field name="deliveryType" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        <field name="receiverName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        <field name="receiverMobile" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        <field name="receiverProvinceName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        <field name="receiverCityName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        <field name="receiverCountyName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        <field name="receiverTownName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        <field name="receiverCompany" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        <field name="remark" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+
+                        <field name="pickupBeginTime" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                        </group>
+                        <group>
+                        <field name="logistics_status"/>
+                        <field name="carrier_id"/>
+                        <field name="carrier_tracking_ref"/>
+
+                        <field name="bill_show" attrs="{'invisible': [('check_out', '!=', 'OUT')]}" string='面单下载'/>
+                        <field name="bill_show" widget="pdf_viewer" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+
+                        </group>
+                    </group>
+                </page>
             </xpath>
-            <xpath expr="//group//field[@name='group_id']" position="after">
-                <field name="bill_show" widget="pdf_viewer" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-            </xpath>
-<!--             <xpath expr="//group[@name='other_infos']" position="after"> -->
-<!--                 <div> -->
-<!--                     <button string="京东物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"/> -->
-<!--                 </div> -->
-<!--                 <div> -->
-<!--                     <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"/> -->
-<!--                 </div> -->
-<!--             </xpath> -->
         </field>
     </record>
 </odoo>
\ No newline at end of file

From dbd5c488f864219eaa5219338fad5c833b1ce1e4 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 26 Jun 2024 16:36:51 +0800
Subject: [PATCH 31/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=94=9F=E6=88=90=E6=97=B6=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/stock.py              | 56 +++++++++----------
 sf_manufacturing/views/mrp_workorder_view.xml |  7 ++-
 sf_mrs_connect/controllers/controllers.py     |  2 +-
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index be81e110..c7ae6ecc 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -205,39 +205,17 @@ class StockRule(models.Model):
                 productions_values)
 
             # self.env['stock.move'].sudo().create(productions._get_moves_raw_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
-                                           p.move_raw_ids and not p.workorder_ids)).action_confirm()
+
             '''
             创建工单
             '''
             # productions._create_workorder()
             #
-            grouped_product_ids = {k: list(g) for k, g in groupby(productions, 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_item in productions:
-                if production_item.product_id.id in product_id_to_production_names:
-                    #     # 同一个产品多个制造订单对应一个编程单和模型库
-                    #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
-                    if not production_item.programming_no:
-                        production_programming = self.env['mrp.production'].search(
-                            [('product_id.id', '=', production_item.product_id.id),
-                             ('origin', '=', production_item.origin)],
-                            limit=1, order='id asc')
-                        if not production_programming.programming_no:
-                            production_item.fetchCNC(
-                                ', '.join(product_id_to_production_names[production_item.product_id.id]))
-                        else:
-                            production_item.write({'programming_no': production_programming.programming_no,
-                                                   'programming_state': '编程中'})
-
+            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
+                                           p.move_raw_ids and not p.workorder_ids)).action_confirm()
             for production in productions:
                 '''
                 创建制造订单时生成序列号
@@ -283,6 +261,28 @@ class StockRule(models.Model):
                         'product_id': production.product_id.id,
                         'state': 'draft',
                     })
+            grouped_product_ids = {k: list(g) for k, g in groupby(productions, 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_item in productions:
+                if production_item.product_id.id in product_id_to_production_names:
+                    #     # 同一个产品多个制造订单对应一个编程单和模型库
+                    #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
+                    if not production_item.programming_no:
+                        production_programming = self.env['mrp.production'].search(
+                            [('product_id.id', '=', production_item.product_id.id),
+                             ('origin', '=', production_item.origin)],
+                            limit=1, order='id asc')
+                        if not production_programming.programming_no:
+                            production_item.fetchCNC(
+                                ', '.join(product_id_to_production_names[production_item.product_id.id]))
+                        else:
+                            production_item.write({'programming_no': production_programming.programming_no,
+                                                   'programming_state': '编程中'})
         return True
 
 
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index a2736834..790c0551 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -483,7 +483,10 @@
                             <field name="production_line_id" readonly="1"/>
                             <field name="task_delivery_time" readonly="1"/>
                             <field name="task_completion_time" readonly="1"/>
-                            <field name="status" readonly="1"/>
+                            <field name="status" readonly="1" widget="badge"
+                                   decoration-success="status == '已配送'"
+                                   decoration-warning="status == '待下发'"
+                                   decoration-danger="status == '待配送'"/>
                         </tree>
                     </field>
                 </page>
@@ -729,7 +732,7 @@
             </search>
         </field>
     </record>
-
+、
     <record id="sf_workpiece_delivery_act" model="ir.actions.act_window">
         <field name="name">工件配送</field>
         <field name="res_model">sf.workpiece.delivery</field>
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index ee2ef3e5..b6d4c659 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -40,7 +40,7 @@ class Sf_Mrs_Connect(http.Controller):
                     download_state = request.env['sf.cnc.processing'].with_user(
                         request.env.ref("base.user_admin")).download_file_tmp(
                         ret['folder_name'], r)
-                    if download_state == 0:
+                    if download_state is False:
                         res['status'] = -2
                         res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no'])
                         return json.JSONEncoder().encode(res)

From bcb60425b230181e4c707aaca838f4e0c1f66d09 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 26 Jun 2024 17:07:09 +0800
Subject: [PATCH 32/67] =?UTF-8?q?1=E3=80=81=E5=AE=8C=E6=88=90=20=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E8=B0=83=E6=8B=A8=E5=8D=95=E4=BC=98=E5=8C=96=E9=A1=B9?=
 =?UTF-8?q?=20=E9=9C=80=E6=B1=82=EF=BC=9B2=E3=80=81=E8=A7=A3=E5=86=B3=20?=
 =?UTF-8?q?=20=E4=B8=8D=E5=90=8C=E5=BA=8F=E5=88=97=E5=8F=B7=E8=B0=83?=
 =?UTF-8?q?=E6=8B=A8=E5=8D=95=E9=80=89=E6=8B=A9=E5=90=8C=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E5=8F=AF=E4=BB=A5=E7=A1=AE=E8=AE=A4=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=20bug=EF=BC=9B3=E3=80=81=E6=94=B6=E8=B4=A7=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=97=B6=E6=89=AB=E6=8F=8F=E5=BD=95=E5=85=A5Rfid?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_warehouse/models/model.py                  | 30 +++++++++++++++----
 .../views/change_stock_move_views.xml         | 15 ++++++----
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index c429a5eb..ee212b2a 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -557,8 +557,10 @@ class SfStockMoveLine(models.Model):
     _name = 'stock.move.line'
     _inherit = ['stock.move.line', 'printing.utils']
 
+    stock_lot_name = fields.Char('序列号名称', related='lot_id.name')
     current_location_id = fields.Many2one(
-        'sf.shelf.location', string='当前货位', compute='_compute_current_location_id', store=True)
+        'sf.shelf.location', string='当前货位', compute='_compute_current_location_id', store=True, readonly=False,
+        domain="[('product_id', '=', product_id),'|',('product_sn_id.name', '=', stock_lot_name),('product_sn_ids.lot_id.name','=',stock_lot_name)]")
     # location_dest_id = fields.Many2one('stock.location', string='目标库位')
     location_dest_id_product_type = fields.Many2many(related='location_dest_id.product_type')
     location_dest_id_value = fields.Integer(compute='_compute_location_dest_id_value', store=True)
@@ -856,7 +858,9 @@ class SfStockMoveLine(models.Model):
     def compute_destination_location_id(self):
         for record in self:
             obj = self.env['sf.shelf.location'].search([('name', '=',
-                                                         self.destination_location_id.name)])
+                                                         record.destination_location_id.name)])
+            if obj and obj.product_id and obj.product_id != record.product_id:
+                raise ValidationError('目标货位【%s】已被【%s】产品占用！' % (obj.code, obj.product_id))
             if record.lot_id:
                 if record.product_id.tracking == 'serial':
                     shelf_location_obj = self.env['sf.shelf.location'].search(
@@ -869,7 +873,7 @@ class SfStockMoveLine(models.Model):
                         if obj:
                             obj.product_sn_id = record.lot_id.id
                 elif record.product_id.tracking == 'lot':
-                    self.put_shelf_location(record)
+                    record.put_shelf_location(record)
                     if not obj.product_id:
                         obj.product_id = record.product_id.id
             else:
@@ -980,15 +984,26 @@ class SfStockPicking(models.Model):
                     # 调用入库方法进行入库刀货位
                     line.compute_destination_location_id()
                 else:
-                    # 对除刀柄之外的刀具物料进行 目标货位必填校验
+                    # 对除刀柄之外的刀具物料入库到刀具房进行 目标货位必填校验
                     if self.location_dest_id.name == '刀具房' and line.product_id.cutting_tool_material_id.name not in (
                             '刀柄', False):
                         raise ValidationError('请选择【%s】产品的目标货位！' % line.product_id.name)
+                    if line.current_location_id:
+                        # 对货位的批次产品进行出货
+                        line.put_shelf_location(line)
+
                 if line.current_location_id:
+                    # 按序列号管理的产品
                     if line.current_location_id.product_sn_id:
                         line.current_location_id.product_sn_id = False
                         # line.current_location_id.location_status = '空闲'
                         line.current_location_id.product_num = 0
+                        line.current_location_id.product_id = False
+                else:
+                    # 对除刀柄之外的刀具物料从刀具房出库进行 当前货位必填校验
+                    if self.location_id.name == '刀具房' and line.product_id.cutting_tool_material_id.name not in (
+                            '刀柄', False):
+                        raise ValidationError('请选择【%s】产品的当前货位！' % line.product_id.name)
 
         # 对入库作业的刀柄和托盘进行Rfid绑定校验
         for move in self.move_ids:
@@ -1115,6 +1130,7 @@ class CustomStockMove(models.Model):
         采购入库扫码绑定Rfid码
         """
         for record in self:
+            logging.info('Rfid：%s' % barcode)
             if record:
                 lot = self.env['stock.lot'].sudo().search([('rfid', '=', barcode)])
                 if lot:
@@ -1126,7 +1142,9 @@ class CustomStockMove(models.Model):
                         '该Rfid【%s】已经被序列号为【%s】的【%s】物料所占用!' % (barcode, lot.name, material))
                 if '刀柄' in (record.product_id.cutting_tool_material_id.name or '') or '托盘' in (
                         record.product_id.fixture_material_id.name or ''):
+                    logging.info('开始录入Rfid:%s' % record.move_line_nosuggest_ids)
                     for move_line_nosuggest_id in record.move_line_nosuggest_ids:
+                        logging.info('录入的记录%s , Rfid:%s' % (move_line_nosuggest_id, move_line_nosuggest_id.rfid))
                         if move_line_nosuggest_id.rfid:
                             if move_line_nosuggest_id.rfid == barcode:
                                 if record.product_id.cutting_tool_material_id.name:
@@ -1135,7 +1153,9 @@ class CustomStockMove(models.Model):
                                     raise ValidationError('该托盘的Rfid已经录入，请勿重复录入！！！')
                         else:
                             line_id = int(re.sub(r"\D", "", str(move_line_nosuggest_id.id)))
-                            self.env['stock.move.line'].sudo().search([('id', '=', line_id)]).write({'rfid': barcode})
+                            res = self.env['stock.move.line'].sudo().search([('id', '=', line_id)]).write(
+                                {'rfid': barcode})
+                            logging.info('Rfid是否录入:%s' % res)
                             move_line_nosuggest_id.rfid = barcode
                             break
                 else:
diff --git a/sf_warehouse/views/change_stock_move_views.xml b/sf_warehouse/views/change_stock_move_views.xml
index a77b916c..29d09926 100644
--- a/sf_warehouse/views/change_stock_move_views.xml
+++ b/sf_warehouse/views/change_stock_move_views.xml
@@ -7,16 +7,18 @@
             <field name="inherit_id" ref="stock.view_stock_move_line_detailed_operation_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='location_id'][2]" position="after">
-                    <field name="current_location_id" force_save="1"/>
+                    <field name="stock_lot_name" invisible="1"/>
+                    <field name="current_location_id" force_save="1"
+                           options="{'no_create': True,'no_create_edit':True}"/>
                 </xpath>
                 <xpath expr="//field[@name='location_dest_id'][2]" position="after">
                     <field name="current_product_id" invisible="1"/>
                     <field name="there_is_no_sn" invisible="1"/>
-<!--                         <field name="destination_location_id" domain="[('location_id', '=', location_dest_id_value), -->
-<!--                                                '|', -->
-<!--                                                ('location_status', '=', '空闲'), -->
-<!--                                                ('location_status', '=', '占用'), ('product_id', '=', current_product_id) -->
-<!--                                               ]"/> -->
+                    <!--                         <field name="destination_location_id" domain="[('location_id', '=', location_dest_id_value), -->
+                    <!--                                                '|', -->
+                    <!--                                                ('location_status', '=', '空闲'), -->
+                    <!--                                                ('location_status', '=', '占用'), ('product_id', '=', current_product_id) -->
+                    <!--                                               ]"/> -->
                     <field name="destination_location_id" domain="[('location_id', '=', location_dest_id_value), '|',
                            ('location_status', '=', '空闲'), ('product_id', '=', current_product_id), ('product_sn_id',
                            '=', there_is_no_sn)]" options="{'no_create': True,'no_create_edit':True}"/>
@@ -55,6 +57,7 @@
             <field name="inherit_id" ref="stock.view_move_line_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//form//sheet//group//group//field[@name='location_id']" position="after">
+                    <field name="stock_lot_name" invisible="1"/>
                     <field name="current_location_id" options="{'no_create': False}" force_save="1"/>
                 </xpath>
                 <xpath expr="//form//sheet//group//group//field[@name='location_dest_id']" position="after">

From 1cb7af072efc52b5b208045466df75f3fa8ba277 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 27 Jun 2024 09:52:20 +0800
Subject: [PATCH 33/67] =?UTF-8?q?=E6=B3=A8=E9=87=8AOCC=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index cea53c64..71522528 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_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index e3bf3002..11acc06f 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 3ae65db3..92f6cda2 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

From 70ffbafac4696449a243d37296a9ba34f9cf024a Mon Sep 17 00:00:00 2001
From: hy <1298386937@qq.com>
Date: Thu, 27 Jun 2024 09:57:12 +0800
Subject: [PATCH 34/67] =?UTF-8?q?=E7=94=98=E7=89=B9=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2=E5=92=8C=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_gantt/static/src/js/gantt_row.js     | 31 +++++++++++++++++++++---
 web_gantt/static/src/scss/web_gantt.scss |  4 +++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/web_gantt/static/src/js/gantt_row.js b/web_gantt/static/src/js/gantt_row.js
index 420e3ad5..fb7ffab7 100644
--- a/web_gantt/static/src/js/gantt_row.js
+++ b/web_gantt/static/src/js/gantt_row.js
@@ -592,8 +592,23 @@ var GanttRow = Widget.extend({
             });
             pill.decorations = pillDecorations;
 
-            if (self.colorField) {
-                pill._color = self._getColor(pill[self.colorField]);
+            // let isDelay = false
+            // if(pill.state != 'processing' && pill.state != 'finished') { // 判断待加工
+            //     isDelay = pill.order_deadline.isBefore(new Date())
+            // }
+            pill.exState = ''
+            if (self.colorField){
+                // console.log(self.colorField, self, pill, '颜色')
+                // pill._color = self._getColor(pill[self.colorField]);
+                // 设置pill背景颜色2  修改时间2024年6月25日17:09:43
+                let isDelay = false
+                if(pill.state != 'processing' && pill.state != 'finished') { // 判断待加工
+                    isDelay = pill.order_deadline.isBefore(new Date())
+                }
+                if(isDelay) {
+                    pill.disableDragdrop = true
+                }
+                pill._color = self._getColor2(isDelay ? 'delay' : pill.state);
             }
 
             if (self.progressField) {
@@ -613,6 +628,13 @@ var GanttRow = Widget.extend({
         }
         return 0;
     },
+    _getColor2 (state) {
+        return {
+            'finished': 'ccc',
+            'delay': 9,
+            'processing': 13 // 绿色
+        }[state]
+    },
     /**
      * Get context to evaluate decoration
      *
@@ -867,10 +889,11 @@ var GanttRow = Widget.extend({
         if ($pill.hasClass('ui-draggable-dragging')) {
             return;
         }
-
         var self = this;
         var pill = _.findWhere(this.pills, { id: $pill.data('id') });
-
+        if(pill.state == 'finished'){ // 已完成状态不能拖拽
+            return;
+        }
         // DRAGGABLE
         if (this.options.canEdit && !pill.disableStartResize && !pill.disableStopResize && !this.isGroup) {
 
diff --git a/web_gantt/static/src/scss/web_gantt.scss b/web_gantt/static/src/scss/web_gantt.scss
index 7dbca3e3..bc48bee5 100644
--- a/web_gantt/static/src/scss/web_gantt.scss
+++ b/web_gantt/static/src/scss/web_gantt.scss
@@ -754,3 +754,7 @@
         left: -0.5 * $o-connector-creator-bullet-diameter;
     }
 }
+
+.o_gantt_view .o_gantt_row_nogroup .o_gantt_pill.o_gantt_color_ccc {
+    background-color: #ccc;
+}
\ No newline at end of file

From 05f2cb553d48a264634dc7119efa38ba045ce665 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 27 Jun 2024 17:21:37 +0800
Subject: [PATCH 35/67] =?UTF-8?q?1=E3=80=81=E5=AE=8C=E6=88=90=20=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD/=E9=87=87=E8=B4=AD=E6=80=BB=E7=9B=91=E5=B2=97?=
 =?UTF-8?q?=E4=BD=8D=E6=9D=83=E9=99=90=E5=A2=9E=E5=8A=A0=20=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=EF=BC=9B2=E3=80=81=E5=AE=8C=E6=88=90=20=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E5=87=BA=E5=85=A5=E5=BA=93=E5=88=97=E8=A1=A8=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E5=8D=95=E6=8D=AE=E8=B7=B3=E8=BD=AC=20=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=EF=BC=9B3=E3=80=81=E5=AE=8C=E6=88=90=20=20=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=AF=A6=E6=83=85=E7=9A=84=E6=9C=BA=E5=86=85=E8=A3=85?=
 =?UTF-8?q?=E5=88=80=E6=97=B6=E9=97=B4=E6=AF=94=E5=BD=93=E5=89=8D=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=BF=98=E6=99=9A=20=20bug=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py                       | 5 +++++
 sf_sale/security/group_security.xml                | 4 ++--
 sf_sale/views/purchase_order_view.xml              | 7 +++++++
 sf_tool_management/models/base.py                  | 6 ++----
 sf_tool_management/models/maintenance_equipment.py | 3 ++-
 sf_tool_management/models/tool_material_search.py  | 5 ++---
 sf_tool_management/views/tool_material_search.xml  | 1 +
 7 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 6508132d..f47f8c8d 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -171,6 +171,11 @@ class ProductTemplate(models.Model):
 class RePurchaseOrder(models.Model):
     _inherit = 'purchase.order'
 
+    mrp_production_count = fields.Integer(
+        "Count of MO Source",
+        compute='_compute_mrp_production_count',
+        groups='mrp.group_mrp_user,sf_base.group_purchase,sf_base.group_purchase_director')
+
     remark = fields.Text('备注')
     user_id = fields.Many2one(
         'res.users', string='买家', index=True, tracking=True,
diff --git a/sf_sale/security/group_security.xml b/sf_sale/security/group_security.xml
index 5f23b5bb..97b6d05d 100644
--- a/sf_sale/security/group_security.xml
+++ b/sf_sale/security/group_security.xml
@@ -54,7 +54,7 @@
         <record model="ir.rule" id="sale_order_rule_my">
             <field name="name">销售经理查看自己的订单</field>
             <field name="model_id" ref="model_sale_order"/>
-            <field name="domain_force">['|',('user_id','=',user.id),('create_uid', '=',user.id)]</field>
+            <field name="domain_force">['|','|',('user_id','=',user.id),('user_id', '=', False),('create_uid', '=',user.id)]</field>
             <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>
             <field name="perm_read" eval="1"/>
             <field name="perm_write" eval="1"/>
@@ -74,7 +74,7 @@
         <record model="ir.rule" id="inventory_purchase_order_rule_my">
             <field name="name">采购岗查看自己的订单</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
-            <field name="domain_force">['|',('user_id','=',user.id),('create_uid', '=',user.id)]</field>
+            <field name="domain_force">['|','|',('user_id','=',user.id),('user_id', '=', False),('create_uid', '=',user.id)]</field>
             <field name="groups" eval="[(4, ref('sf_base.group_purchase'))]"/>
             <field name="perm_read" eval="1"/>
             <field name="perm_write" eval="0"/>
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 85f5b1c8..eda8e59d 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -79,6 +79,13 @@
                 <xpath expr="//form/header/button[@name='button_done']" position="attributes">
                     <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
                 </xpath>
+
+                <xpath expr="//form/sheet/div[@name='button_box']/button[@name='action_view_mrp_productions']"
+                       position="attributes">
+                    <attribute name="groups">mrp.group_mrp_user,sf_base.group_purchase,sf_base.group_purchase_director
+                    </attribute>
+                </xpath>
+
                 <xpath expr="//field[@name='order_line']" position="attributes">
                     <attribute name="attrs">{'readonly': [('state', 'in', ['purchase'])]}
                     </attribute>
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 61156536..182141cf 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -944,13 +944,11 @@ class FunctionalToolDismantle(models.Model):
             functional_tool_assembly = self.functional_tool_id.functional_tool_name_id
             if self.scrap_boolean:
                 # 刀柄报废 入库到Scrap
-                lot.create_stock_quant(location, location_dest_scrap_ids[-1], functional_tool_assembly.id, code,
-                                       functional_tool_assembly, functional_tool_assembly.tool_groups_id)
+                lot.create_stock_quant(location, location_dest_scrap_ids[-1], False, code, False, False)
                 lot.tool_material_status = '报废'
             else:
                 # 刀柄不报废 入库到刀具房
-                lot.create_stock_quant(location, location_dest, functional_tool_assembly.id, code,
-                                       functional_tool_assembly, functional_tool_assembly.tool_groups_id)
+                lot.create_stock_quant(location, location_dest, False, code, False, False)
                 lot.tool_material_status = '可用'
 
         # ==============功能刀具[报废]拆解================
diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index d308f1f1..48bc531f 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -3,6 +3,7 @@ import requests
 import logging
 from odoo import models, api, fields
 from odoo.exceptions import ValidationError
+from datetime import datetime, timedelta
 from odoo.addons.sf_base.commons.common import Common
 
 
@@ -101,7 +102,7 @@ class SfMaintenanceEquipment(models.Model):
                             tool_install_time = {'Nomal': '正常', 'Warning': '报警'}
                             equipment_tool_id.write({
                                 'functional_tool_name_id': functional_tool_id.id,
-                                'tool_install_time': time
+                                'tool_install_time': time - timedelta(hours=8)
                             })
                             if functional_tool_id.current_location != '机内刀库':
                                 # 对功能刀具进行移动到生产线
diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py
index af8833fb..ededd64f 100644
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -25,7 +25,8 @@ class ToolMaterial(models.Model):
     have_been_used_num = fields.Integer('在用数量', compute='_compute_number', store=True)
     scrap_num = fields.Integer('报废数量', compute='_compute_number', store=True)
 
-    barcode_ids = fields.One2many('stock.lot', 'tool_material_search_id', string='序列号', readonly=True)
+    barcode_ids = fields.One2many('stock.lot', 'tool_material_search_id', string='序列号', readonly=True,
+                                  domain=[('tool_material_status', '!=', '未入库')])
 
     @api.depends('product_id.stock_quant_ids.quantity')
     def _compute_number(self):
@@ -46,8 +47,6 @@ class ToolMaterial(models.Model):
             record.scrap_num = scrap_num
             record.number = usable_num + have_been_used_num + scrap_num
 
-
-
     @api.model
     def _read_group_cutting_tool_material_id(self, categories, domain, order):
         cutting_tool_material_id = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index 8a740676..ef6209f3 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -63,6 +63,7 @@
                                         <field name="name"/>
                                         <field name="rfid"/>
                                         <field name="product_qty"/>
+                                        <field name="create_date" string="入库日期"/>
                                         <field name="tool_material_status"/>
 <!--                                        <button name="enroll_tool_material_stock" string="序列号注册" type="object" class="btn-primary"/>-->
                                     </tree>

From 37f030c2db0be3a9bc71bdea7426ed37ec9f5408 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 27 Jun 2024 17:31:03 +0800
Subject: [PATCH 36/67] =?UTF-8?q?=E5=A4=84=E7=90=86unlink()=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_hide_options/models/models.py | 240 ++++++++++++++-------------
 1 file changed, 122 insertions(+), 118 deletions(-)

diff --git a/jikimo_hide_options/models/models.py b/jikimo_hide_options/models/models.py
index 72046dca..f798fd48 100644
--- a/jikimo_hide_options/models/models.py
+++ b/jikimo_hide_options/models/models.py
@@ -200,7 +200,7 @@ def _create(self, data_list):
 
 
 @api.model
-def unlink(self):
+def unlink(self, ids):
     """ unlink()
 
     Deletes the records in ``self``.
@@ -210,143 +210,147 @@ def unlink(self):
     """
     if not self:
         return True
+    if not ids:
+        return True
 
     self.check_access_rights('unlink')
     self.check_access_rule('unlink')
 
     from odoo.addons.base.models.ir_model import MODULE_UNINSTALL_FLAG
-    for func in self._ondelete_methods:
-        # func._ondelete is True if it should be called during uninstallation
-        if func._ondelete or not self._context.get(MODULE_UNINSTALL_FLAG):
-            func(self)
+    for record_id in ids:
+        record = self.browse(record_id)
+        for func in record._ondelete_methods:
+            # func._ondelete is True if it should be called during uninstallation
+            if func._ondelete or not record._context.get(MODULE_UNINSTALL_FLAG):
+                func(record)
 
-    # TOFIX: this avoids an infinite loop when trying to recompute a
-    # field, which triggers the recomputation of another field using the
-    # same compute function, which then triggers again the computation
-    # of those two fields
-    for field in self._fields.values():
-        self.env.remove_to_compute(field, self)
+        # TOFIX: this avoids an infinite loop when trying to recompute a
+        # field, which triggers the recomputation of another field using the
+        # same compute function, which then triggers again the computation
+        # of those two fields
+        for field in record._fields.values():
+            record.env.remove_to_compute(field, record)
 
-    self.env.flush_all()
+        record.env.flush_all()
 
-    cr = self._cr
-    Data = self.env['ir.model.data'].sudo().with_context({})
-    Defaults = self.env['ir.default'].sudo()
-    Property = self.env['ir.property'].sudo()
-    Attachment = self.env['ir.attachment'].sudo()
-    ir_property_unlink = Property
-    ir_model_data_unlink = Data
-    ir_attachment_unlink = Attachment
+        cr = record._cr
+        Data = record.env['ir.model.data'].sudo().with_context({})
+        Defaults = record.env['ir.default'].sudo()
+        Property = record.env['ir.property'].sudo()
+        Attachment = record.env['ir.attachment'].sudo()
+        ir_property_unlink = Property
+        ir_model_data_unlink = Data
+        ir_attachment_unlink = Attachment
 
-    # mark fields that depend on 'self' to recompute them after 'self' has
-    # been deleted (like updating a sum of lines after deleting one line)
-    with self.env.protecting(self._fields.values(), self):
-        self.modified(self._fields, before=True)
-    for sub_ids in cr.split_for_in_conditions(self.ids):
-        records = self.browse(sub_ids)
+        # mark fields that depend on 'record' to recompute them after 'record' has
+        # been deleted (like updating a sum of lines after deleting one line)
+        with record.env.protecting(record._fields.values(), record):
+            record.modified(record._fields, before=True)
+        for sub_ids in cr.split_for_in_conditions(record.ids):
+            records = record.browse(sub_ids)
 
-        # Check if the records are used as default properties.
-        refs = [f'{self._name},{id_}' for id_ in sub_ids]
-        if Property.search(
-                [('res_id', '=', False), ('value_reference', 'in', refs)],
-                limit=1):
-            raise UserError(
-                _('Unable to delete this document because it is used as a default property'))
+            # Check if the records are used as default properties.
+            refs = [f'{record._name},{id_}' for id_ in sub_ids]
+            if Property.search(
+                    [('res_id', '=', False), ('value_reference', 'in', refs)],
+                    limit=1):
+                raise UserError(
+                    _('Unable to delete this document because it is used as a default property'))
 
-        # Delete the records' properties.
-        ir_property_unlink |= Property.search([('res_id', 'in', refs)])
+            # Delete the records' properties.
+            ir_property_unlink |= Property.search([('res_id', 'in', refs)])
 
-        query = f'DELETE FROM "{self._table}" WHERE id IN %s'
-        cr.execute(query, (sub_ids,))
+            query = f'DELETE FROM "{record._table}" WHERE id IN %s'
+            cr.execute(query, (sub_ids,))
 
-        # Removing the ir_model_data reference if the record being deleted
-        # is a record created by xml/csv file, as these are not connected
-        # with real database foreign keys, and would be dangling references.
-        #
-        # Note: the following steps are performed as superuser to avoid
-        # access rights restrictions, and with no context to avoid possible
-        # side-effects during admin calls.
-        data = Data.search(
-            [('model', '=', self._name), ('res_id', 'in', sub_ids)])
-        ir_model_data_unlink |= data
+            # Removing the ir_model_data reference if the record being deleted
+            # is a record created by xml/csv file, as these are not connected
+            # with real database foreign keys, and would be dangling references.
+            #
+            # Note: the following steps are performed as superuser to avoid
+            # access rights restrictions, and with no context to avoid possible
+            # side-effects during admin calls.
+            data = Data.search(
+                [('model', '=', record._name), ('res_id', 'in', sub_ids)])
+            ir_model_data_unlink |= data
 
-        # For the same reason, remove the defaults having some of the
-        # records as value
-        Defaults.discard_records(records)
+            # For the same reason, remove the defaults having some of the
+            # records as value
+            Defaults.discard_records(records)
 
-        # For the same reason, remove the relevant records in ir_attachment
-        # (the search is performed with sql as the search method of
-        # ir_attachment is overridden to hide attachments of deleted
-        # records)
-        query = 'SELECT id FROM ir_attachment WHERE res_model=%s AND res_id IN %s'
-        cr.execute(query, (self._name, sub_ids))
-        ir_attachment_unlink |= Attachment.browse(
-            row[0] for row in cr.fetchall())
+            # For the same reason, remove the relevant records in ir_attachment
+            # (the search is performed with sql as the search method of
+            # ir_attachment is overridden to hide attachments of deleted
+            # records)
+            query = 'SELECT id FROM ir_attachment WHERE res_model=%s AND res_id IN %s'
+            cr.execute(query, (record._name, sub_ids))
+            ir_attachment_unlink |= Attachment.browse(
+                row[0] for row in cr.fetchall())
 
-    # invalidate the *whole* cache, since the orm does not handle all
-    # changes made in the database, like cascading delete!
-    self.env.invalidate_all(flush=False)
-    if ir_property_unlink:
-        ir_property_unlink.unlink()
-    if ir_model_data_unlink:
-        ir_model_data_unlink.unlink()
-    if ir_attachment_unlink:
-        ir_attachment_unlink.unlink()
-    # DLE P93: flush after the unlink, for recompute fields depending on
-    # the modified of the unlink
-    self.env.flush_all()
-    # auditing: deletions are infrequent and leave no trace in the database
-    _unlink.info('User #%s deleted %s records with IDs: %r', self._uid,
-                 self._name, self.ids)
-    # This is used to restrict the access right to unlink a record
-    current_model_id = self.env['ir.model'].sudo().search(
-        [('model', '=', self._name)]).id
-    # access_right_rec = self.env['access.right'].sudo().search_read(
-    #     [('model_id', '=', current_model_id)], ['model_id', 'is_delete',
-    #                                             'groups_id'])
-    # if access_right_rec and not self.env.is_admin():
-    #     for rec in access_right_rec:
-    #         group_name = self.env['ir.model.data'].sudo().search([
-    #             ('model', '=', 'res.groups'),
-    #             ('res_id', '=', rec['groups_id'][0])
-    #         ]).name
-    #         module_name = self.env['ir.model.data'].sudo().search([
-    #             ('model', '=', 'res.groups'),
-    #             ('res_id', '=', rec['groups_id'][0])
-    #         ]).module
-    #         group = module_name + "." + group_name
-    #         if self.env.user.has_group(group):
-    #             if rec['is_delete']:
-    #                 raise UserError(_('You are restricted from performing this'
-    #                                   ' operation. Please contact the'
-    #                                   ' administrator.'))
-    # 检查 'access.right' 模型是否存在于环境中
-    if 'access.right' in self.env:
-        # current_model_id = self.env['ir.model'].sudo().search([('model', '=', self._name)]).id
-        access_right_rec = self.env['access.right'].sudo().search_read(
-            [('model_id', '=', current_model_id)], ['model_id', 'is_delete', 'groups_id']
-        )
+        # invalidate the *whole* cache, since the orm does not handle all
+        # changes made in the database, like cascading delete!
+        record.env.invalidate_all(flush=False)
+        if ir_property_unlink:
+            ir_property_unlink.unlink()
+        if ir_model_data_unlink:
+            ir_model_data_unlink.unlink()
+        if ir_attachment_unlink:
+            ir_attachment_unlink.unlink()
+        # DLE P93: flush after the unlink, for recompute fields depending on
+        # the modified of the unlink
+        record.env.flush_all()
+        # auditing: deletions are infrequent and leave no trace in the database
+        _unlink.info('User #%s deleted %s records with IDs: %r', record._uid,
+                     record._name, record.ids)
+        # This is used to restrict the access right to unlink a record
+        current_model_id = record.env['ir.model'].sudo().search(
+            [('model', '=', record._name)]).id
+        # access_right_rec = record.env['access.right'].sudo().search_read(
+        #     [('model_id', '=', current_model_id)], ['model_id', 'is_delete',
+        #                                             'groups_id'])
+        # if access_right_rec and not record.env.is_admin():
+        #     for rec in access_right_rec:
+        #         group_name = record.env['ir.model.data'].sudo().search([
+        #             ('model', '=', 'res.groups'),
+        #             ('res_id', '=', rec['groups_id'][0])
+        #         ]).name
+        #         module_name = record.env['ir.model.data'].sudo().search([
+        #             ('model', '=', 'res.groups'),
+        #             ('res_id', '=', rec['groups_id'][0])
+        #         ]).module
+        #         group = module_name + "." + group_name
+        #         if record.env.user.has_group(group):
+        #             if rec['is_delete']:
+        #                 raise UserError(_('You are restricted from performing this'
+        #                                   ' operation. Please contact the'
+        #                                   ' administrator.'))
+        # 检查 'access.right' 模型是否存在于环境中
+        if 'access.right' in record.env:
+            # current_model_id = record.env['ir.model'].sudo().search([('model', '=', record._name)]).id
+            access_right_rec = record.env['access.right'].sudo().search_read(
+                [('model_id', '=', current_model_id)], ['model_id', 'is_delete', 'groups_id']
+            )
 
-        if access_right_rec and not self.env.is_admin():
-            for rec in access_right_rec:
-                group_data = self.env['ir.model.data'].sudo().search_read(
-                    [('model', '=', 'res.groups'), ('res_id', '=', rec['groups_id'][0])],
-                    ['name', 'module']
-                )
+            if access_right_rec and not record.env.is_admin():
+                for rec in access_right_rec:
+                    group_data = record.env['ir.model.data'].sudo().search_read(
+                        [('model', '=', 'res.groups'), ('res_id', '=', rec['groups_id'][0])],
+                        ['name', 'module']
+                    )
 
-                if group_data:
-                    group_name = group_data[0]['name']
-                    module_name = group_data[0]['module']
-                    group_xml_id = f"{module_name}.{group_name}"
+                    if group_data:
+                        group_name = group_data[0]['name']
+                        module_name = group_data[0]['module']
+                        group_xml_id = f"{module_name}.{group_name}"
 
-                    if self.env.user.has_group(group_xml_id) and rec['is_delete']:
-                        raise UserError(
-                            _('You are restricted from performing this operation. Please contact the administrator.'))
-    else:
-        # 如果 'access.right' 模型不存在，可以在这里定义备选逻辑
-        pass
+                        if record.env.user.has_group(group_xml_id) and rec['is_delete']:
+                            raise UserError(
+                                _('You are restricted from performing this operation. Please contact the administrator.'))
+        else:
+            # 如果 'access.right' 模型不存在，可以在这里定义备选逻辑
+            pass
 
-    return True
+        return True
 
 
 BaseModel._create = _create

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 37/67] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=B8=8B=E5=8F=91=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=97=A0=E9=87=87=E8=B4=AD=E8=B0=83=E6=8B=A8?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E5=8E=BB=E6=8E=89=E7=A8=8B=E5=BA=8F=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=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

From 08fd0b01d33108e98e8a2903a14d11359403227c Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 27 Jun 2024 20:09:45 +0800
Subject: [PATCH 38/67] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=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/ftp_button.xml | 2 +-
 sf_machine_connect/wizard/up_select.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sf_machine_connect/views/ftp_button.xml b/sf_machine_connect/views/ftp_button.xml
index f102dc00..2a273553 100644
--- a/sf_machine_connect/views/ftp_button.xml
+++ b/sf_machine_connect/views/ftp_button.xml
@@ -19,7 +19,7 @@
 <!-- 							attrs='{"invisible": ["|",("state","!=","progress"), -->
 <!-- 							("user_permissions","!=",True)]}'/>					 -->
 <!-- 							<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序" context="{'default_cnc_ids': cnc_ids}"/> -->
-    					<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"
+<!--    					<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"-->
     					context="{'default_sf_cnc_processing_id': id}" attrs='{"invisible": ["|",("state","!=","progress"),
 							("user_permissions","!=",True)]}'/>
 <!--					<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"-->
diff --git a/sf_machine_connect/wizard/up_select.xml b/sf_machine_connect/wizard/up_select.xml
index cbdac5b3..6ffbbfc5 100644
--- a/sf_machine_connect/wizard/up_select.xml
+++ b/sf_machine_connect/wizard/up_select.xml
@@ -14,7 +14,7 @@
 <!--                          <field name="program_ids" domain="[('workorder_id', '=', workorder_id)]"/>-->
                      </group>
                      <footer>
-                         <button string="合并下发" name="confirm_up" type="object" class="btn-primary" confirm="是否确认合并下发"/>
+<!--                         <button string="合并下发" name="confirm_up" type="object" class="btn-primary" confirm="是否确认合并下发"/>-->
                          <button string="取消" class="btn-secondary" special="cancel"/>
                      </footer>
                  </form>

From c2723d9d053029cd2b1b1010fcef27a5f036831b Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 28 Jun 2024 09:19:09 +0800
Subject: [PATCH 39/67] =?UTF-8?q?=E5=A4=84=E7=90=86unlink=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=E9=97=AE=E9=A2=982?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_hide_options/models/models.py | 224 ++++++++++++---------------
 1 file changed, 97 insertions(+), 127 deletions(-)

diff --git a/jikimo_hide_options/models/models.py b/jikimo_hide_options/models/models.py
index f798fd48..c06acc45 100644
--- a/jikimo_hide_options/models/models.py
+++ b/jikimo_hide_options/models/models.py
@@ -200,7 +200,7 @@ def _create(self, data_list):
 
 
 @api.model
-def unlink(self, ids):
+def unlink(self, *args):
     """ unlink()
 
     Deletes the records in ``self``.
@@ -210,148 +210,118 @@ def unlink(self, ids):
     """
     if not self:
         return True
-    if not ids:
-        return True
 
     self.check_access_rights('unlink')
     self.check_access_rule('unlink')
 
     from odoo.addons.base.models.ir_model import MODULE_UNINSTALL_FLAG
-    for record_id in ids:
-        record = self.browse(record_id)
-        for func in record._ondelete_methods:
-            # func._ondelete is True if it should be called during uninstallation
-            if func._ondelete or not record._context.get(MODULE_UNINSTALL_FLAG):
-                func(record)
+    for func in self._ondelete_methods:
+        # func._ondelete is True if it should be called during uninstallation
+        if func._ondelete or not self._context.get(MODULE_UNINSTALL_FLAG):
+            func(self)
 
-        # TOFIX: this avoids an infinite loop when trying to recompute a
-        # field, which triggers the recomputation of another field using the
-        # same compute function, which then triggers again the computation
-        # of those two fields
-        for field in record._fields.values():
-            record.env.remove_to_compute(field, record)
+    # TOFIX: this avoids an infinite loop when trying to recompute a
+    # field, which triggers the recomputation of another field using the
+    # same compute function, which then triggers again the computation
+    # of those two fields
+    for field in self._fields.values():
+        self.env.remove_to_compute(field, self)
 
-        record.env.flush_all()
+    self.env.flush_all()
 
-        cr = record._cr
-        Data = record.env['ir.model.data'].sudo().with_context({})
-        Defaults = record.env['ir.default'].sudo()
-        Property = record.env['ir.property'].sudo()
-        Attachment = record.env['ir.attachment'].sudo()
-        ir_property_unlink = Property
-        ir_model_data_unlink = Data
-        ir_attachment_unlink = Attachment
+    cr = self._cr
+    Data = self.env['ir.model.data'].sudo().with_context({})
+    Defaults = self.env['ir.default'].sudo()
+    Property = self.env['ir.property'].sudo()
+    Attachment = self.env['ir.attachment'].sudo()
+    ir_property_unlink = Property
+    ir_model_data_unlink = Data
+    ir_attachment_unlink = Attachment
 
-        # mark fields that depend on 'record' to recompute them after 'record' has
-        # been deleted (like updating a sum of lines after deleting one line)
-        with record.env.protecting(record._fields.values(), record):
-            record.modified(record._fields, before=True)
-        for sub_ids in cr.split_for_in_conditions(record.ids):
-            records = record.browse(sub_ids)
+    # mark fields that depend on 'self' to recompute them after 'self' has
+    # been deleted (like updating a sum of lines after deleting one line)
+    with self.env.protecting(self._fields.values(), self):
+        self.modified(self._fields, before=True)
+    for sub_ids in cr.split_for_in_conditions(self.ids):
+        records = self.browse(sub_ids)
 
-            # Check if the records are used as default properties.
-            refs = [f'{record._name},{id_}' for id_ in sub_ids]
-            if Property.search(
-                    [('res_id', '=', False), ('value_reference', 'in', refs)],
-                    limit=1):
-                raise UserError(
-                    _('Unable to delete this document because it is used as a default property'))
+        # Check if the records are used as default properties.
+        refs = [f'{self._name},{id_}' for id_ in sub_ids]
+        if Property.search(
+                [('res_id', '=', False), ('value_reference', 'in', refs)],
+                limit=1):
+            raise UserError(
+                _('Unable to delete this document because it is used as a default property'))
 
-            # Delete the records' properties.
-            ir_property_unlink |= Property.search([('res_id', 'in', refs)])
+        # Delete the records' properties.
+        ir_property_unlink |= Property.search([('res_id', 'in', refs)])
 
-            query = f'DELETE FROM "{record._table}" WHERE id IN %s'
-            cr.execute(query, (sub_ids,))
+        query = f'DELETE FROM "{self._table}" WHERE id IN %s'
+        cr.execute(query, (sub_ids,))
 
-            # Removing the ir_model_data reference if the record being deleted
-            # is a record created by xml/csv file, as these are not connected
-            # with real database foreign keys, and would be dangling references.
-            #
-            # Note: the following steps are performed as superuser to avoid
-            # access rights restrictions, and with no context to avoid possible
-            # side-effects during admin calls.
-            data = Data.search(
-                [('model', '=', record._name), ('res_id', 'in', sub_ids)])
-            ir_model_data_unlink |= data
+        # Removing the ir_model_data reference if the record being deleted
+        # is a record created by xml/csv file, as these are not connected
+        # with real database foreign keys, and would be dangling references.
+        #
+        # Note: the following steps are performed as superuser to avoid
+        # access rights restrictions, and with no context to avoid possible
+        # side-effects during admin calls.
+        data = Data.search(
+            [('model', '=', self._name), ('res_id', 'in', sub_ids)])
+        ir_model_data_unlink |= data
 
-            # For the same reason, remove the defaults having some of the
-            # records as value
-            Defaults.discard_records(records)
+        # For the same reason, remove the defaults having some of the
+        # records as value
+        Defaults.discard_records(records)
 
-            # For the same reason, remove the relevant records in ir_attachment
-            # (the search is performed with sql as the search method of
-            # ir_attachment is overridden to hide attachments of deleted
-            # records)
-            query = 'SELECT id FROM ir_attachment WHERE res_model=%s AND res_id IN %s'
-            cr.execute(query, (record._name, sub_ids))
-            ir_attachment_unlink |= Attachment.browse(
-                row[0] for row in cr.fetchall())
+        # For the same reason, remove the relevant records in ir_attachment
+        # (the search is performed with sql as the search method of
+        # ir_attachment is overridden to hide attachments of deleted
+        # records)
+        query = 'SELECT id FROM ir_attachment WHERE res_model=%s AND res_id IN %s'
+        cr.execute(query, (self._name, sub_ids))
+        ir_attachment_unlink |= Attachment.browse(
+            row[0] for row in cr.fetchall())
 
-        # invalidate the *whole* cache, since the orm does not handle all
-        # changes made in the database, like cascading delete!
-        record.env.invalidate_all(flush=False)
-        if ir_property_unlink:
-            ir_property_unlink.unlink()
-        if ir_model_data_unlink:
-            ir_model_data_unlink.unlink()
-        if ir_attachment_unlink:
-            ir_attachment_unlink.unlink()
-        # DLE P93: flush after the unlink, for recompute fields depending on
-        # the modified of the unlink
-        record.env.flush_all()
-        # auditing: deletions are infrequent and leave no trace in the database
-        _unlink.info('User #%s deleted %s records with IDs: %r', record._uid,
-                     record._name, record.ids)
-        # This is used to restrict the access right to unlink a record
-        current_model_id = record.env['ir.model'].sudo().search(
-            [('model', '=', record._name)]).id
-        # access_right_rec = record.env['access.right'].sudo().search_read(
-        #     [('model_id', '=', current_model_id)], ['model_id', 'is_delete',
-        #                                             'groups_id'])
-        # if access_right_rec and not record.env.is_admin():
-        #     for rec in access_right_rec:
-        #         group_name = record.env['ir.model.data'].sudo().search([
-        #             ('model', '=', 'res.groups'),
-        #             ('res_id', '=', rec['groups_id'][0])
-        #         ]).name
-        #         module_name = record.env['ir.model.data'].sudo().search([
-        #             ('model', '=', 'res.groups'),
-        #             ('res_id', '=', rec['groups_id'][0])
-        #         ]).module
-        #         group = module_name + "." + group_name
-        #         if record.env.user.has_group(group):
-        #             if rec['is_delete']:
-        #                 raise UserError(_('You are restricted from performing this'
-        #                                   ' operation. Please contact the'
-        #                                   ' administrator.'))
-        # 检查 'access.right' 模型是否存在于环境中
-        if 'access.right' in record.env:
-            # current_model_id = record.env['ir.model'].sudo().search([('model', '=', record._name)]).id
-            access_right_rec = record.env['access.right'].sudo().search_read(
-                [('model_id', '=', current_model_id)], ['model_id', 'is_delete', 'groups_id']
-            )
-
-            if access_right_rec and not record.env.is_admin():
-                for rec in access_right_rec:
-                    group_data = record.env['ir.model.data'].sudo().search_read(
-                        [('model', '=', 'res.groups'), ('res_id', '=', rec['groups_id'][0])],
-                        ['name', 'module']
-                    )
-
-                    if group_data:
-                        group_name = group_data[0]['name']
-                        module_name = group_data[0]['module']
-                        group_xml_id = f"{module_name}.{group_name}"
-
-                        if record.env.user.has_group(group_xml_id) and rec['is_delete']:
-                            raise UserError(
-                                _('You are restricted from performing this operation. Please contact the administrator.'))
-        else:
-            # 如果 'access.right' 模型不存在，可以在这里定义备选逻辑
-            pass
-
-        return True
+    # invalidate the *whole* cache, since the orm does not handle all
+    # changes made in the database, like cascading delete!
+    self.env.invalidate_all(flush=False)
+    if ir_property_unlink:
+        ir_property_unlink.unlink()
+    if ir_model_data_unlink:
+        ir_model_data_unlink.unlink()
+    if ir_attachment_unlink:
+        ir_attachment_unlink.unlink()
+    # DLE P93: flush after the unlink, for recompute fields depending on
+    # the modified of the unlink
+    self.env.flush_all()
+    # auditing: deletions are infrequent and leave no trace in the database
+    _unlink.info('User #%s deleted %s records with IDs: %r', self._uid,
+                 self._name, self.ids)
+    # This is used to restrict the access right to unlink a record
+    current_model_id = self.env['ir.model'].sudo().search(
+        [('model', '=', self._name)]).id
+    access_right_rec = self.env['access.right'].sudo().search_read(
+        [('model_id', '=', current_model_id)], ['model_id', 'is_delete',
+                                                'groups_id'])
+    if access_right_rec and not self.env.is_admin():
+        for rec in access_right_rec:
+            group_name = self.env['ir.model.data'].sudo().search([
+                ('model', '=', 'res.groups'),
+                ('res_id', '=', rec['groups_id'][0])
+            ]).name
+            module_name = self.env['ir.model.data'].sudo().search([
+                ('model', '=', 'res.groups'),
+                ('res_id', '=', rec['groups_id'][0])
+            ]).module
+            group = module_name + "." + group_name
+            if self.env.user.has_group(group):
+                if rec['is_delete']:
+                    raise UserError(_('You are restricted from performing this'
+                                      ' operation. Please contact the'
+                                      ' administrator.'))
+    return True
 
 
 BaseModel._create = _create
-BaseModel.unlink = unlink
+BaseModel.unlink = unlink
\ No newline at end of file

From c8de75ceaebfa91bf159f774e814e42187a5840f Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 28 Jun 2024 09:51:31 +0800
Subject: [PATCH 40/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_hide_options/models/models.py          |  2 +-
 sf_machine_connect/views/compensation.xml     | 12 ++---
 sf_machine_connect/views/ftp_button.xml       |  2 +-
 sf_machine_connect/wizard/up_select.xml       |  2 +-
 sf_manufacturing/models/mrp_production.py     |  8 ---
 sf_manufacturing/models/mrp_workorder.py      | 53 +++++++++----------
 sf_manufacturing/models/stock.py              |  2 +-
 sf_manufacturing/views/mrp_workorder_view.xml | 12 ++---
 sf_mrs_connect/controllers/controllers.py     |  6 +--
 sf_plan/models/custom_plan.py                 | 24 ++++-----
 sf_plan/views/view.xml                        |  2 +-
 11 files changed, 57 insertions(+), 68 deletions(-)

diff --git a/jikimo_hide_options/models/models.py b/jikimo_hide_options/models/models.py
index c06acc45..84aee828 100644
--- a/jikimo_hide_options/models/models.py
+++ b/jikimo_hide_options/models/models.py
@@ -200,7 +200,7 @@ def _create(self, data_list):
 
 
 @api.model
-def unlink(self, *args):
+def unlink(self):
     """ unlink()
 
     Deletes the records in ``self``.
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_machine_connect/views/ftp_button.xml b/sf_machine_connect/views/ftp_button.xml
index f102dc00..2a273553 100644
--- a/sf_machine_connect/views/ftp_button.xml
+++ b/sf_machine_connect/views/ftp_button.xml
@@ -19,7 +19,7 @@
 <!-- 							attrs='{"invisible": ["|",("state","!=","progress"), -->
 <!-- 							("user_permissions","!=",True)]}'/>					 -->
 <!-- 							<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序" context="{'default_cnc_ids': cnc_ids}"/> -->
-    					<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"
+<!--    					<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"-->
     					context="{'default_sf_cnc_processing_id': id}" attrs='{"invisible": ["|",("state","!=","progress"),
 							("user_permissions","!=",True)]}'/>
 <!--					<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"-->
diff --git a/sf_machine_connect/wizard/up_select.xml b/sf_machine_connect/wizard/up_select.xml
index cbdac5b3..6ffbbfc5 100644
--- a/sf_machine_connect/wizard/up_select.xml
+++ b/sf_machine_connect/wizard/up_select.xml
@@ -14,7 +14,7 @@
 <!--                          <field name="program_ids" domain="[('workorder_id', '=', workorder_id)]"/>-->
                      </group>
                      <footer>
-                         <button string="合并下发" name="confirm_up" type="object" class="btn-primary" confirm="是否确认合并下发"/>
+<!--                         <button string="合并下发" name="confirm_up" type="object" class="btn-primary" confirm="是否确认合并下发"/>-->
                          <button string="取消" class="btn-secondary" special="cancel"/>
                      </footer>
                  </form>
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/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_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index db8f4bf9..0e56bf22 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -37,7 +37,7 @@ class sf_production_plan(models.Model):
     _order = 'state_order asc, write_date desc'
 
     name = fields.Char(string='制造订单')
-    active = fields.Boolean(string='已归档', default=True)
+    # active = fields.Boolean(string='已归档', default=True)
     # selected = fields.Boolean(default=False)
     # order_number = fields.Char(string='订单号')
     order_deadline = fields.Datetime(string='订单交期')
@@ -101,17 +101,17 @@ class sf_production_plan(models.Model):
     #     return super(sf_production_plan, self.with_context(active_test=False))._search(
     #         args, offset, limit, order, count, access_rights_uid)
 
-    def archive(self):
-        """
-        归档
-        """
-        self.write({'active': False})
-
-    def unarchive(self):
-        """
-        取消归档
-        """
-        self.write({'active': True})
+    # def archive(self):
+    #     """
+    #     归档
+    #     """
+    #     self.write({'active': False})
+    #
+    # def unarchive(self):
+    #     """
+    #     取消归档
+    #     """
+    #     self.write({'active': True})
 
     @api.model
     def get_import_templates(self):
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 065c97c4..27949380 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -63,7 +63,7 @@
                         </div>
                         <group>
                             <group string="基本信息">
-                                <field name="active" invisible="1"/>
+<!--                                 <field name="active" invisible="1"/> -->
                                 <field name="production_id" widget="many2one_button"/>
                                 <field name="product_id"/>
                                 <field name="origin"/>

From 5997cbcb0e79e0aad99e4c1fe506d8a164b1aa9b Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 28 Jun 2024 12:00:29 +0800
Subject: [PATCH 41/67] =?UTF-8?q?download=5Fprogram=5Ffile=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=97=ADftp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_mrs_connect/models/ftp_operate.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sf_mrs_connect/models/ftp_operate.py b/sf_mrs_connect/models/ftp_operate.py
index 6d7d172c..3183c0f6 100644
--- a/sf_mrs_connect/models/ftp_operate.py
+++ b/sf_mrs_connect/models/ftp_operate.py
@@ -28,15 +28,11 @@ class FtpController():
             logging.info("dirname:%s" % os.path.dirname(path))
             directories = os.path.normpath(path).split(os.path.sep)
             # 切换到上级目录
-            current_dir = '/'
             for directory in directories:
                 if directory:
                     # 检查目录是否存在
                     if (directory in ['NC']) or (directory not in ['home', 'ftp', 'ftp_root', 'NC']):
                         self.ftp.cwd(directory)
-                    if directory not in ['home', 'ftp', 'ftp_root', 'NC']:
-                        # 切换到新的目录
-                        self.ftp.cwd(directory)
             return os.path.basename(path)
         except Exception as e:
             logging.error(f"Error checking file: {e}")
@@ -69,6 +65,9 @@ class FtpController():
                     return True
         except:
             return False
+        finally:
+            self.ftp.quit()
+            logging.info("ftp已关闭")
 
     # # 检测字符串的编码
     # def detect_encoding(self, s):

From 3b24f90385bd70123f9e40b297d925ccef703ffe Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 28 Jun 2024 14:20:57 +0800
Subject: [PATCH 42/67] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8C=89Rfid=E6=90=9C=E7=B4=A2=EF=BC=8C=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=A4=9A=E4=BD=99=E7=9A=84Rfid=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E4=BC=98=E5=8C=96=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=A5=E6=9C=9F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/security/ir.model.access.csv            | 4 ++--
 sf_machine_connect/views/WorkCenterBarcodes.xml | 1 +
 sf_manufacturing/controllers/controllers.py     | 8 ++++----
 sf_manufacturing/views/mrp_workorder_view.xml   | 3 ---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv
index 09b96baa..ecc572c7 100644
--- a/sf_base/security/ir.model.access.csv
+++ b/sf_base/security/ir.model.access.csv
@@ -11,8 +11,8 @@ access_sf_machine_control_system,sf_machine_control_system,model_sf_machine_cont
 access_sf_machine_control_system_admin,sf_machine_control_system_admin,model_sf_machine_control_system,base.group_system,1,1,1,0
 access_sf_production_process_group_sale_director,sf_production_process_group_sale_director,model_sf_production_process,sf_base.group_sale_director,1,0,0,0
 access_sf_production_process_group_sale_salemanager,sf_production_process_group_sale_salemanager,model_sf_production_process,sf_base.group_sale_salemanager,1,0,0,0
-access_res_partner_category_group_sale_salemanager,res_partner_category_group_sale_salemanager,base.model_res_partner_category,sf_base.group_sale_salemanager,1,0,1,0
-access_res_partner_category_group_sale_director,res_partner_category_group_sale_director,base.model_res_partner_category,sf_base.group_sale_director,1,0,1,0
+access_res_partner_category_group_sale_salemanager,res_partner_category_group_sale_salemanager,base.model_res_partner_category,sf_base.group_sale_salemanager,1,1,1,0
+access_res_partner_category_group_sale_director,res_partner_category_group_sale_director,base.model_res_partner_category,sf_base.group_sale_director,1,1,1,0
 access_sf_production_process,sf_production_process,model_sf_production_process,base.group_user,1,1,1,0
 access_sf_production_process_admin,sf_production_process_admin,model_sf_production_process,base.group_system,1,1,1,0
 access_sf_production_materials,sf_production_materials,model_sf_production_materials,base.group_user,1,1,1,0
diff --git a/sf_machine_connect/views/WorkCenterBarcodes.xml b/sf_machine_connect/views/WorkCenterBarcodes.xml
index aea9731b..9e5d3982 100644
--- a/sf_machine_connect/views/WorkCenterBarcodes.xml
+++ b/sf_machine_connect/views/WorkCenterBarcodes.xml
@@ -27,6 +27,7 @@
             </xpath>
             <xpath expr="//field[@name='production_id']" position="before">
                 <field name="product_tmpl_name"/>
+                <field name="rfid_code"/>
             </xpath>
         </field>
     </record>
diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 4af8315b..af195938 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -318,13 +318,13 @@ class Manufacturing_Connect(http.Controller):
                     [('rfid_code', '=', ret['RfidCode']), ('routing_type', '=', 'CNC加工')])
                 if workorder:
                     for item in workorder.cmm_ids:
-                        if item.program_date is not False:
-                            program_date = item.program_date.strftime("%Y-%m-%d %H:%M:%S")
-                            program_date_str = request.env['sf.sync.common'].sudo().get_add_time(program_date)
+                        if item.program_create_date is not False:
+                            program_create_date = item.program_create_date.strftime("%Y-%m-%d %H:%M:%S")
+                            program_date_str = request.env['sf.sync.common'].sudo().get_add_time(program_create_date)
                         res['Datas'].append({
                             'CraftId': workorder.id,
                             'CraftKey': workorder.name,
-                            'ProgramDate': '' if not item.program_date else program_date_str,
+                            'ProgramDate': '' if not item.program_create_date else program_date_str,
                             'ProgramPath': item.program_path,
                             'PostProcessing': item.post_processing_name,
                         })
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 790c0551..e33f20e1 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -227,9 +227,6 @@
                     <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
                     <!--                     <field name="functional_fixture_type_id" -->
                     <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
-                    <field name="rfid_code" force_save="1" readonly="1" cache="True"
-                           attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
-                    <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
                 </group>
                 <!--                <group>-->
                 <!--                    <div>-->

From d281026086cbabc9792f3789b0e5ee1d9357f421 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 28 Jun 2024 14:23:03 +0800
Subject: [PATCH 43/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcmm=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/controllers/controllers.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 4af8315b..afb3681c 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -318,15 +318,15 @@ class Manufacturing_Connect(http.Controller):
                     [('rfid_code', '=', ret['RfidCode']), ('routing_type', '=', 'CNC加工')])
                 if workorder:
                     for item in workorder.cmm_ids:
-                        if item.program_date is not False:
-                            program_date = item.program_date.strftime("%Y-%m-%d %H:%M:%S")
-                            program_date_str = request.env['sf.sync.common'].sudo().get_add_time(program_date)
+                        if item.program_create_date is not False:
+                            program_create_date = item.program_create_date.strftime("%Y-%m-%d %H:%M:%S")
+                            program_date_str = request.env['sf.sync.common'].sudo().get_add_time(program_create_date)
                         res['Datas'].append({
                             'CraftId': workorder.id,
                             'CraftKey': workorder.name,
-                            'ProgramDate': '' if not item.program_date else program_date_str,
+                            'ProgramDate': '' if not item.program_create_date else program_date_str,
                             'ProgramPath': item.program_path,
-                            'PostProcessing': item.post_processing_name,
+                            'PostProcessing': item.program_name,
                         })
                 else:
                     res = {'Succeed': False, 'ErrorCode': 203, 'Error': '暂无工单及对应的CNC程序数据'}

From 0c3727540eb10a7a913703c122182694b4b1f52d Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 28 Jun 2024 14:51:53 +0800
Subject: [PATCH 44/67] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BA=A7=E5=93=81=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index bf353a40..68ee8f9c 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -91,7 +91,7 @@
         <!--        <field name="target">fullscreen</field>-->
         <field name="target">current</field>
         <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>
-        <field name="context">{'search_default_workcenter_id': active_id}</field>
+        <field name="context">{'search_default_product': 1, 'search_default_workcenter_id': active_id}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_workorder">
                 没有工单要做！

From 172e4209396d1a62ac740022294fe1c4b76ae1f8 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 28 Jun 2024 16:00:50 +0800
Subject: [PATCH 45/67] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E5=86=85=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 09270dae..ae25f8b7 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -19,7 +19,7 @@ from odoo.addons.sf_mrs_connect.models.ftp_operate import FtpController
 
 class ResMrpWorkOrder(models.Model):
     _inherit = 'mrp.workorder'
-    _order = 'sequence asc,create_date desc'
+    _order = 'id'
 
     product_tmpl_name = fields.Char('坯料产品名称', related='production_bom_id.bom_line_ids.product_id.name')
 

From 909230c1cc115a085aa7f2249881c466fb5bc822 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 28 Jun 2024 17:00:50 +0800
Subject: [PATCH 46/67] =?UTF-8?q?=E6=8E=92=E7=A8=8B=E5=8D=95=E7=94=98?=
 =?UTF-8?q?=E7=89=B9=E5=9B=BE=E7=95=8C=E9=9D=A2=E8=AE=A2=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?hover=E6=8F=90=E7=A4=BA=E4=B8=AD=E8=AE=A2=E5=8D=95=E4=BA=A4?=
 =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=E6=88=90=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_plan/views/view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 27949380..c3e18840 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -217,11 +217,11 @@
                                         </li>
                                         <li>
                                             <strong>订单交期:</strong>
-                                            <t t-out="order_deadline"/>
+                                            <t t-out="order_deadline.format('L LTS')"/>
                                         </li>
                                         <li>
                                             <strong>产品名称:</strong>
-                                            <t t-out="product_id"/>
+                                            <t t-out="product_id[1]"/>
                                         </li>
                                         <li>
                                             <strong>数量:</strong>

From 4a648fbd7ba5fe2d9236877c54988c092a0482a4 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Sun, 30 Jun 2024 11:45:52 +0800
Subject: [PATCH 47/67] =?UTF-8?q?1,=E4=BF=AE=E5=A4=8D=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=EF=BC=9A=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E5=BC=A0=E8=A3=85=E5=A4=B9=E5=B7=A5=E5=8D=95=E6=9C=AA=E5=B0=B1?=
 =?UTF-8?q?=E7=BB=AA=E6=98=AF=EF=BC=8C=E7=8A=B6=E6=80=81=E9=9C=80=E4=B8=BA?=
 =?UTF-8?q?=EF=BC=9A=E5=BE=85=E5=8A=A0=E5=B7=A5;=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=AE=8C=E6=88=90=E5=90=8E,=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E9=9C=80=E4=B8=BA=EF=BC=9A=E5=AE=8C=E6=88=90;2.?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=B8=AA=E4=BA=A7=E5=93=81=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E6=9C=AA=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=A4=9A=E4=B8=AA=E7=BC=96=E7=A8=8B=E5=8D=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=983.=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=9A=E5=8E=BB=E6=8E=89=E9=9D=9E=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5?=
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       |  9 +++++----
 sf_manufacturing/models/mrp_workorder.py        | 17 +----------------
 sf_manufacturing/models/stock.py                |  7 ++++---
 .../views/mrp_production_addional_change.xml    |  6 +++---
 sf_manufacturing/views/mrp_workorder_view.xml   |  5 +----
 6 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index 55036c8d..7496df0f 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -5,10 +5,10 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
         <field name="arch" type="xml">
-           <xpath expr="//header" position="inside">-->
-               <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",
-                                   ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>
-           </xpath>
+<!--           <xpath expr="//header" position="inside">&ndash;&gt;-->
+<!--               <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",-->
+<!--                                   ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>-->
+<!--           </xpath>-->
             <xpath expr="//page//field[@name='cnc_ids']" position="before">
                 <group>
                     <group>
@@ -17,8 +17,8 @@
                     </group>
                     <div>
                         <div>
-                            <field name="button_compensation_state" attrs='{"invisible": ["|",
-                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+<!--                            <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"-->
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index f2876350..c60eb5c3 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -102,7 +102,7 @@ class MrpProduction(models.Model):
             elif not production.workorder_ids and float_compare(production.qty_producing, production.product_qty,
                                                                 precision_rounding=production.product_uom_id.rounding) >= 0:
                 production.state = 'to_close'
-            elif any(wo_state in ('progress', 'done') for wo_state in production.workorder_ids.mapped('state')):
+            elif any(wo_state in ('progress') for wo_state in production.workorder_ids.mapped('state')):
                 production.state = 'progress'
             elif production.product_uom_id and not float_is_zero(production.qty_producing,
                                                                  precision_rounding=production.product_uom_id.rounding):
@@ -119,6 +119,10 @@ class MrpProduction(models.Model):
                 production.state = 'confirmed'
             # if production.schedule_state == '已完成':
             #     production.state = 'completed'
+            elif production.workorder_ids and production.workorder_ids[0].state == 'ready':
+                production.state = 'confirmed'
+            elif all(wo_state in ('done') for wo_state in production.workorder_ids.mapped('state')):
+                production.state = 'done'
             elif any(wo_state in ('progress', 'done') for wo_state in production.workorder_ids.mapped('state')):
                 production.state = 'progress'
             elif production.product_uom_id and not float_is_zero(production.qty_producing,
@@ -128,9 +132,6 @@ class MrpProduction(models.Model):
                                        precision_rounding=move.product_uom.rounding or move.product_id.uom_id.rounding)
                      for move in production.move_raw_ids):
                 production.state = 'progress'
-
-
-
             # if production.state == 'progress' and production.schedule_state == '已排' and production.process_state == '待装夹':
             #     # production.state = 'pending_processing'
             #     production.state = 'pending_cam'
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 09270dae..882510cf 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -136,11 +136,6 @@ class ResMrpWorkOrder(models.Model):
 
     supplier_id = fields.Many2one('res.partner', string='外协供应商')
     equipment_id = fields.Many2one('maintenance.equipment', string='加工设备', tracking=True)
-    is_ok = fields.Boolean(string='是否合格')
-    # 加工人
-    processing_user_id = fields.Many2one('res.users', string='加工人')
-    # 检测人
-    inspection_user_id = fields.Many2one('res.users', string='检测人')
     # 保存名称
     save_name = fields.Char(string='检测文件保存名称', compute='_compute_save_name')
     # 获取数据状态
@@ -234,16 +229,6 @@ class ResMrpWorkOrder(models.Model):
         ids = [t[0] for t in self.env.cr.fetchall()]
         return [('id', 'in', ids)]
 
-    @api.onchange('is_ok')
-    def _onchange_inspection_user_id(self):
-        """
-        检测is_ok(是否合格)被修改的话，就将当前用户赋值给inspection_user_id
-        """
-        if not self.inspection_user_id:
-            self.inspection_user_id = self.env.user.id
-        else:
-            self.inspection_user_id = False
-
     @api.onchange('functional_fixture_id')
     def _onchange_functional_fixture_id(self):
         if self.functional_fixture_id:
@@ -1036,7 +1021,7 @@ class ResMrpWorkOrder(models.Model):
                     if raw_move:
                         raw_move.write({'state': 'done'})
                 record.production_id.button_mark_done1()
-                record.production_id.state = 'done'
+                # record.production_id.state = 'done'
 
     # 将FTP的检测报告文件下载到临时目录
     def download_reportfile_tmp(self, workorder, reportpath):
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index ee24b72c..08350af2 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -261,13 +261,14 @@ class StockRule(models.Model):
                         'product_id': production.product_id.id,
                         'state': 'draft',
                     })
-            grouped_product_ids = {k: list(g) for k, g in groupby(productions, key=lambda x: x.product_id.id)}
+            all_production = productions
+            grouped_product_ids = {k: list(g) for k, g in groupby(all_production, 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():
+            for product_id, all_production in grouped_product_ids.items():
                 # 为同一个product_id创建一个生产订单名称列表
-                product_id_to_production_names[product_id] = [production.name for production in productions]
+                product_id_to_production_names[product_id] = [production.name for production in all_production]
             for production_item in productions:
                 if production_item.product_id.id in product_id_to_production_names:
                     #     # 同一个产品多个制造订单对应一个编程单和模型库
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index e0cddf21..3b27170f 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -5,7 +5,7 @@
             <field name="name">custom.mrp.production.tree</field>
             <field name="model">mrp.production</field>
             <field name="inherit_id" ref="mrp.mrp_production_tree_view"/>
-            <field name="arch" type="xml">
+            <field name="arch" type="xml">product_uom_category_id
                 <xpath expr="//field[@name='product_id']" position="replace"/>
                 <xpath expr="//field[@name='product_qty']" position="replace"/>
                 <xpath expr="//field[@name='product_uom_id']" position="replace"/>
@@ -281,9 +281,9 @@
             <field name="arch" type="xml">
                 <xpath expr="//tree//button[@name='button_start']" position="replace">
                     <field name="routing_type" invisible="True"/>
-                    <button name="button_start" type="object" string="开始" class="btn-success"
+                    <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始?"
                             attrs="{'invisible': ['|', '|', '|','|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False), ('routing_type', '=', 'CNC加工')]}"
-                            groups="sf_base.group_sf_mrp_user" confirm="是否确认开始?"/>
+                            groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='button_pending']" position="replace">
                     <button name="button_pending" type="object" string="Pause" class="btn-warning"
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 196e019b..30f6ffa4 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -183,7 +183,7 @@
                 </page>
             </xpath>
             <xpath expr="//label[1]" position="before">
-                <field name='routing_type'/>
+                <field name='routing_type' readonly="1"/>
                 <field name='process_state' attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
             </xpath>
             <xpath expr="//label[1]" position="attributes">
@@ -575,9 +575,6 @@
                 </div>
             </xpath>
             <xpath expr="//form//sheet//group//group//div[3]" position="after">
-                <field name="is_ok" attrs='{"invisible": [("routing_type","=","装夹预调")]}'/>
-                <field name="processing_user_id" attrs='{"invisible": [("routing_type","=","装夹预调")]}'/>
-                <field name="inspection_user_id" attrs='{"invisible": [("routing_type","=","装夹预调")]}'/>
                 <field name="save_name" widget="CopyClipboardChar"
                        attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
                 <label for="material_length" string="物料尺寸"/>

From 56adaddefcf7241bbf52eaeb37ea862d0579b25a Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Sun, 30 Jun 2024 12:01:48 +0800
Subject: [PATCH 48/67] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B2.?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95rfid=E6=8E=92=E6=94=BE?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     |  3 +-
 .../views/mrp_production_addional_change.xml  |  2 +-
 sf_manufacturing/views/mrp_workorder_view.xml | 37 +++++--------------
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index c60eb5c3..544f6587 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -53,7 +53,8 @@ class MrpProduction(models.Model):
     active = fields.Boolean(string='已归档', default=True)
     programming_no = fields.Char('编程单号')
     work_state = fields.Char('业务状态')
-    programming_state = fields.Char('编程状态', tracking=True)
+    programming_state = fields.Selection(
+        [('编程中', '编程中'), ('已编程', '已编程')], string='编程状态', tracking=True)
     glb_file = fields.Binary("glb模型文件")
     production_line_id = fields.Many2one('sf.production.line', string='生产线', tracking=True)
     plan_start_processing_time = fields.Datetime('计划开始加工时间')
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 3b27170f..889830eb 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -78,7 +78,7 @@
                     <field name="programming_no" readonly="1"/>
                     <field name="work_state" invisible="1"/>
                     <field name="schedule_state" invisible='1'/>
-                    <field name="programming_state" readonly="1"/>
+                    <field name="programming_state" readonly="1" options="{'classes': { '编程中':'primary','已编程':'warning'}}"/>
                     <field name="manual_quotation" readonly="1"/>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="before">
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 30f6ffa4..93725221 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","!=","切割")]}'>
@@ -185,6 +185,9 @@
             <xpath expr="//label[1]" position="before">
                 <field name='routing_type' readonly="1"/>
                 <field name='process_state' attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
+                <field name="rfid_code" force_save="1" readonly="1" cache="True"
+                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
+                <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
             </xpath>
             <xpath expr="//label[1]" position="attributes">
                 <attribute name="string">计划加工时间</attribute>
@@ -239,23 +242,6 @@
                 <!--                <field name="processing_panel" readonly="1" attrs="{'invisible': [('routing_type', 'in', ('获取CNC加工程序','装夹','解除装夹',-->
                 <!--                '前置三元定位检测','后置三元质量检测','解除装夹'))]}"/>-->
             </field>
-
-            <xpath expr="//page[1]" position="before">
-                <page string="获取CNC加工程序" attrs='{"invisible": [("routing_type","!=","获取CNC加工程序")]}'>
-                    <group>
-                        <field name="programming_no" readonly="1"
-                               attrs='{"invisible": [("programming_no","=",False)]}'/>
-                        <field name="programming_state" readonly="1"
-                               attrs='{"invisible": [("programming_no","=",False)]}'/>
-                    </group>
-                    <!--                    <group>-->
-                    <!--                        <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">-->
-                    <!--                            <button type="object" class="oe_highlight" name="fetchCNC" string="获取CNC程序代码"-->
-                    <!--                            />-->
-                    <!--                        </div>-->
-                    <!--                    </group>-->
-                </page>
-            </xpath>
             <!--            <page string="Components" name="components">-->
             <xpath expr="//page[1]" position="before">
                 <!--                <page string="装夹托盘" attrs='{"invisible": [("routing_type","!=","装夹")]}'>-->
@@ -589,9 +575,6 @@
                     <field name="material_height" class="o_address_zip"/>
                 </div>
                 <field name="part_number" string="成品的零件图号"/>
-                <field name="rfid_code" force_save="1" readonly="1" cache="True"
-                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
-                <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
             </xpath>
         </field>
     </record>
@@ -726,7 +709,7 @@
             </search>
         </field>
     </record>
-、
+    、
     <record id="sf_workpiece_delivery_act" model="ir.actions.act_window">
         <field name="name">工件配送</field>
         <field name="res_model">sf.workpiece.delivery</field>

From b23cb9af6efafa1836d24ce92d163e5bd9116321 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Sun, 30 Jun 2024 12:09:09 +0800
Subject: [PATCH 49/67] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_production_addional_change.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 889830eb..11dbcede 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -78,7 +78,8 @@
                     <field name="programming_no" readonly="1"/>
                     <field name="work_state" invisible="1"/>
                     <field name="schedule_state" invisible='1'/>
-                    <field name="programming_state" readonly="1" options="{'classes': { '编程中':'primary','已编程':'warning'}}"/>
+                    <field name="programming_state" readonly="1" decoration-success="programming_state == '已编程'"
+                           decoration-warning="programming_state =='编程中'"/>
                     <field name="manual_quotation" readonly="1"/>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="before">

From 1b174c5805437db3730343a551f34bb17a4d2fa4 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Sun, 30 Jun 2024 14:41:38 +0800
Subject: [PATCH 50/67] Merge branch 'develop' of
 https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

---
 .../views/mrp_production_addional_change.xml         | 12 +++++++-----
 sf_manufacturing/views/mrp_workorder_view.xml        |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 11dbcede..efab7e2d 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -5,7 +5,7 @@
             <field name="name">custom.mrp.production.tree</field>
             <field name="model">mrp.production</field>
             <field name="inherit_id" ref="mrp.mrp_production_tree_view"/>
-            <field name="arch" type="xml">product_uom_category_id
+            <field name="arch" type="xml">
                 <xpath expr="//field[@name='product_id']" position="replace"/>
                 <xpath expr="//field[@name='product_qty']" position="replace"/>
                 <xpath expr="//field[@name='product_uom_id']" position="replace"/>
@@ -75,12 +75,12 @@
 
                 </xpath>
                 <xpath expr="//sheet//group//group//div[3]" position="after">
+                    <field name="manual_quotation" readonly="1"/>
                     <field name="programming_no" readonly="1"/>
-                    <field name="work_state" invisible="1"/>
-                    <field name="schedule_state" invisible='1'/>
                     <field name="programming_state" readonly="1" decoration-success="programming_state == '已编程'"
                            decoration-warning="programming_state =='编程中'"/>
-                    <field name="manual_quotation" readonly="1"/>
+                    <field name="work_state" invisible="1"/>
+                    <field name="schedule_state" invisible='1'/>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="before">
                     <field name="plan_start_processing_time" readonly="1"/>
@@ -283,7 +283,9 @@
                 <xpath expr="//tree//button[@name='button_start']" position="replace">
                     <field name="routing_type" invisible="True"/>
                     <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始?"
-                            attrs="{'invisible': ['|', '|', '|','|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False), ('routing_type', '=', 'CNC加工')]}"
+                            attrs="{'invisible': ['|', '|', '|','|', ('production_state','in', ('draft', 'done', 'cancel')),
+                    ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=',
+                    False), ('routing_type', '=', 'CNC加工')]}"
                             groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
                 <xpath expr="//tree//button[@name='button_pending']" position="replace">
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 5d23cb7c..dc5b4a56 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -136,7 +136,7 @@
                 <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','progress'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
                 <!--                         groups="sf_base.group_sf_mrp_user" confirm="是否确认完工"/> -->
 
-                <button name="button_start" type="object" string="开始" class="btn-success"
+                <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"
                         attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False)]}"/>
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>

From fd3a363bf67e6f7ff90accbbad7762b40365c566 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Sun, 30 Jun 2024 16:51:40 +0800
Subject: [PATCH 51/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E5=A4=96?=
 =?UTF-8?q?=E5=8D=8F=E5=8D=95=E5=92=8C=E7=A8=8B=E5=BA=8F=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py   | 14 +--
 sf_manufacturing/models/product_template.py |  4 +-
 sf_manufacturing/models/stock.py            | 50 +++++------
 sf_mrs_connect/controllers/controllers.py   | 95 +++++++++++++--------
 sf_sale/models/quick_easy_order.py          |  4 +-
 sf_sale/models/quick_easy_order_old.py      |  4 +-
 6 files changed, 99 insertions(+), 72 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 544f6587..afebc618 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -359,6 +359,7 @@ class MrpProduction(models.Model):
                 # 表面工艺工序
                 # 获取表面工艺id
                 if production.product_id.model_process_parameters_ids:
+                    logging.info('model_process_parameters_ids:%s' % production.product_id.model_process_parameters_ids)
                     surface_technics_arr = []
                     # 工序id
                     route_workcenter_arr = []
@@ -373,6 +374,7 @@ class MrpProduction(models.Model):
                         # 用filter刷选表面工艺id'是否存在工艺类别对象里
                         if production_process_category:
                             for p in production_process_category:
+                                logging.info('production_process_category:%s' % p.name)
                                 production_process = p.production_process_ids.filtered(
                                     lambda pp: pp.id in surface_technics_arr)
                                 if production_process:
@@ -426,7 +428,7 @@ class MrpProduction(models.Model):
                     else:
                         if m == len(consecutive_workorders) - 1 and m != 0:
                             self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
-                                                                                 production_item)
+                                                                                 production)
                             if sorted_workorders[i] in consecutive_workorders:
                                 is_pick = True
                             consecutive_workorders = []
@@ -434,21 +436,21 @@ class MrpProduction(models.Model):
                         # 当前面的连续工序生成对应的外协出入库单再生成当前工序的外协出入库单
                         if is_pick is False:
                             self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i],
-                                                                                 production_item)
+                                                                                 production)
                     if m == len(consecutive_workorders) - 1 and m != 0:
                         self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
-                                                                             production_item)
+                                                                             production)
                         if sorted_workorders[i] in consecutive_workorders:
                             is_pick = True
                         consecutive_workorders = []
                         m = 0
                 if m == len(consecutive_workorders) - 1 and m != 0:
-                    self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production_item)
+                    self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production)
                 if is_pick is False and m == 0:
                     if len(sorted_workorders) == 1:
-                        self.env['stock.picking'].create_outcontract_picking(sorted_workorders, production_item)
+                        self.env['stock.picking'].create_outcontract_picking(sorted_workorders, production)
                     else:
-                        self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i], production_item)
+                        self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i], production)
             for workorder in production.workorder_ids:
                 workorder.duration_expected = workorder._get_duration_expected()
 
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index cea53c64..71522528 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 08350af2..57338f84 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
@@ -261,30 +261,30 @@ class StockRule(models.Model):
                         'product_id': production.product_id.id,
                         'state': 'draft',
                     })
-            all_production = productions
-            grouped_product_ids = {k: list(g) for k, g in groupby(all_production, key=lambda x: x.product_id.id)}
-            # 初始化一个字典来存储每个product_id对应的生产订单名称列表
-            product_id_to_production_names = {}
-            # 对于每个product_id，获取其所有生产订单的名称
-            for product_id, all_production in grouped_product_ids.items():
-                # 为同一个product_id创建一个生产订单名称列表
-                product_id_to_production_names[product_id] = [production.name for production in all_production]
-            for production_item in productions:
-                if production_item.product_id.id in product_id_to_production_names:
-                    #     # 同一个产品多个制造订单对应一个编程单和模型库
-                    #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
-                    if not production_item.programming_no:
-                        production_programming = self.env['mrp.production'].search(
-                            [('product_id.id', '=', production_item.product_id.id),
-                             ('origin', '=', production_item.origin)],
-                            limit=1, order='id asc')
-                        if not production_programming.programming_no:
-                            production_item.fetchCNC(
-                                ', '.join(product_id_to_production_names[production_item.product_id.id]))
-                        else:
-                            production_item.write({'programming_no': production_programming.programming_no,
-                                                   'programming_state': '编程中'})
-        return True
+        #     all_production = productions
+        #     grouped_product_ids = {k: list(g) for k, g in groupby(all_production, key=lambda x: x.product_id.id)}
+        #     # 初始化一个字典来存储每个product_id对应的生产订单名称列表
+        #     product_id_to_production_names = {}
+        #     # 对于每个product_id，获取其所有生产订单的名称
+        #     for product_id, all_production in grouped_product_ids.items():
+        #         # 为同一个product_id创建一个生产订单名称列表
+        #         product_id_to_production_names[product_id] = [production.name for production in all_production]
+        #     for production_item in productions:
+        #         if production_item.product_id.id in product_id_to_production_names:
+        #             #     # 同一个产品多个制造订单对应一个编程单和模型库
+        #             #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
+        #             if not production_item.programming_no:
+        #                 production_programming = self.env['mrp.production'].search(
+        #                     [('product_id.id', '=', production_item.product_id.id),
+        #                      ('origin', '=', production_item.origin)],
+        #                     limit=1, order='id asc')
+        #                 if not production_programming.programming_no:
+        #                     production_item.fetchCNC(
+        #                         ', '.join(product_id_to_production_names[production_item.product_id.id]))
+        #                 else:
+        #                     production_item.write({'programming_no': production_programming.programming_no,
+        #                                            'programming_state': '编程中'})
+        # return True
 
 
 class ProductionLot(models.Model):
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 4666fd99..13e5ee5b 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -28,7 +28,7 @@ class Sf_Mrs_Connect(http.Controller):
                 request.env.ref("base.user_admin")).search(
                 [('programming_no', '=', ret['programming_no'])])
             if productions:
-                # 拉取所有加工面的程序文件
+                # # 拉取所有加工面的程序文件
                 for r in ret['processing_panel'].split(','):
                     program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
                     if os.path.exists(program_path_tmp_r):
@@ -48,40 +48,65 @@ class Sf_Mrs_Connect(http.Controller):
                     if not production.workorder_ids:
                         production.product_id.model_processing_panel = ret['processing_panel']
                         production._create_workorder(ret)
-                    else:
-                        for panel in ret['processing_panel'].split(','):
-                            # 查询状态为进行中且工序类型为CNC加工的工单
-                            cnc_workorder = production.workorder_ids.filtered(
-                                lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done',
-                                                                                             'cancel'] and ac.processing_panel == panel)
-                            if cnc_workorder:
-                                if cnc_workorder.cnc_ids:
-                                    cnc_workorder.cmm_ids.sudo().unlink()
-                                    cnc_workorder.cnc_ids.sudo().unlink()
-                                    request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
-                                        production)
-                                # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
-                                #                                       panel)
-                                program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
-                                logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
-                                files_panel = os.listdir(program_path_tmp_panel)
-                                if files_panel:
-                                    for file in files_panel:
-                                        file_extension = os.path.splitext(file)[1]
-                                        logging.info('file_extension:%s' % file_extension)
-                                        if file_extension.lower() == '.pdf':
-                                            panel_file_path = os.path.join(program_path_tmp_panel, file)
-                                            logging.info('panel_file_path:%s' % panel_file_path)
-                                cnc_workorder.write(
-                                    {'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(
-                                    lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done',
-                                                                                                  'cancel'] and ap.processing_panel == panel)
-                                if pre_workorder:
-                                    pre_workorder.write(
-                                        {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
+                    # else:
+                    #     for panel in ret['processing_panel'].split(','):
+                    #         # 查询状态为进行中且工序类型为CNC加工的工单
+                    #         cnc_workorder = production.workorder_ids.filtered(
+                    #             lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done',
+                    #                                                                          'cancel'] and ac.processing_panel == panel)
+                    #         if cnc_workorder:
+                    #             if cnc_workorder.cnc_ids:
+                    #                 cnc_workorder.cmm_ids.sudo().unlink()
+                    #                 cnc_workorder.cnc_ids.sudo().unlink()
+                    #                 request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
+                    #                     production)
+                    #             # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
+                    #             #                                       panel)
+                    #             program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
+                    #             logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
+                    #             files_panel = os.listdir(program_path_tmp_panel)
+                    #             if files_panel:
+                    #                 for file in files_panel:
+                    #                     file_extension = os.path.splitext(file)[1]
+                    #                     logging.info('file_extension:%s' % file_extension)
+                    #                     if file_extension.lower() == '.pdf':
+                    #                         panel_file_path = os.path.join(program_path_tmp_panel, file)
+                    #                         logging.info('panel_file_path:%s' % panel_file_path)
+                    #             cnc_workorder.write(
+                    #                 {'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(
+                    #                 lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done',
+                    #                                                                               'cancel'] and ap.processing_panel == panel)
+                    #             if pre_workorder:
+                    #                 pre_workorder.write(
+                    #                     {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
+                    for panel in ret['processing_panel'].split(','):
+                        # 查询状态为进行中且工序类型为CNC加工的工单
+                        cnc_workorder = production.workorder_ids.filtered(
+                            lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done',
+                                                                                         'cancel'] and ac.processing_panel == panel)
+                        if cnc_workorder:
+                            # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
+                            #                                       panel)
+                            program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
+                            logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
+                            files_panel = os.listdir(program_path_tmp_panel)
+                            if files_panel:
+                                for file in files_panel:
+                                    file_extension = os.path.splitext(file)[1]
+                                    logging.info('file_extension:%s' % file_extension)
+                                    if file_extension.lower() == '.pdf':
+                                        panel_file_path = os.path.join(program_path_tmp_panel, file)
+                                        logging.info('panel_file_path:%s' % panel_file_path)
+                            cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
+                            pre_workorder = production.workorder_ids.filtered(
+                                lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done',
+                                                                                              'cancel'] and ap.processing_panel == panel)
+                            if pre_workorder:
+                                pre_workorder.write(
+                                    {'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 e3bf3002..11acc06f 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 3ae65db3..92f6cda2 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

From e124560089ac1d6a4cfcc50addf299e62814801a Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Sun, 30 Jun 2024 17:52:02 +0800
Subject: [PATCH 52/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E5=A4=96?=
 =?UTF-8?q?=E5=8D=8F=E5=8D=95=E5=92=8C=E7=A8=8B=E5=BA=8F=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/stock.py          | 52 +++++++++++------------
 sf_mrs_connect/controllers/controllers.py | 50 +++++++++++-----------
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 57338f84..2f49344e 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -204,14 +204,14 @@ class StockRule(models.Model):
             productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
                 productions_values)
 
-            # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
+            self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
 
             '''
             创建工单
             '''
             # 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
@@ -261,30 +261,30 @@ class StockRule(models.Model):
                         'product_id': production.product_id.id,
                         'state': 'draft',
                     })
-        #     all_production = productions
-        #     grouped_product_ids = {k: list(g) for k, g in groupby(all_production, key=lambda x: x.product_id.id)}
-        #     # 初始化一个字典来存储每个product_id对应的生产订单名称列表
-        #     product_id_to_production_names = {}
-        #     # 对于每个product_id，获取其所有生产订单的名称
-        #     for product_id, all_production in grouped_product_ids.items():
-        #         # 为同一个product_id创建一个生产订单名称列表
-        #         product_id_to_production_names[product_id] = [production.name for production in all_production]
-        #     for production_item in productions:
-        #         if production_item.product_id.id in product_id_to_production_names:
-        #             #     # 同一个产品多个制造订单对应一个编程单和模型库
-        #             #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
-        #             if not production_item.programming_no:
-        #                 production_programming = self.env['mrp.production'].search(
-        #                     [('product_id.id', '=', production_item.product_id.id),
-        #                      ('origin', '=', production_item.origin)],
-        #                     limit=1, order='id asc')
-        #                 if not production_programming.programming_no:
-        #                     production_item.fetchCNC(
-        #                         ', '.join(product_id_to_production_names[production_item.product_id.id]))
-        #                 else:
-        #                     production_item.write({'programming_no': production_programming.programming_no,
-        #                                            'programming_state': '编程中'})
-        # return True
+            all_production = productions
+            grouped_product_ids = {k: list(g) for k, g in groupby(all_production, key=lambda x: x.product_id.id)}
+            # 初始化一个字典来存储每个product_id对应的生产订单名称列表
+            product_id_to_production_names = {}
+            # 对于每个product_id，获取其所有生产订单的名称
+            for product_id, all_production in grouped_product_ids.items():
+                # 为同一个product_id创建一个生产订单名称列表
+                product_id_to_production_names[product_id] = [production.name for production in all_production]
+            for production_item in productions:
+                if production_item.product_id.id in product_id_to_production_names:
+                    #     # 同一个产品多个制造订单对应一个编程单和模型库
+                    #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
+                    if not production_item.programming_no:
+                        production_programming = self.env['mrp.production'].search(
+                            [('product_id.id', '=', production_item.product_id.id),
+                             ('origin', '=', production_item.origin)],
+                            limit=1, order='id asc')
+                        if not production_programming.programming_no:
+                            production_item.fetchCNC(
+                                ', '.join(product_id_to_production_names[production_item.product_id.id]))
+                        else:
+                            production_item.write({'programming_no': production_programming.programming_no,
+                                                   'programming_state': '编程中'})
+        return True
 
 
 class ProductionLot(models.Model):
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 13e5ee5b..f32dedea 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -82,31 +82,31 @@ class Sf_Mrs_Connect(http.Controller):
                     #             if pre_workorder:
                     #                 pre_workorder.write(
                     #                     {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
-                    for panel in ret['processing_panel'].split(','):
-                        # 查询状态为进行中且工序类型为CNC加工的工单
-                        cnc_workorder = production.workorder_ids.filtered(
-                            lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done',
-                                                                                         'cancel'] and ac.processing_panel == panel)
-                        if cnc_workorder:
-                            # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
-                            #                                       panel)
-                            program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
-                            logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
-                            files_panel = os.listdir(program_path_tmp_panel)
-                            if files_panel:
-                                for file in files_panel:
-                                    file_extension = os.path.splitext(file)[1]
-                                    logging.info('file_extension:%s' % file_extension)
-                                    if file_extension.lower() == '.pdf':
-                                        panel_file_path = os.path.join(program_path_tmp_panel, file)
-                                        logging.info('panel_file_path:%s' % panel_file_path)
-                            cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
-                            pre_workorder = production.workorder_ids.filtered(
-                                lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done',
-                                                                                              'cancel'] and ap.processing_panel == panel)
-                            if pre_workorder:
-                                pre_workorder.write(
-                                    {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
+                for panel in ret['processing_panel'].split(','):
+                    # 查询状态为进行中且工序类型为CNC加工的工单
+                    cnc_workorder = productions.workorder_ids.filtered(
+                        lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done',
+                                                                                     'cancel'] and ac.processing_panel == panel)
+                    if cnc_workorder:
+                        # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
+                        #                                       panel)
+                        program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
+                        logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
+                        files_panel = os.listdir(program_path_tmp_panel)
+                        if files_panel:
+                            for file in files_panel:
+                                file_extension = os.path.splitext(file)[1]
+                                logging.info('file_extension:%s' % file_extension)
+                                if file_extension.lower() == '.pdf':
+                                    panel_file_path = os.path.join(program_path_tmp_panel, file)
+                                    logging.info('panel_file_path:%s' % panel_file_path)
+                        cnc_workorder.write({'cnc_worksheet': base64.b64encode(open(panel_file_path, 'rb').read())})
+                        pre_workorder = productions.workorder_ids.filtered(
+                            lambda ap: ap.routing_type == '装夹预调' and ap.state not in ['done',
+                                                                                          'cancel'] and ap.processing_panel == panel)
+                        if pre_workorder:
+                            pre_workorder.write(
+                                {'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(

From 404a41294cd16bc17f8e68b4fa2214c360fe3bdf Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Sun, 30 Jun 2024 19:16:48 +0800
Subject: [PATCH 53/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E9=9D=A2?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=A4=96=E5=8D=8F=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py | 2 +-
 sf_manufacturing/models/mrp_workorder.py  | 4 +++-
 sf_manufacturing/models/stock.py          | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index afebc618..3a49c2fa 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -657,7 +657,7 @@ class MrpProduction(models.Model):
         for production in self:
             production.write({
                 'date_finished': fields.Datetime.now(),
-                'product_qty': production.qty_produced,
+                'product_qty': production.qty_produced if production.qty_produced < 1 else production.product_qty,
                 'priority': '0',
                 'is_locked': True,
                 'state': 'done',
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index f9e7bd80..ac0ab67a 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -202,6 +202,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)
 
     @api.onchange('rfid_code')
@@ -861,7 +862,7 @@ class ResMrpWorkOrder(models.Model):
                      ('location_dest_id', '=', self.env['stock.location'].search(
                          [('barcode', 'ilike', 'VL-SPOC')]).id),
                      ('origin', '=', self.production_id.name)])
-                purchase = self.env['purchase.order'].search([('origin', '=', self.production_id.name)])
+                purchase = self.env['purchase.order'].search([('origin', 'ilike', self.production_id.name)])
                 if purchase and move_out:
                     move_out.write({'state': 'assigned'})
                     self.env['stock.move.line'].create(move_out.get_move_line(purchase, self))
@@ -1010,6 +1011,7 @@ class ResMrpWorkOrder(models.Model):
                         workorder.rfid_code_old = rfid_code
                         workorder.rfid_code = ''
             if is_production_id is True and record.routing_type in ['解除装夹', '表面工艺']:
+                logging.info('product_qty:%s' % record.production_id.product_qty)
                 for move_raw_id in record.production_id.move_raw_ids:
                     move_raw_id.quantity_done = move_raw_id.product_uom_qty
                 record.process_state = '已完工'
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 2f49344e..9e826fb5 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

From e496555ff3624b3d95d4839ce7b33dd82b739a00 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Sun, 30 Jun 2024 19:29:36 +0800
Subject: [PATCH 54/67] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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_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

From 2ba9695c3429233ea8150c380d0c82eb1fac7618 Mon Sep 17 00:00:00 2001
From: hy <1298386937@qq.com>
Date: Mon, 1 Jul 2024 09:47:50 +0800
Subject: [PATCH 55/67] =?UTF-8?q?//=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=A6=86=E7=9B=96=E8=A1=A8=E5=A4=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_frontend/static/src/scss/custom_style.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index 7f11b5f5..0b6fb8bb 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -526,4 +526,8 @@ div:has(.o_required_modifier) > label::before {
 // 设置表单页面label文本不换行
 .o_form_view .o_group .o_wrap_label .o_form_label {
   white-space: nowrap;
+}
+// 修复表格内容覆盖表头bug
+.o_list_renderer .o_list_table tbody th {
+  position: unset;
 }
\ No newline at end of file

From 726c3aede1a20397ea3e1613912376115d36daf0 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 1 Jul 2024 09:52:16 +0800
Subject: [PATCH 56/67] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=89=AB=E6=8F=8F=E7=BB=91=E5=AE=9A=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 09270dae..e670442f 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1266,6 +1266,7 @@ class SfWorkOrderBarcodes(models.Model):
     _inherit = ["mrp.workorder", "barcodes.barcode_events_mixin"]
 
     def on_barcode_scanned(self, barcode):
+        logging.info('Rfid:%s' % barcode)
         workorder = self.env['mrp.workorder'].browse(self.ids)
         # workorder_preset = self.env['mrp.workorder'].search(
         #     [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)])
@@ -1309,7 +1310,7 @@ class SfWorkOrderBarcodes(models.Model):
                     self.process_state = '待检测'
                     self.date_start = datetime.now()
                 else:
-                    raise UserError('该托盘信息不存在！！！')
+                    raise UserError('没有找到Rfid为【%s】的托盘信息！！！' % barcode)
                 # stock_move_line = self.env['stock.move.line'].search([('lot_name', '=', barcode)])
                 # if stock_move_line.product_id.categ_type == '夹具':
                 #     workorder.write({

From 4c66d86ee6df637db52d9f4a542f8e8542a6e4fe Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 1 Jul 2024 10:47:05 +0800
Subject: [PATCH 57/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E9=9D=A2?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py |  5 ++--
 sf_manufacturing/models/stock.py         | 35 ++++++++++++------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index ac0ab67a..e1060409 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -862,10 +862,9 @@ class ResMrpWorkOrder(models.Model):
                      ('location_dest_id', '=', self.env['stock.location'].search(
                          [('barcode', 'ilike', 'VL-SPOC')]).id),
                      ('origin', '=', self.production_id.name)])
-                purchase = self.env['purchase.order'].search([('origin', 'ilike', self.production_id.name)])
-                if purchase and move_out:
+                if move_out:
                     move_out.write({'state': 'assigned'})
-                    self.env['stock.move.line'].create(move_out.get_move_line(purchase, self))
+                    self.env['stock.move.line'].create(move_out.get_move_line(self.production_id, self))
 
                 # move_out._action_assign()
         if self.state == 'waiting' or self.state == 'ready' or self.state == 'progress':
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 9e826fb5..9234060f 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -487,10 +487,10 @@ class StockPicking(models.Model):
              ('location_dest_id', '=', self.env['stock.location'].search(
                  [('barcode', 'ilike', 'VL-SPOC')]).id),
              ('origin', '=', self.origin)])
-        if self.id == move_out.picking_id.id:
-            if move_out.move_line_ids.workorder_id.state not in ['progress']:
-                raise UserError(
-                    _('该出库单里源单据内的单号为%s的工单还未开始，不能进行验证操作！' % move_out.move_line_ids.workorder_id.name))
+        # if self.id == move_out.picking_id.id:
+        #     if move_out.move_line_ids.workorder_id.state not in ['progress']:
+        #         raise UserError(
+        #             _('该出库单里源单据内的单号为%s的工单还未开始，不能进行验证操作！' % move_out.move_line_ids.workorder_id.name))
         # 入库单验证
         move_in = self.env['stock.move'].search(
             [('location_dest_id', '=', self.env['stock.location'].search(
@@ -506,18 +506,17 @@ class StockPicking(models.Model):
         res = super().button_validate()
         if res is True:
             if self.id == move_out.picking_id.id:
-                if move_out.move_line_ids.workorder_id.state == 'progress':
-                    move_in = self.env['stock.move'].search(
-                        [('location_dest_id', '=', self.env['stock.location'].search(
-                            [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
-                         ('location_id', '=', self.env['stock.location'].search(
-                             [('barcode', 'ilike', 'VL-SPOC')]).id),
-                         ('origin', '=', self.origin)])
-                    # purchase = self.env['purchase.order'].search([('origin', '=', self.origin)])
-                    if move_in:
-                        move_in.write({'state': 'assigned'})
-                        purchase = self.env['purchase.order'].search([('origin', '=', self.origin)])
-                        self.env['stock.move.line'].create(move_in.get_move_line(purchase, None))
+                # if move_out.move_line_ids.workorder_id.state == 'progress':
+                move_in = self.env['stock.move'].search(
+                    [('location_dest_id', '=', self.env['stock.location'].search(
+                        [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
+                     ('location_id', '=', self.env['stock.location'].search(
+                         [('barcode', 'ilike', 'VL-SPOC')]).id),
+                     ('origin', '=', self.origin)])
+                production = self.env['mrp.production'].search([('name', '=', self.origin)])
+                if move_in:
+                    move_in.write({'state': 'assigned'})
+                    self.env['stock.move.line'].create(move_in.get_move_line(production, None))
 
         return res
 
@@ -599,7 +598,7 @@ class ReStockMove(models.Model):
             'state': 'confirmed',
         }
 
-    def get_move_line(self, purchase, sorted_workorders):
+    def get_move_line(self, production_id, sorted_workorders):
         return {
             'move_id': self.id,
             'product_id': self.product_id.id,
@@ -608,7 +607,7 @@ class ReStockMove(models.Model):
             'location_dest_id': self.picking_id.location_dest_id.id,
             'picking_id': self.picking_id.id,
             'reserved_uom_qty': 1.0,
-            'lot_id': purchase.picking_ids.move_line_ids.lot_id.id,
+            'lot_id': production_id.move_line_raw_ids.lot_id.id,
             'company_id': self.company_id.id,
             # 'workorder_id': '' if not sorted_workorders else sorted_workorders.id,
             # 'production_id': '' if not sorted_workorders else sorted_workorders.production_id.id,

From ee1629b40a56768391a5a6b8277d555d8b38c8e1 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 1 Jul 2024 11:47:51 +0800
Subject: [PATCH 58/67] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/models/jd_eclp.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py
index bdcfba47..744bb6d1 100644
--- a/sf_bf_connect/models/jd_eclp.py
+++ b/sf_bf_connect/models/jd_eclp.py
@@ -161,7 +161,9 @@ class JdEclp(models.Model):
         url2 = config['bfm_url'] + '/api/get/jd/no'
         response = requests.post(url2, json=json2, data=None)
         # _logger.info('调用成功2', response.json()['result']['wbNo'])
-        self.carrier_tracking_ref = response.json()['result']['wbNo']
+        self.carrier_tracking_ref = response.json()['result'].get('wbNo')
+        if not self.carrier_tracking_ref:
+            raise ValidationError('物流下单未成功，请联系管理员')
         self.is_bill = True
         self.logistics_status = '1'
 
@@ -173,8 +175,10 @@ class JdEclp(models.Model):
                 'type': 'success',
                 'message': '物流下单成功',
                 'sticky': False,
+                'next': {'type': 'ir.actions.client', 'tag': 'soft_reload'}
             }
         }
+
         return notification
 
     def get_bill(self):

From 1e5f26d645f58e08ad8666dcf235d9412a58f7cc Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 1 Jul 2024 15:29:55 +0800
Subject: [PATCH 59/67] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E5=92=8C=E7=BB=93=E6=9D=9F=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?rfid=5Fcode=E4=B8=8D=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/controllers/controllers.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index afb3681c..3b2a8682 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -162,7 +162,8 @@ class Manufacturing_Connect(http.Controller):
             routing_type = ret['CraftId']
             equipment_id = ret["DeviceId"]
             workorder = request.env['mrp.workorder'].sudo().search(
-                [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1)
+                [('production_id', '=', production_id), ('routing_type', '=', routing_type),
+                 ('rfid_code', '!=', False)], limit=1)
             if not workorder:
                 res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单不存在'}
                 return json.JSONEncoder().encode(res)
@@ -209,7 +210,8 @@ class Manufacturing_Connect(http.Controller):
             production_id = ret['BillId']
             routing_type = ret['CraftId']
             workorder = request.env['mrp.workorder'].sudo().search(
-                [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1)
+                [('production_id', '=', production_id), ('routing_type', '=', routing_type),
+                 ('rfid_code', '!=', False)], limit=1)
             if not workorder:
                 res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单不存在'}
                 return json.JSONEncoder().encode(res)

From c4621d36a3f17dbc72f50bebfd9f4a238d8002d7 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 1 Jul 2024 16:56:19 +0800
Subject: [PATCH 60/67] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     | 52 ++++---------------
 .../views/mrp_production_addional_change.xml  |  2 +-
 2 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 3a49c2fa..7464886d 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -30,13 +30,10 @@ class MrpProduction(models.Model):
     #     ('completed', '已完工')
     # ])
     state = fields.Selection([
-        ('draft', '待排程'),
-        ('confirmed', '待加工'),
+        ('draft', '草稿'),
+        ('confirmed', '待排程'),
+        ('pending_cam', '待加工'),
         ('progress', '加工中'),
-        # ('pending_cam', '待装夹'),
-        # ('pending_processing', '待加工'),
-        # ('pending_era_cam', '待解除装夹'),
-        ('completed', '已完工'),
         ('to_close', 'To Close'),
         ('done', 'Done'),
         ('cancel', 'Cancelled')], string='State',
@@ -82,7 +79,7 @@ class MrpProduction(models.Model):
 
     @api.depends(
         'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state',
-        'workorder_ids.state', 'product_qty', 'qty_producing', 'schedule_state', 'process_state')
+        'workorder_ids.state', 'product_qty', 'qty_producing', 'schedule_state')
     def _compute_state(self):
         for production in self:
             if not production.state or not production.product_uom_id:
@@ -103,27 +100,6 @@ class MrpProduction(models.Model):
             elif not production.workorder_ids and float_compare(production.qty_producing, production.product_qty,
                                                                 precision_rounding=production.product_uom_id.rounding) >= 0:
                 production.state = 'to_close'
-            elif any(wo_state in ('progress') for wo_state in production.workorder_ids.mapped('state')):
-                production.state = 'progress'
-            elif production.product_uom_id and not float_is_zero(production.qty_producing,
-                                                                 precision_rounding=production.product_uom_id.rounding):
-                production.state = 'progress'
-            elif any(not float_is_zero(move.quantity_done,
-                                       precision_rounding=move.product_uom.rounding or move.product_id.uom_id.rounding)
-                     for move in production.move_raw_ids):
-                production.state = 'progress'
-
-            # 新添加的状态逻辑
-            if production.state == 'to_close' and production.schedule_state == '未排':
-                production.state = 'draft'
-            elif production.state == 'to_close' and production.schedule_state == '已排':
-                production.state = 'confirmed'
-            # if production.schedule_state == '已完成':
-            #     production.state = 'completed'
-            elif production.workorder_ids and production.workorder_ids[0].state == 'ready':
-                production.state = 'confirmed'
-            elif all(wo_state in ('done') for wo_state in production.workorder_ids.mapped('state')):
-                production.state = 'done'
             elif any(wo_state in ('progress', 'done') for wo_state in production.workorder_ids.mapped('state')):
                 production.state = 'progress'
             elif production.product_uom_id and not float_is_zero(production.qty_producing,
@@ -131,20 +107,14 @@ class MrpProduction(models.Model):
                 production.state = 'progress'
             elif any(not float_is_zero(move.quantity_done,
                                        precision_rounding=move.product_uom.rounding or move.product_id.uom_id.rounding)
-                     for move in production.move_raw_ids):
+                     for move in production.move_raw_ids if move.product_id):
                 production.state = 'progress'
-            # if production.state == 'progress' and production.schedule_state == '已排' and production.process_state == '待装夹':
-            #     # production.state = 'pending_processing'
-            #     production.state = 'pending_cam'
-            # if production.state == 'progress' and production.schedule_state == '已排' and production.process_state == '待加工':
-            #     # if production.state == 'pending_cam' and production.process_state == '待加工':
-            #     production.state = 'pending_processing'
-            # elif production.state == 'progress' and production.process_state == '待解除装夹':
-            #     production.state = 'pending_era_cam'
-            # elif production.state == 'progress' and production.process_state == '已完工':
-            #     production.state = 'completed'
-            # elif production.state == 'progress' and production.work_order_state == '已完成':
-            #     production.state = 'completed'
+
+            # # 新添加的状态逻辑
+            if production.state == 'to_close' and production.schedule_state == '未排':
+                production.state = 'confirmed'
+            elif production.state == 'to_close' and production.schedule_state == '已排':
+                production.state = 'pending_cam'
 
     def action_check(self):
         """
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index efab7e2d..b65dfb2f 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -65,7 +65,7 @@
                     <!--                     <attribute name="statusbar_visible">draft,confirmed,progress,pending_processing,completed,done -->
                     <!--                     </attribute>                -->
                     <attribute name="statusbar_visible">
-                        draft,confirmed,progress,completed,done
+                        confirmed,pending_cam,progress,done
                     </attribute>
                 </xpath>
                 <xpath expr="//sheet//group//group[2]//label" position="before">

From 46e3a23492a904bd85dbc60bf4f28f8d7e8d4fea Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 1 Jul 2024 17:11:34 +0800
Subject: [PATCH 61/67] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=A3=E7=BB=91rfid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_dlm_management/views/product_template_management_view.xml | 2 +-
 sf_manufacturing/models/mrp_workorder.py                     | 4 ++--
 sf_manufacturing/models/product_template.py                  | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index accc23a0..2cdfd1a3 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -88,7 +88,7 @@
                                 </div>
                                 <field name="model_volume" string="体积[mm³]"/>
                                 <field name="product_model_type_id" string="模型类型"/>
-                                <field name="model_processing_panel" placeholder="例如R,U" string="加工面板"/>
+                                <field name="model_processing_panel" placeholder="例如R,U" string="加工面板" readonly="1"/>
                                 <field name="model_machining_precision"/>
                                 <field name="model_process_parameters_ids" string="表面工艺参数"
                                        widget="many2many_tags"
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 1cdbb7af..a11404bf 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1006,9 +1006,9 @@ class ResMrpWorkOrder(models.Model):
                     if workorder.processing_panel == record.processing_panel:
                         rfid_code = workorder.rfid_code
                         workorder.write({'rfid_code_old': rfid_code,
-                                         'rfid_code': ''})
+                                         'rfid_code': False})
                         workorder.rfid_code_old = rfid_code
-                        workorder.rfid_code = ''
+                        workorder.rfid_code = False
             if is_production_id is True and record.routing_type in ['解除装夹', '表面工艺']:
                 logging.info('product_qty:%s' % record.production_id.product_qty)
                 for move_raw_id in record.production_id.move_raw_ids:
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index cea53c64..4d05de81 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -616,7 +616,7 @@ class ResProductMo(models.Model):
                     item['model_width'] + model_type.embryo_tolerance) * (
                                     item['model_height'] + model_type.embryo_tolerance),
             'product_model_type_id': model_type.id,
-            'model_processing_panel': 'R',
+            # 'model_processing_panel': 'R',
             'model_machining_precision': item['model_machining_precision'],
             'model_code': item['barcode'],
             'length': item['model_long'],
@@ -634,6 +634,7 @@ class ResProductMo(models.Model):
             'model_process_parameters_ids': [(6, 0, [])] if not item.get(
                 'process_parameters_code') else self.get_process_parameters_id(item['process_parameters_code']),
             'model_remark': item['remark'],
+            'single_manufacturing': True,
             'default_code': '%s-%s' % (order_number, i),
             'manual_quotation': item['manual_quotation'] or False,
             'part_number': item.get('part_number') or '',

From d7d5ccc14205791a94b6c59d80bef6072e3b735f Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 1 Jul 2024 17:27:52 +0800
Subject: [PATCH 62/67] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9D=A1=E4=BB=B6=E5=8F=8A=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E7=9A=84=E5=AE=B9=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/models/jd_eclp.py           | 2 +-
 sf_manufacturing/models/mrp_production.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py
index 744bb6d1..7879938e 100644
--- a/sf_bf_connect/models/jd_eclp.py
+++ b/sf_bf_connect/models/jd_eclp.py
@@ -175,7 +175,7 @@ class JdEclp(models.Model):
                 'type': 'success',
                 'message': '物流下单成功',
                 'sticky': False,
-                'next': {'type': 'ir.actions.client', 'tag': 'soft_reload'}
+                'next': {'type': 'ir.actions.client', 'tag': 'reload'}
             }
         }
 
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 7464886d..71cd86b5 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -111,7 +111,7 @@ class MrpProduction(models.Model):
                 production.state = 'progress'
 
             # # 新添加的状态逻辑
-            if production.state == 'to_close' and production.schedule_state == '未排':
+            if (production.state == 'to_close' or production.state == 'progress') and production.schedule_state == '未排':
                 production.state = 'confirmed'
             elif production.state == 'to_close' and production.schedule_state == '已排':
                 production.state = 'pending_cam'

From 7fb3c32d079b599eefb5263bade94dbde0355a8c Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 1 Jul 2024 17:48:45 +0800
Subject: [PATCH 63/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/controllers/controllers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 3b2a8682..805a1a8f 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -232,7 +232,7 @@ class Manufacturing_Connect(http.Controller):
                 production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)])
                 if production_obj:
                     production_obj.sudo().work_order_state = '已完成'
-                    production_obj.write({'state': 'completed'})
+                    production_obj.write({'state': 'done'})
                     # request.env['sale.order'].sudo().search(
                     #     [('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'})
 

From 6b6be85057bc09d4f3804b193ca9a35df6c3c855 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 1 Jul 2024 18:12:15 +0800
Subject: [PATCH 64/67] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E7=9A=84=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=AD=89=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/controllers/controllers.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 805a1a8f..dd97531f 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -225,14 +225,14 @@ class Manufacturing_Connect(http.Controller):
             # workorder.sudo().production_id.process_state = '待解除装夹'
 
             # 根据工单的实际结束时间修改排程单的结束时间、状态，同时修改销售订单的状态
-            if workorder.date_finished:
-                request.env['sf.production.plan'].sudo().search([('production_id', '=', production_id)]).write(
-                    {'actual_end_time': workorder.date_finished,
-                     'state': 'finished'})
-                production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)])
-                if production_obj:
-                    production_obj.sudo().work_order_state = '已完成'
-                    production_obj.write({'state': 'done'})
+            # if workorder.date_finished:
+            #     request.env['sf.production.plan'].sudo().search([('production_id', '=', production_id)]).write(
+            #         {'actual_end_time': workorder.date_finished,
+            #          'state': 'finished'})
+                # production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)])
+                # if production_obj:
+                #     production_obj.sudo().work_order_state = '已完成'
+                #     production_obj.write({'state': 'done'})
                     # request.env['sale.order'].sudo().search(
                     #     [('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'})
 

From 1551ea4b1222fb195f53bb5673d84e1f5d57f658 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 1 Jul 2024 18:17:48 +0800
Subject: [PATCH 65/67] =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 71cd86b5..0fa86e78 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -116,6 +116,11 @@ class MrpProduction(models.Model):
             elif production.state == 'to_close' and production.schedule_state == '已排':
                 production.state = 'pending_cam'
 
+            if production.state == 'progress':
+                if all(wo_state not in ('progress', 'done') for wo_state in production.workorder_ids.mapped('state')):
+                    production.state = 'pending_cam'
+
+
     def action_check(self):
         """
         审核启用

From e9c9b77112cc3d31cb70c7bf904c178c3fc382dd Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 1 Jul 2024 18:27:59 +0800
Subject: [PATCH 66/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=AE=8C=E6=88=90=E6=8A=A5=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index a11404bf..0375b48e 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1015,7 +1015,7 @@ class ResMrpWorkOrder(models.Model):
                     move_raw_id.quantity_done = move_raw_id.product_uom_qty
                 record.process_state = '已完工'
                 record.production_id.process_state = '已完工'
-                if record.routing_type in ['表面工艺']:
+                if record.routing_type in ['解除装夹', '表面工艺']:
                     raw_move = self.env['stock.move'].sudo().search(
                         [('origin', '=', record.production_id.name), ('procure_method', '=', 'make_to_order'),
                          ('state', '!=', 'done')])

From 9c4c2b85ddedb02be58f17967399a58135a0a96d Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 1 Jul 2024 20:08:46 +0800
Subject: [PATCH 67/67] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py | 8 +++++---
 sf_manufacturing/models/mrp_workorder.py  | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 0fa86e78..95242b54 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -111,7 +111,8 @@ class MrpProduction(models.Model):
                 production.state = 'progress'
 
             # # 新添加的状态逻辑
-            if (production.state == 'to_close' or production.state == 'progress') and production.schedule_state == '未排':
+            if (
+                    production.state == 'to_close' or production.state == 'progress') and production.schedule_state == '未排':
                 production.state = 'confirmed'
             elif production.state == 'to_close' and production.schedule_state == '已排':
                 production.state = 'pending_cam'
@@ -120,7 +121,6 @@ class MrpProduction(models.Model):
                 if all(wo_state not in ('progress', 'done') for wo_state in production.workorder_ids.mapped('state')):
                     production.state = 'pending_cam'
 
-
     def action_check(self):
         """
         审核启用
@@ -630,9 +630,10 @@ class MrpProduction(models.Model):
         })
 
         for production in self:
+            logging.info('qty_produced:%s' % production.qty_produced)
             production.write({
                 'date_finished': fields.Datetime.now(),
-                'product_qty': production.qty_produced if production.qty_produced < 1 else production.product_qty,
+                'product_qty': production.product_qty if production.qty_produced < 1.0 else production.qty_produced,
                 'priority': '0',
                 'is_locked': True,
                 'state': 'done',
@@ -658,6 +659,7 @@ class MrpProduction(models.Model):
                     if any(mo.show_allocation for mo in self):
                         action = self.action_view_reception_report()
                         return action
+            logging.info('last-product_qty:%s' % production.product_qty)
             return True
         context = self.env.context.copy()
         context = {k: v for k, v in context.items() if not k.startswith('default_')}
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 0375b48e..09bde519 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1017,7 +1017,8 @@ class ResMrpWorkOrder(models.Model):
                 record.production_id.process_state = '已完工'
                 if record.routing_type in ['解除装夹', '表面工艺']:
                     raw_move = self.env['stock.move'].sudo().search(
-                        [('origin', '=', record.production_id.name), ('procure_method', '=', 'make_to_order'),
+                        [('origin', '=', record.production_id.name),
+                         ('procure_method', 'in', ['make_to_order', 'make_to_stock']),
                          ('state', '!=', 'done')])
                     if raw_move:
                         raw_move.write({'state': 'done'})