From 73ab43f16a0ebf08f035128de5789dfc1c56be12 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Thu, 28 Nov 2024 10:05:17 +0800
Subject: [PATCH 001/147] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E7=BA=BF=E4=B8=8B?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index d72b8738..309bb0aa 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1012,7 +1012,7 @@ class MrpProduction(models.Model):
             if self.production_type == '自动化产线加工':
                 date_planned_start, date_planned_end, last_time = work.auto_production_process(last_time, count,
                                                                                                type_map)
-            elif self.production_type == '':
+            elif self.production_type == '人工线下加工':
                 date_planned_start, date_planned_end, last_time = work.manual_offline_process(last_time, index)
             work.update_work_start_end(date_planned_start, date_planned_end)
 

From 37c47b0a54610ddebdba1944b9c7dd4ff10f3d6d Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 5 Dec 2024 18:14:19 +0800
Subject: [PATCH 002/147] =?UTF-8?q?=E5=AF=B9=E5=90=88=E5=B9=B6=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E9=87=87=E8=B4=AD=E5=8D=95=E4=BF=AE=E6=94=B9=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_dlm/models/stock_rule_inherit.py b/sf_dlm/models/stock_rule_inherit.py
index b1e5b911..4a40ca2f 100644
--- a/sf_dlm/models/stock_rule_inherit.py
+++ b/sf_dlm/models/stock_rule_inherit.py
@@ -44,7 +44,7 @@ class StockRuleInherit(models.Model):
                     po = self.env['purchase.order'].sudo().search([
                         ('partner_id', '=', supplier.partner_id.id),
                         ('company_id', '=', procurement.company_id.id),  # 保证公司一致
-                        ('origin', '=', procurement.origin),  # 根据来源匹配
+                        ('origin', 'like', procurement.origin),  # 根据来源匹配
                         ('state', '=', 'draft')  # 状态为草稿
                     ], limit=1)
                     logging.info("po=: %s", po)

From a6979b213bac33ec54cea90a1a847ce0b707e613 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 9 Dec 2024 09:35:41 +0800
Subject: [PATCH 003/147] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=9A=84=E9=87=87=E8=B4=AD=E5=8D=95=E7=94=9F=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E8=B0=83=E6=8B=A8=E5=8D=95=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=BA=90=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 0c01a57c..ea8ca7c6 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -980,7 +980,8 @@ class ReStockMove(models.Model):
                 production = self.env['mrp.production'].search([('name', '=', self[0].origin)], limit=1, order='id asc')
                 productions = self.env['mrp.production'].search(
                     [('origin', '=', production.origin), ('product_id', '=', production.product_id.id)])
-                res['origin'] = ','.join(productions.mapped('name'))
+                if productions.mapped('name'):
+                    res['origin'] = ','.join(productions.mapped('name'))
                 res['retrospect_ref'] = production.product_id.name
         return res
 

From 1c4a6ca85e781a6338e4c6b80c66e2ee3526d3e2 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 9 Dec 2024 16:07:34 +0800
Subject: [PATCH 004/147] =?UTF-8?q?=E5=BC=80=E6=94=BE=E8=BF=94=E5=B7=A5?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3?=
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 | 2 +-
 sf_quality/models/quality_cnc_test.py         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index bc012ab9..bab7e282 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -129,7 +129,7 @@ class ResMrpWorkOrder(models.Model):
     Y10_axis = fields.Float(default=0)
     Z10_axis = fields.Float(default=0)
     X_deviation_angle = fields.Integer(string="X轴偏差度", default=0)
-    test_results = fields.Selection([("合格", "合格")], default='合格',
+    test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], default='合格',
                                     string="检测结果", tracking=True)
     cnc_ids = fields.One2many("sf.cnc.processing", 'workorder_id', string="CNC加工程序")
     cmm_ids = fields.One2many("sf.cmm.program", 'workorder_id', string="CMM程序")
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index be1a6523..13fff868 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -200,7 +200,7 @@
                 <!--                         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'),('is_rework','=',True),'&amp;',('rfid_code','in',['',False]),('state','=','done')]}"/>-->
-                <button name="button_rework_pre" type="object" string="异常反馈" invisible="1"
+                <button name="button_rework_pre" type="object" string="异常反馈"
                         class="btn-primary"
                         attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('state','!=','progress'),('is_rework','=',True)]}"/>
                 <button name="unbind_tray" type="object" string="解绑托盘"
diff --git a/sf_quality/models/quality_cnc_test.py b/sf_quality/models/quality_cnc_test.py
index 56d924e9..6f9d1c61 100644
--- a/sf_quality/models/quality_cnc_test.py
+++ b/sf_quality/models/quality_cnc_test.py
@@ -25,7 +25,7 @@ class SfQualityCncTest(models.Model):
         ('pass', '合格'),
         ('fail', '不合格')], string='判定结果')
     number = fields.Integer('数量', default=1)
-    test_results = fields.Selection([("合格", "合格")], string="检测结果")
+    test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], string="检测结果")
     reason = fields.Selection(
         [("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"), ("operate computer", "操机"),
          ("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因")

From 83e57b63ec2e50c5dad4bdca7b365b493eb5197d Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Tue, 10 Dec 2024 17:18:33 +0800
Subject: [PATCH 005/147] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=96=B0=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E6=B2=A1?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E6=96=B0=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/mrp_production.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index f11a32ac..77b23e0a 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1495,7 +1495,9 @@ class MrpProduction(models.Model):
 
     def action_view_purchase_orders(self):
         self.ensure_one()
-        if self.product_id.product_tmpl_id.single_manufacturing == True:
+        if self.is_remanufacture:
+            production = self
+        elif self.product_id.product_tmpl_id.single_manufacturing == True:
             production = self.env['mrp.production'].search(
                 [('origin', '=', self.origin), ('product_id', '=', self.product_id.id)], limit=1, order='id asc')
         else:

From 4738b03a4509689e8e8a68a68ad81b6d57bc4360 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Wed, 11 Dec 2024 10:03:20 +0800
Subject: [PATCH 006/147] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8E=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     | 129 +++++++++++++-----
 .../views/mrp_production_addional_change.xml  |   3 +
 2 files changed, 97 insertions(+), 35 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 309bb0aa..21d4b8ee 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -8,6 +8,9 @@ import re
 import requests
 from itertools import groupby
 from collections import defaultdict, namedtuple
+
+from loguru import _logger
+
 from odoo import api, fields, models, SUPERUSER_ID, _
 from odoo.exceptions import UserError, ValidationError
 from odoo.addons.sf_base.commons.common import Common
@@ -18,6 +21,7 @@ class MrpProduction(models.Model):
     _inherit = 'mrp.production'
     _description = "制造订单"
     _order = 'create_date desc'
+    sale_order_id = fields.Many2one('sale.order',string='销售订单', compute='_compute_sale_order_id', store=True)
     deadline_of_delivery = fields.Date('订单交期', tracking=True, compute='_compute_deadline_of_delivery')
     # tray_ids = fields.One2many('sf.tray', 'production_id', string="托盘")
     maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Number of maintenance requests")
@@ -34,6 +38,28 @@ class MrpProduction(models.Model):
     tool_state_remark = fields.Text(string='功能刀具状态备注(缺刀)', compute='_compute_tool_state_remark', store=True)
     tool_state_remark2 = fields.Text(string='功能刀具状态备注(无效刀)', readonly=True)
 
+    @api.depends('procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id')
+    def _compute_sale_order_id(self):
+        for production in self:
+            # 初始化 sale_order_id 为 False
+            sale_order_id = False
+            # 使用正则表达式查找产品名称中的 'S' 开头的字母数字字符串
+            match = re.search(r'S\d+', production.product_id.with_context(lang='zh_CN').name)  # 从字符串开始匹配
+
+            if match:
+                result = match.group(0)
+                try:
+                    # 查找与匹配的字符串相符的销售订单
+                    sale_order = self.env['sale.order'].search(
+                        [('name', '=', result)], limit=1, order='id asc'
+                    )
+                    if sale_order:
+                        production.sale_order_id = sale_order.id
+                    else:
+                        _logger.warning("No sale order found for production %s with product %s (name match: %s)",
+                                        production.id, production.product_id.name, result)
+                except Exception as e:
+                    _logger.error("Error while fetching sale order for production %s: %s", production.id, str(e))
     @api.depends('procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id')
     def _compute_deadline_of_delivery(self):
         for production in self:
@@ -309,7 +335,8 @@ class MrpProduction(models.Model):
                      for move in production.move_raw_ids if move.product_id):
                 production.state = 'progress'
             # 新添加的状态逻辑
-            if production.state in ['to_close', 'progress', 'technology_to_confirmed'] and production.schedule_state == '未排':
+            if production.state in ['to_close', 'progress',
+                                    'technology_to_confirmed'] and production.schedule_state == '未排':
                 if not production.workorder_ids or production.is_adjust is True:
                     production.state = 'technology_to_confirmed'
                 else:
@@ -320,11 +347,7 @@ class MrpProduction(models.Model):
             elif production.state == 'pending_cam' and production.schedule_state == '未排':
                 production.state = 'confirmed'
             elif production.state == 'to_close' and production.schedule_state == '已排':
-                if all(
-                    wo_state in ('done', 'cancel') for wo_state in production.workorder_ids.mapped('state')):
-                    production.state = 'done'
-                else:
-                    production.state = 'pending_cam'
+                production.state = 'pending_cam'
             elif production.state == 'confirmed' and production.is_adjust is True:
                 production.state = 'technology_to_confirmed'
             if production.state == 'confirmed' and production.schedule_state == '已排':
@@ -335,6 +358,9 @@ class MrpProduction(models.Model):
                     production.state = 'pending_cam'
                 if production.is_rework is True:
                     production.state = 'rework'
+            if (production.state == 'rework' and production.tool_state == '0'
+                    and production.schedule_state == '已排' and production.is_rework is False):
+                production.state = 'pending_cam'
             # if production.state == 'pending_cam':
             #     if all(wo_state in 'done' for wo_state in production.workorder_ids.mapped('state')):
             #         production.state = 'done'
@@ -721,10 +747,16 @@ class MrpProduction(models.Model):
         for product_id, pd in grouped_product_ids.items():
             product_id_to_production_names[product_id] = [p.name for p in pd]
         for production in production_all:
+            proc_workorders = []
             process_parameter_workorder = self.env['mrp.workorder'].search(
                 [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production.id),
-                 ('is_subcontract', '=', True)], order='sequence asc')
+                 ('is_subcontract', '=', True), ('state', '!=', 'cancel')], order='sequence asc')
             if process_parameter_workorder:
+                # 将这些特殊表面工艺工单的采购单与调拨单置为失效
+                for workorder in process_parameter_workorder:
+                    workorder._get_surface_technics_purchase_ids().write({'state': 'cancel'})
+                    workorder.move_subcontract_workorder_ids.write({'state': 'cancel'})
+                    workorder.move_subcontract_workorder_ids.picking_id.write({'state': 'cancel'})
                 consecutive_workorders = []
                 sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.sequence)
                 for i, workorder in enumerate(sorted_workorders):
@@ -737,10 +769,11 @@ class MrpProduction(models.Model):
                     else:
                         # 处理连续组，如果它不为空
                         if consecutive_workorders:
+                            proc_workorders.append(consecutive_workorders)
                             # 创建外协出入库单和采购订单
-                            self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production)
-                            self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
-                                                                          product_id_to_production_names)
+                            # self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production, sorted_workorders)
+                            # self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
+                            #                                               product_id_to_production_names)
                             if i < len(sorted_workorders) - 1:
                                 # 重置连续组，并添加当前工作订单
                                 consecutive_workorders = [workorder]
@@ -751,18 +784,22 @@ class MrpProduction(models.Model):
                                     i - 1].supplier_id.id:
                                     consecutive_workorders = [workorder]
                                 else:
+                                    proc_workorders.append([workorder])
                                     # 立即创建外协出入库单和采购订单
-                                    self.env['stock.picking'].create_outcontract_picking(workorder, production)
-                                    self.env['purchase.order'].get_purchase_order(workorder, production,
-                                                                                  product_id_to_production_names)
+                                    # self.env['stock.picking'].create_outcontract_picking(workorder, production)
+                                    # self.env['purchase.order'].get_purchase_order(workorder, production,
+                                    #   product_id_to_production_names)
                                     consecutive_workorders = []
 
                 # 处理最后一个组，即使它可能只有一个工作订单
                 if consecutive_workorders:
-                    self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production)
-                    self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
-                                                                  product_id_to_production_names)
-
+                    proc_workorders.append(consecutive_workorders)
+                    # self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production)
+                    # self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
+                    #                                               product_id_to_production_names)
+            for workorders in reversed(proc_workorders):
+                self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
+                self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
     # 工单排序
     def _reset_work_order_sequence1(self, k):
         for rec in self:
@@ -847,17 +884,22 @@ class MrpProduction(models.Model):
                     # workorder.picking_ids.move_ids = False
                     workorder.picking_ids = False
                     purchase_order = self.env['purchase.order'].search(
-                        [('state', '=', 'draft'), ('origin', '=', ','.join(production_process)),
+                        [('state', '=', 'draft'), ('origin', '=', item.name),
                          ('purchase_type', '=', 'consignment')])
-                    for line in purchase_order.order_line:
-                        server_template = self.env['product.template'].search(
-                            [('server_product_process_parameters_id', '=', workorder.surface_technics_parameters_id.id),
-                             ('detailed_type', '=', 'service')])
-                        purchase_order_line = self.env['purchase.order.line'].search(
-                            [('product_id', '=', server_template.product_variant_id.id), ('id', '=', line.id),
-                             ('product_qty', '=', len(production_process))], limit=1, order='id desc')
-                        if purchase_order_line:
-                            line.unlink()
+                    server_template = self.env['product.template'].search(
+                        [('server_product_process_parameters_id', '=',
+                          workorder.surface_technics_parameters_id.id),
+                         ('detailed_type', '=', 'service')])
+                    for po in purchase_order:
+                        for line in po.order_line:
+                            if line.product_id == server_template.product_variant_id:
+                                continue
+                            if server_template.server_product_process_parameters_id != line.product_id.server_product_process_parameters_id:
+                                purchase_order_line = self.env['purchase.order.line'].search(
+                                    [('product_id', '=', server_template.product_variant_id.id), ('id', '=', line.id),
+                                     ('product_qty', '=', 1)], limit=1, order='id desc')
+                                if purchase_order_line:
+                                    line.unlink()
 
     def _reset_work_order_sequence(self):
         """
@@ -898,8 +940,6 @@ class MrpProduction(models.Model):
                     for cw in cancel_work_ids:
                         cw.sequence = sequence + 1
 
-
-
     def _reset_work_order_sequence_1(self):
         """
         工单工序排序方法（旧）
@@ -1012,7 +1052,7 @@ class MrpProduction(models.Model):
             if self.production_type == '自动化产线加工':
                 date_planned_start, date_planned_end, last_time = work.auto_production_process(last_time, count,
                                                                                                type_map)
-            elif self.production_type == '人工线下加工':
+            elif self.production_type == '':
                 date_planned_start, date_planned_end, last_time = work.manual_offline_process(last_time, index)
             work.update_work_start_end(date_planned_start, date_planned_end)
 
@@ -1324,11 +1364,10 @@ class MrpProduction(models.Model):
             move = self.env['stock.move'].search([('origin', '=', productions.name)], order='id desc')
             for mo in move:
                 domain = []
-                if mo.procure_method == 'make_to_order' and mo.name != productions.name:
-                    if mo.name == '/':
-                        domain = [('barcode', '=', 'WH-PC'), ('sequence_code', '=', 'PC')]
-                    elif mo.name == '拉':
-                        domain = [('barcode', '=', 'WH-INTERNAL'), ('sequence_code', '=', 'INT')]
+                if mo.location_id.barcode == 'WH-POSTPRODUCTION' and mo.rule_id.picking_type_id.barcode == 'PC':
+                    domain = [('barcode', '=', 'WH-PC'), ('sequence_code', '=', 'PC')]
+                elif mo.location_id.barcode == 'PL' and mo.rule_id.picking_type_id.barcode == 'INT':
+                    domain = [('barcode', '=', 'WH-INTERNAL'), ('sequence_code', '=', 'INT')]
                 if domain:
                     picking_type = self.env['stock.picking.type'].search(domain)
                     mo.write({'picking_type_id': picking_type.id})
@@ -1422,6 +1461,26 @@ class MrpProduction(models.Model):
         for production in self:
             production.production_type = '自动化产线加工' if not production.product_id.is_manual_processing else '人工线下加工'
 
+    @api.depends('procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id')
+    def _compute_sale_order_count(self):
+        for production in self:
+            if production.sale_order_id:
+                production.sale_order_count = 1
+            else:
+                production.sale_order_count = 0
+    def action_view_sale_orders(self):
+        if self.sale_order_id:
+            action = {
+                'res_model': 'sale.order',
+                'type': 'ir.actions.act_window',
+            }
+            action.update({
+                'view_mode': 'form',
+                'res_id': self.sale_order_id.id,
+            })
+            return action
+
+
     @api.model_create_multi
     def create(self, vals_list):
         """
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 783f39dd..b999dd63 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -43,6 +43,7 @@
                     <field name="activity_ids" string="下一个活动" widget="list_activity" optional="hide"/>
                 </xpath>
                 <xpath expr="//field[@name='origin']" position="replace">
+                    <field name="sale_order_id" optional="show"/>
                     <field name="origin" optional="hide"/>
                 </xpath>
                 <xpath expr="//field[@name='components_availability']" position="replace">
@@ -123,6 +124,7 @@
                     <field name="tool_state"
                            attrs="{'invisible': [('production_type', 'not in', ['自动化产线加工'])]}"/>
                     <field name="tool_state_remark" string="备注" attrs="{'invisible': [('tool_state', '!=', '1')]}"/>
+                    <field name="sale_order_id" readonly="1"/>
                     <field name="deadline_of_delivery" readonly="1"/>
                     <field name="tool_state_remark2" invisible="1"/>
                 </xpath>
@@ -583,6 +585,7 @@
                     <searchpanel>
                         <field name="state" icon="fa-filter" enable_counters="1"/>
                         <field name="delivery_status" icon="fa-filter" enable_counters="1"/>
+                        <field name="production_type" icon="fa-filter" enable_counters="1"/>
                     </searchpanel>
                 </xpath>
                 <filter name='todo' position="replace"/>

From 179ce86befffebfe88647ef7d5dff3e3e559ceb8 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 11 Dec 2024 10:33:10 +0800
Subject: [PATCH 007/147] =?UTF-8?q?1=E3=80=81=E5=8E=BB=E9=99=A4=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=97=B6=E6=95=88=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E8=87=AA=E5=8A=A8=E7=AD=9B=E9=80=89=E9=A1=B9=EF=BC=9B?=
 =?UTF-8?q?2=E3=80=81=E5=9D=AF=E6=96=99=E5=88=B6=E9=80=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=B7=A5=E8=89=BA=E5=8A=9F=E8=83=BD=EF=BC=9B?=
 =?UTF-8?q?3=E3=80=81=E5=A4=84=E7=90=86=E8=BF=94=E5=B7=A5=E6=96=B0?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E5=B7=A5=E5=8D=95=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=EF=BC=9B4=E3=80=81?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E3=80=81=E9=94=80=E5=94=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml |  3 +--
 .../wizard/production_technology_wizard.py    |  2 +-
 sf_manufacturing/wizard/rework_wizard.py      |  2 +-
 sf_sale/views/sale_order_view.xml             | 22 +++++++++++++++++--
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 13fff868..3828f00e 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -104,8 +104,7 @@
         <!--        <field name="target">fullscreen</field>-->
         <field name="target">current</field>
         <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>
-        <field name="context">{'search_default_product': 1, 'search_default_workcenter_id':
-            active_id,'search_default_filter_order_warning':1,'search_default_filter_order_overdue':1,'search_default_filter_order_normal':1}
+        <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">
diff --git a/sf_manufacturing/wizard/production_technology_wizard.py b/sf_manufacturing/wizard/production_technology_wizard.py
index f49480aa..e5976aaa 100644
--- a/sf_manufacturing/wizard/production_technology_wizard.py
+++ b/sf_manufacturing/wizard/production_technology_wizard.py
@@ -14,7 +14,7 @@ class ProductionTechnologyWizard(models.TransientModel):
     is_technology_confirm = fields.Boolean(default=False)
 
     def confirm(self):
-        if self.is_technology_confirm is True and self.production_id.product_id.categ_id.type == '成品':
+        if self.is_technology_confirm is True and self.production_id.product_id.categ_id.type in ['成品', '坯料']:
             domain = [('origin', '=', self.origin), ('state', '=', 'technology_to_confirmed'),
                       ('product_id', '=', self.production_id.product_id.id)]
         else:
diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py
index eeae9ae9..fece391a 100644
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -119,7 +119,7 @@ class ReworkWizard(models.TransientModel):
                                       and item.panel == work.processing_panel))
                     if route:
                         work_list = self.env['mrp.workorder'].json_workorder_str(self.production_id, route[0])
-                        work_list[2].update({'tag_type': '重新加工'})
+                        work_list[2].update({'tag_type': '重新加工', 'sequence': 0})
                         workorders_values.append(work_list)
                 # 创建新工单，并进行返工配置的相关操作
                 if workorders_values:
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index a5adfcfa..673d7fa3 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -169,6 +169,9 @@
                     <field name="manual_quotation" />
                     <field name="is_incoming_material"/>
                 </xpath>
+                <xpath expr="//field[@name='date_order']" position="attributes">
+                    <attribute name="string">下单时间</attribute>
+                </xpath>
             </field>
         </record>
 
@@ -215,8 +218,14 @@
                     <attribute name="string">订单号</attribute>
                 </field>
                 <field name="create_date" position="attributes">
-                    <attribute name="string">下单时间</attribute>
+                    <attribute name="string">下单日期</attribute>
                 </field>
+                <xpath expr="//field[@name='activity_ids']" position="attributes">
+                    <attribute name="optional">hide</attribute>
+                </xpath>
+                <xpath expr="//field[@name='create_date']" position="after">
+                    <field name="deadline_of_delivery"/>
+                </xpath>
                 <!-- <field name="state" position="after">
                     <field name="check_status" widget="badge"
                            decoration-success="check_status == 'approved'"
@@ -258,6 +267,15 @@
                 <field name="amount_total" position="after">
                     <field name="delivery_warning" invisible="1"/>
                 </field>
+                <xpath expr="//field[@name='date_order']" position="after">
+                    <field name="deadline_of_delivery"/>
+                </xpath>
+                <xpath expr="//field[@name='activity_ids']" position="attributes">
+                    <attribute name="optional">hide</attribute>
+                </xpath>
+                <xpath expr="//field[@name='invoice_status']" position="after">
+                    <field name="state"/>
+                </xpath>
             </field>
         </record>
 
@@ -293,7 +311,7 @@
 
         <record id="sale.action_orders" model="ir.actions.act_window">
             <field name="search_view_id" ref="sale_order_view_search_inherit_sale_message"/>
-            <field name="context">{ 'search_default_filter_order_warning':1,'search_default_filter_order_overdue':1}
+            <field name="context">{}
             </field>
         </record>
     </data>

From f32ca13dff1a9a7f0886a19b7161e5e3962354b7 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Wed, 11 Dec 2024 11:05:25 +0800
Subject: [PATCH 008/147] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=9A=84=E4=BD=BF=E7=94=A8=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 4fc7fde0..e784ea73 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -9,8 +9,6 @@ import requests
 from itertools import groupby
 from collections import defaultdict, namedtuple
 
-from loguru import _logger
-
 from odoo import api, fields, models, SUPERUSER_ID, _
 from odoo.exceptions import UserError, ValidationError
 from odoo.addons.sf_base.commons.common import Common
@@ -21,7 +19,7 @@ class MrpProduction(models.Model):
     _inherit = 'mrp.production'
     _description = "制造订单"
     _order = 'create_date desc'
-    sale_order_id = fields.Many2one('sale.order',string='销售订单', compute='_compute_sale_order_id', store=True)
+    sale_order_id = fields.Many2one('sale.order', string='销售订单', compute='_compute_sale_order_id', store=True)
     deadline_of_delivery = fields.Date('订单交期', tracking=True, compute='_compute_deadline_of_delivery')
     # tray_ids = fields.One2many('sf.tray', 'production_id', string="托盘")
     maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Number of maintenance requests")
@@ -56,10 +54,11 @@ class MrpProduction(models.Model):
                     if sale_order:
                         production.sale_order_id = sale_order.id
                     else:
-                        _logger.warning("No sale order found for production %s with product %s (name match: %s)",
-                                        production.id, production.product_id.name, result)
+                        logging.warning("No sale order found for production {} with product {} (name match: {})".format(
+                                        production.id, production.product_id.name, result))
                 except Exception as e:
-                    _logger.error("Error while fetching sale order for production %s: %s", production.id, str(e))
+                    logging.error("Error while fetching sale order for production {}: {}".format(production.id, str(e)))
+
     @api.depends('procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id')
     def _compute_deadline_of_delivery(self):
         for production in self:
@@ -788,7 +787,7 @@ class MrpProduction(models.Model):
                                     # 立即创建外协出入库单和采购订单
                                     # self.env['stock.picking'].create_outcontract_picking(workorder, production)
                                     # self.env['purchase.order'].get_purchase_order(workorder, production,
-                                                                                #   product_id_to_production_names)
+                                    #   product_id_to_production_names)
                                     consecutive_workorders = []
 
                 # 处理最后一个组，即使它可能只有一个工作订单
@@ -800,6 +799,7 @@ class MrpProduction(models.Model):
             for workorders in reversed(proc_workorders):
                 self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
                 self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
+
     # 工单排序
     def _reset_work_order_sequence1(self, k):
         for rec in self:
@@ -1468,6 +1468,7 @@ class MrpProduction(models.Model):
                 production.sale_order_count = 1
             else:
                 production.sale_order_count = 0
+
     def action_view_sale_orders(self):
         if self.sale_order_id:
             action = {
@@ -1480,7 +1481,6 @@ class MrpProduction(models.Model):
             })
             return action
 
-
     @api.model_create_multi
     def create(self, vals_list):
         """

From ab32f881c2f8786be122bf43f721caa2fe4a9855 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Wed, 11 Dec 2024 17:09:51 +0800
Subject: [PATCH 009/147] =?UTF-8?q?=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=80=80=E5=9B=9E=E8=B0=83=E6=95=B4=E5=88=A0=E9=99=A4=E8=A1=A8?=
 =?UTF-8?q?=E9=9D=A2=E5=B7=A5=E8=89=BA=E5=86=8D=E6=AC=A1=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=90=8E-=E6=B2=A1=E8=A2=AB=E5=88=A0=E9=99=A4=E7=9A=84?=
 =?UTF-8?q?=E8=A1=A8=E9=9D=A2=E5=B7=A5=E8=89=BA=E7=9A=84=E5=A4=96=E5=8D=8F?=
 =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E5=8D=95=E5=8F=98=E6=88=90=E4=BA=86?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 54d58234..fbe3be8c 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -656,8 +656,8 @@ class StockPicking(models.Model):
     def create_outcontract_picking(self, workorders, item, sorted_workorders):
         for workorder in workorders:
             if workorder.move_subcontract_workorder_ids:
-                workorder.move_subcontract_workorder_ids.write({'state': 'draft'})
-                workorder.move_subcontract_workorder_ids.picking_id.write({'state': 'draft'})
+                workorder.move_subcontract_workorder_ids.write({'state': 'waiting'})
+                workorder.move_subcontract_workorder_ids.picking_id.write({'state': 'waiting'})
             else:
                 # 创建一个新的补货组
                 procurement_group_id = self.env['procurement.group'].create({

From 7c17241882f0b66497edc72b769b8f42d1948f54 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 11 Dec 2024 17:24:32 +0800
Subject: [PATCH 010/147] =?UTF-8?q?1=E3=80=81=E5=88=B6=E9=80=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=82=B9=E5=87=BB=E8=BF=94=E5=B7=A5=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=E8=BF=87=E6=BB=A4=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=9B2=E3=80=81=E4=BC=98=E5=8C=96=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=B7=A5=E5=BA=8F=E9=80=BB=E8=BE=91=EF=BC=9B3?=
 =?UTF-8?q?=E3=80=81=E8=BF=94=E5=B7=A5=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E6=9D=A1=E4=BB=B6=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     |  8 ++--
 sf_manufacturing/wizard/rework_wizard.py      | 48 +++++++++++++------
 .../wizard/rework_wizard_views.xml            |  2 +-
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 4fc7fde0..41333e5b 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -914,7 +914,7 @@ class MrpProduction(models.Model):
                 # 对工单进行逐个插入
                 for work_id in work_ids:
                     for order_id in rec.workorder_ids.filtered(lambda item: item.sequence > 0):
-                        if work_id.name == order_id.name:
+                        if work_id.name == order_id.name and work_id.processing_panel == order_id.processing_panel:
                             work_id.sequence = order_id.sequence + 1
                             break
                     # 对该工单之后的工单工序进行加一
@@ -1196,7 +1196,9 @@ class MrpProduction(models.Model):
                 lambda wk: (wk.name == result_id.routing_type and wk.processing_panel == result_id.processing_panel
                             and wk.state == 'done')).id
                             for result_id in result_ids]
-
+        workorder_ids = self.workorder_ids.filtered(
+            lambda wk: wk.technology_design_id.routing_tag == 'standard' and wk.state not in ['rework', 'cancel'])
+        logging.info('标准工艺工单【%s】' % workorder_ids)
         return {
             'name': _('返工'),
             'type': 'ir.actions.act_window',
@@ -1205,7 +1207,7 @@ class MrpProduction(models.Model):
             'target': 'new',
             'context': {
                 'default_production_id': self.id,
-                'default_workorder_ids': self.workorder_ids.ids,
+                'default_workorder_ids': workorder_ids.ids if workorder_ids.ids != [] else self.workorder_ids.ids,
                 'default_hidden_workorder_ids': ','.join(map(str, work_id_list)) if work_id_list != [] else '',
                 'default_reprogramming_num': cloud_programming['reprogramming_num'],
                 'default_programming_state': cloud_programming['programming_state'],
diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py
index fece391a..bcc8514b 100644
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -62,6 +62,36 @@ class ReworkWizard(models.TransientModel):
                 hidden_workorder_list.sort()
                 item.hidden_workorder_ids = ','.join(hidden_workorder_list)
 
+    def efficacy_rework_wo(self, wk_ids):
+        """限制判断 """
+        # 判断检测结果待处理所对应的工单是否勾选
+        result_ids = self.production_id.detection_result_ids.filtered(lambda dr: dr.handle_result == '待处理')
+        work_id_list = []
+        if result_ids:
+            work_id_list = [self.workorder_ids.filtered(
+                lambda wk: (wk.name == result_id.routing_type and wk.processing_panel == result_id.processing_panel
+                            and wk.state == 'done')).id
+                            for result_id in result_ids]
+        if len(wk_ids.filtered(lambda wk: wk.id in work_id_list)) != len(work_id_list):
+            raise ValidationError('存在【检测结果】为【待处理】所对应的工单未进行勾选！！！')
+        # 获取已完成的标准工单
+        grouped_rw_ids = {key: list(group) for key, group in groupby(wk_ids, key=lambda w: w.processing_panel)}
+        for panel, panel_rw_ids in grouped_rw_ids.items():
+            # 1、当制造订单内ZM面的工单都已完成时，返工勾选工序时只能勾选上ZM面的所有工序进行返工
+            work_ids = self.workorder_ids.filtered(lambda w: w.state == 'done' and w.processing_panel == panel)
+            if len(work_ids) == 3 and len(panel_rw_ids) != 3:
+                raise ValidationError(
+                    '因为[%s]面的工单已全部完成，如果要对[%s]面的工单进行返工，请勾选这个面的所有工单。' % (panel, panel))
+            # 2、当FM工单在CNC工单进行选择返工，并将已全部完成的ZM面工序全部勾选上时，FM工单上所有的已完成的工单（装夹预调工单）也必须进行勾选
+            if not wk_ids.filtered(lambda wk: wk.name == '装夹预调' and wk.processing_panel == panel):
+                if wk_ids.filtered(lambda wk: wk.name == 'CNC加工' and wk.processing_panel == panel):
+                    sequence_max = wk_ids.filtered(lambda wk: wk.name == 'CNC加工' and wk.processing_panel == panel).sequence
+                    for wk_id in wk_ids.filtered(lambda wk: wk.sequence < sequence_max):
+                        if len(wk_ids.filtered(lambda wk: wk.processing_panel == wk_id.processing_panel)) == 3:
+                            raise ValidationError(
+                                '由于在[%s]面之前存在整个面进行了勾选的情况，所以在勾选了[%s]面的【CNC加工】工单的时，请勾选[%s]面的装夹预调工单！' % (
+                                    panel, panel, panel))
+
     def confirm(self):
         if self.routing_type in ['装夹预调', 'CNC加工']:
             self.is_clamp_measure = False
@@ -79,20 +109,8 @@ class ReworkWizard(models.TransientModel):
             if self.hidden_workorder_ids:
                 hidden_workorder_list = self.hidden_workorder_ids.split(',')
                 rework_workorder_ids = self.workorder_ids.filtered(lambda w: str(w.id) in hidden_workorder_list)
-                # 限制判断
-                # 1、当制造订单内ZM面的工单都已完成时，返工勾选工序时只能勾选上ZM面的所有工序进行返工
-                # 2、当FM工单在CNC工单进行选择返工，并将已全部完成的ZM面工序全部勾选上时，FM工单上所有的已完成的工单（装夹预调工单）也必须进行勾选
-                # 获取已完成的标准工单
-                # done_normative_workorder_ids = self.workorder_ids.filtered(
-                #     lambda w: w.state == 'done' and w.processing_panel is not False)
-                # # 获取需要返工的标准工单
-                # rework_normative_workorder_ids = rework_workorder_ids.filtered(
-                #     lambda w: w.processing_panel is not False)
-                # if rework_normative_workorder_ids:
-                #     for rw in rework_normative_workorder_ids:
-                #         if len(done_normative_workorder_ids.filtered(
-                #                 lambda w: w.processing_panel == rw.processing_panel)) == 3:
-                #             pass
+                # 调用效验方法
+                self.efficacy_rework_wo(rework_workorder_ids)
             else:
                 raise ValidationError('请选择返工工单！！！')
             if rework_workorder_ids:
@@ -106,7 +124,7 @@ class ReworkWizard(models.TransientModel):
                         for clamp_workorder_id in clamp_workorder_ids:
                             self.production_id.workorder_ids.filtered(
                                 lambda wk: wk.processing_panel == clamp_workorder_id.processing_panel).write(
-                                {'rfid_code': False})
+                                {'rfid_code': None})
                     # 返工工单状态设置为【返工】
                     rework_workorder_ids.write({'state': 'rework'})
                 # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单
diff --git a/sf_manufacturing/wizard/rework_wizard_views.xml b/sf_manufacturing/wizard/rework_wizard_views.xml
index 05d1cc04..aad8a692 100644
--- a/sf_manufacturing/wizard/rework_wizard_views.xml
+++ b/sf_manufacturing/wizard/rework_wizard_views.xml
@@ -14,7 +14,7 @@
                     <field name="processing_panel_id" invisible="1"/>
                     <field name="hidden_workorder_ids" class="css_not_available_msg"/>
                     <group>
-                        <field name="hidden_workorder_ids"/>
+                        <field name="hidden_workorder_ids" invisible="1"/>
                         <field options="{'no_create': True,'no_open': True}" readonly="1" name="workorder_ids"
                                widget="jikimo_subtree_selector_field"
                                jikimo_selector="True" replace_context="hidden_workorder_ids" string="工序"

From c793089131da0f628d094b861d4dfc58809d83d9 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Thu, 12 Dec 2024 09:29:48 +0800
Subject: [PATCH 011/147] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     | 85 ++++++++++++++-----
 ...tion_technology_re_adjust_wizard_views.xml | 20 +++++
 .../production_technology_wizard_views.xml    | 25 +++++-
 3 files changed, 107 insertions(+), 23 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 77b23e0a..6643bfb1 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -378,16 +378,37 @@ class MrpProduction(models.Model):
         if process_parameters:
             raise UserError(_("【工艺设计】-【参数】为%s的在【产品】中不存在，请先创建", ", ".join(process_parameters)))
         if production_confirmed:
-            return {
-                'name': _('退回调整'),
-                'type': 'ir.actions.act_window',
-                'view_mode': 'form',
-                'res_model': 'sf.production.technology.re_adjust.wizard',
-                'target': 'new',
-                'context': {
-                    'default_production_id': self.id,
-                    'default_origin': self.origin,
-                }}
+            production_count = self.env['mrp.production'].search_count([
+                ('origin', '=', self.origin),
+                ('product_id', '=', self.product_id.id),
+                ('state', '=', 'confirmed')
+            ])
+            if production_count > 1:
+                return {
+                    'name': _('退回调整'),
+                    'type': 'ir.actions.act_window',
+                    'views': [(self.env.ref(
+                        'sf_manufacturing.sf_production_technology_re_adjust_wizard_form_view').id,
+                               'form')],
+                    'res_model': 'sf.production.technology.re_adjust.wizard',
+                    'target': 'new',
+                    'context': {
+                        'default_production_id': self.id,
+                        'default_origin': self.origin,
+                    }}
+            else:
+                return {
+                    'name': _('退回调整'),
+                    'type': 'ir.actions.act_window',
+                    'views': [(self.env.ref(
+                        'sf_manufacturing.sf_production_technology_re_adjust_wizard_confirm_form_view').id,
+                               'form')],
+                    'res_model': 'sf.production.technology.re_adjust.wizard',
+                    'target': 'new',
+                    'context': {
+                        'default_production_id': self.id,
+                        'default_origin': self.origin,
+                    }}
 
     # 工艺确认
     def technology_confirm(self):
@@ -441,16 +462,37 @@ class MrpProduction(models.Model):
                                 error_panel.append(design.panel)
             else:
                 if not error_panel and not process_parameters:
-                    return {
-                        'name': _('工艺确认'),
-                        'type': 'ir.actions.act_window',
-                        'view_mode': 'form',
-                        'res_model': 'sf.production.technology.wizard',
-                        'target': 'new',
-                        'context': {
-                            'default_production_id': self.id,
-                            'default_origin': self.origin,
-                        }}
+                    production_count = self.env['mrp.production'].search_count([
+                        ('origin', '=', self.origin),
+                        ('product_id', '=', self.product_id.id),
+                        ('state', '=', 'technology_to_confirmed')
+                    ])
+                    if production_count > 1:
+                        return {
+                            'name': _('工艺确认'),
+                            'type': 'ir.actions.act_window',
+                            'views': [(self.env.ref(
+                                'sf_manufacturing.sf_production_technology_wizard_form_view').id,
+                                       'form')],
+                            'res_model': 'sf.production.technology.wizard',
+                            'target': 'new',
+                            'context': {
+                                'default_production_id': self.id,
+                                'default_origin': self.origin,
+                            }}
+                    else:
+                        return {
+                            'name': _('工艺确认'),
+                            'type': 'ir.actions.act_window',
+                            'views': [(self.env.ref(
+                                'sf_manufacturing.sf_production_technology_wizard_confirm_form_view').id,
+                                       'form')],
+                            'res_model': 'sf.production.technology.wizard',
+                            'target': 'new',
+                            'context': {
+                                'default_production_id': self.id,
+                                'default_origin': self.origin,
+                            }}
         if error_panel:
             raise UserError(_("【加工面】为%s的标准工序顺序有误，请调整后重试", ", ".join(error_panel)))
         return True
@@ -762,7 +804,7 @@ class MrpProduction(models.Model):
                                     # 立即创建外协出入库单和采购订单
                                     # self.env['stock.picking'].create_outcontract_picking(workorder, production)
                                     # self.env['purchase.order'].get_purchase_order(workorder, production,
-                                                                                #   product_id_to_production_names)
+                                    #   product_id_to_production_names)
                                     consecutive_workorders = []
 
                 # 处理最后一个组，即使它可能只有一个工作订单
@@ -774,6 +816,7 @@ class MrpProduction(models.Model):
             for workorders in reversed(proc_workorders):
                 self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
                 self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
+
     # 工单排序
     def _reset_work_order_sequence1(self, k):
         for rec in self:
diff --git a/sf_manufacturing/wizard/production_technology_re_adjust_wizard_views.xml b/sf_manufacturing/wizard/production_technology_re_adjust_wizard_views.xml
index 48346cb2..4ab7fc86 100644
--- a/sf_manufacturing/wizard/production_technology_re_adjust_wizard_views.xml
+++ b/sf_manufacturing/wizard/production_technology_re_adjust_wizard_views.xml
@@ -21,6 +21,26 @@
         </field>
     </record>
 
+    <record model="ir.ui.view" id="sf_production_technology_re_adjust_wizard_confirm_form_view">
+        <field name="name">sf.production.technology.re_adjust.wizard.form.view</field>
+        <field name="model">sf.production.technology.re_adjust.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <field name="production_id" invisible="1"/>
+                    <field name="origin" invisible="1"/>
+                    <div>
+                        是否确认退回调整
+                    </div>
+                    <footer>
+                        <button string="确认" name="confirm" type="object" class="oe_highlight"/>
+                        <button string="取消" class="btn btn-secondary" special="cancel"/>
+                    </footer>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
     <record id="action_sf_production_technology_re_adjust_wizard" model="ir.actions.act_window">
         <field name="name">工艺退回调整</field>
         <field name="res_model">sf.production.technology.re_adjust.wizard</field>
diff --git a/sf_manufacturing/wizard/production_technology_wizard_views.xml b/sf_manufacturing/wizard/production_technology_wizard_views.xml
index 134fb8a9..8706ef83 100644
--- a/sf_manufacturing/wizard/production_technology_wizard_views.xml
+++ b/sf_manufacturing/wizard/production_technology_wizard_views.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-     <record model="ir.ui.view" id="sf_production_technology_wizard_form_view">
+    <record model="ir.ui.view" id="sf_production_technology_wizard_form_view">
         <field name="name">sf.production.technology.wizard.form.view</field>
         <field name="model">sf.production.technology.wizard</field>
         <field name="arch" type="xml">
@@ -13,7 +13,28 @@
                         对当前制造订单，同一销售订单相同产品所生成的制造订单统一进行工艺调整与确认
                     </div>
                     <footer>
-                        <button string="确认" name="confirm" type="object" class="oe_highlight" confirm="是否确认工艺调整"/>
+                        <button string="确认" name="confirm" type="object" class="oe_highlight"
+                                confirm="是否确认工艺调整"/>
+                        <button string="取消" class="btn btn-secondary" special="cancel"/>
+                    </footer>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="sf_production_technology_wizard_confirm_form_view">
+        <field name="name">sf.production.technology.wizard.form.view</field>
+        <field name="model">sf.production.technology.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <field name="production_id" invisible="1"/>
+                    <field name="origin" invisible="1"/>
+                    <div>
+                        是否确认工艺调整
+                    </div>
+                    <footer>
+                        <button string="确认" name="confirm" type="object" class="oe_highlight"/>
                         <button string="取消" class="btn btn-secondary" special="cancel"/>
                     </footer>
                 </sheet>

From 01fa7bbe87380541817423d6a4bc47a17c376412 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Thu, 12 Dec 2024 14:39:10 +0800
Subject: [PATCH 012/147] =?UTF-8?q?=E6=89=B9=E9=87=8F=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=AE=89=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/__manifest__.py              |  2 +
 sf_manufacturing/security/ir.model.access.csv |  2 +
 .../views/mrp_workorder_batch_replan.xml      | 17 ++++++++
 sf_manufacturing/wizard/__init__.py           |  1 +
 .../mrp_workorder_batch_replan_wizard.py      | 42 +++++++++++++++++++
 ...rp_workorder_batch_replan_wizard_views.xml | 32 ++++++++++++++
 6 files changed, 96 insertions(+)
 create mode 100644 sf_manufacturing/views/mrp_workorder_batch_replan.xml
 create mode 100644 sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard.py
 create mode 100644 sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard_views.xml

diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index 991b26ab..612577c2 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -24,6 +24,7 @@
         'wizard/production_wizard_views.xml',
         'wizard/production_technology_wizard_views.xml',
         'wizard/production_technology_re_adjust_wizard_views.xml',
+        'wizard/mrp_workorder_batch_replan_wizard_views.xml',
         'views/mrp_views_menus.xml',
         'views/agv_scheduling_views.xml',
         'views/stock_lot_views.xml',
@@ -38,6 +39,7 @@
         'views/sf_maintenance_equipment.xml',
         'views/res_config_settings_views.xml',
         'views/sale_order_views.xml',
+        'views/mrp_workorder_batch_replan.xml',
     ],
     'assets': {
 
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index 2880e662..f096b449 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -182,3 +182,5 @@ access_sf_manual_product_model_type_routing_sort_group_sf_mrp_user,sf_manual_pro
 access_sf_manual_product_model_type_routing_sort_manager,sf_manual_product_model_type_routing_sort,model_sf_manual_product_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,1
 access_sf_manual_product_model_type_routing_sort_group_plan_dispatch,sf_manual_product_model_type_routing_sort_group_plan_dispatch,model_sf_manual_product_model_type_routing_sort,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_detection_result_manager,sf_detection_result_manager,model_sf_detection_result,,1,1,1,1
+
+access_mrp_workorder_batch_replan_wizard_group_plan_dispatch,mrp_workorder_batch_replan_wizard_group_plan_dispatch,model_mrp_workorder_batch_replan_wizard,sf_base.group_plan_dispatch,1,1,1,0
\ No newline at end of file
diff --git a/sf_manufacturing/views/mrp_workorder_batch_replan.xml b/sf_manufacturing/views/mrp_workorder_batch_replan.xml
new file mode 100644
index 00000000..a09b1a0e
--- /dev/null
+++ b/sf_manufacturing/views/mrp_workorder_batch_replan.xml
@@ -0,0 +1,17 @@
+<odoo>
+    <data>
+        <record id="mrp_production_workorder_tree_editable_view_inherit" model="ir.ui.view">
+            <field name="name">>mrp.workorder.tree.editable.inherit</field>
+            <field name="model">mrp.workorder</field>
+            <field name="inherit_id" ref="mrp.mrp_production_workorder_tree_editable_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//tree/field[1]" position="before">
+                    <header>
+                        <button string="重新安排" name="%(sf_manufacturing.mrp_workorder_batch_replan_wizard)d" type="action"
+                                class="treeHeaderBtn"/>
+                    </header>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/sf_manufacturing/wizard/__init__.py b/sf_manufacturing/wizard/__init__.py
index e2206a5f..89bdc09b 100644
--- a/sf_manufacturing/wizard/__init__.py
+++ b/sf_manufacturing/wizard/__init__.py
@@ -3,3 +3,4 @@ from . import rework_wizard
 from . import production_wizard
 from . import production_technology_wizard
 from . import production_technology_re_adjust_wizard
+from . import mrp_workorder_batch_replan_wizard
diff --git a/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard.py b/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard.py
new file mode 100644
index 00000000..f9511040
--- /dev/null
+++ b/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+import logging
+from datetime import datetime, timedelta
+from odoo import models, api, fields, _
+
+
+class MrpWorkorderBatchReplanWizard(models.TransientModel):
+    _name = 'mrp.workorder.batch.replan.wizard'
+    _description = '制造订单批量重新安排向导'
+
+    def _get_date_planned_start(self):
+        planned_start_date = datetime.now() + timedelta(hours=2)
+        logging.info('计划开始加工时间: %s', planned_start_date)
+        return planned_start_date
+
+    def _get_default_workorder_count(self):
+        active_ids = self.env.context.get('active_ids', [])
+        return len(active_ids)
+
+    def _get_default_workorder_type(self):
+        active_ids = self.env.context.get('active_ids', [])
+        if active_ids:
+            workorders = self.env['mrp.workorder'].browse(active_ids)
+            if workorders:
+                unique_types = set(workorders.mapped('type'))
+                return '/'.join(sorted(unique_types)) if unique_types else None
+        return None
+
+    workorder_type = fields.Char(string='工单类型', default=_get_default_workorder_type, readonly=True)
+
+    date_planned_start = fields.Datetime(string='计划开始加工时间', index=True, copy=False,
+                                         default=_get_date_planned_start)
+
+    workorder_count = fields.Integer(string='工单数量',
+                                     default=_get_default_workorder_count,
+                                     readonly=True)
+
+    workorder_id = fields.Many2many('mrp.workorder', string=u'工单')
+
+    def confirm(self):
+        print("ddd")
+        pass
diff --git a/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard_views.xml b/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard_views.xml
new file mode 100644
index 00000000..e004cd6e
--- /dev/null
+++ b/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard_views.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="mrp_workorder_batch_replan_wizard_form" model="ir.ui.view">
+        <field name="name">mrp.workorder.batch.replan.wizard.form.view</field>
+        <field name="model">mrp.workorder.batch.replan.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <group>
+                    <field name="workorder_type"/>
+                    <field name="date_planned_start"/>
+                    <field name="workorder_count"/>
+                </group>
+                <footer>
+                    <button string="确认" name="confirm" type="object" class="oe_highlight"/>
+                    <button string="取消" class="btn-primary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+
+    <record id="mrp_workorder_batch_replan_wizard" model="ir.actions.act_window">
+        <field name="name">重新安排</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">mrp.workorder.batch.replan.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="mrp_workorder_batch_replan_wizard_form"/>
+        <field name="target">new</field>
+        <field name="context">{'default_workorder_id': active_ids}</field>
+    </record>
+
+</odoo>
\ No newline at end of file

From 9f67dbe9aac41467f74d5eec893b10de7a994009 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Thu, 12 Dec 2024 16:06:55 +0800
Subject: [PATCH 013/147] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=A4=96=E5=8D=8F?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=B2=A1=E6=9C=89=E8=87=AA=E5=8A=A8=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E5=B7=A5=E5=8D=95=E5=BC=80=E5=A7=8B=E3=80=81=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E7=9A=84=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/__init__.py       |  1 +
 sf_manufacturing/models/purchase_order.py | 31 +++++++++++++++++++
 sf_manufacturing/models/stock.py          | 37 +++++++++++++++--------
 3 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 sf_manufacturing/models/purchase_order.py

diff --git a/sf_manufacturing/models/__init__.py b/sf_manufacturing/models/__init__.py
index 9f77d841..c4d8ad94 100644
--- a/sf_manufacturing/models/__init__.py
+++ b/sf_manufacturing/models/__init__.py
@@ -15,3 +15,4 @@ from . import sf_technology_design
 from . import sf_production_common
 from . import sale_order
 from . import quick_easy_order
+from . import purchase_order
\ No newline at end of file
diff --git a/sf_manufacturing/models/purchase_order.py b/sf_manufacturing/models/purchase_order.py
new file mode 100644
index 00000000..e54e96bf
--- /dev/null
+++ b/sf_manufacturing/models/purchase_order.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from collections import defaultdict
+
+from odoo import api, fields, models, _
+from odoo.tools import OrderedSet
+
+
+# _get_surface_technics_purchase_ids
+class PurchaseOrder(models.Model):
+    _inherit = 'purchase.order'
+
+    def button_confirm(self):
+        super().button_confirm()
+        workorders = self.env['mrp.workorder'].search([('purchase_id', '=', self.id)])
+        for workorder in workorders:
+            if workorder.routing_type == '表面工艺' and  workorder.is_subcontract is True:
+                move_out = workorder.move_subcontract_workorder_ids[1]
+                # move_out = self.env['stock.move'].search(
+                #     [('location_id', '=', self.env['stock.location'].search(
+                #         [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
+                #      ('location_dest_id', '=', self.env['stock.location'].search(
+                #          [('barcode', 'ilike', 'VL-SPOC')]).id),
+                #      ('origin', '=', self.production_id.name), ('state', 'not in', ['cancel', 'done'])])
+                for mo in move_out:
+                    if mo.state != 'done':
+                        mo.write({'state': 'assigned', 'production_id': False})
+                        if not mo.move_line_ids:
+                            self.env['stock.move.line'].create(mo.get_move_line(workorder.production_id, workorder))
+        return True
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index fbe3be8c..6506cc1a 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -644,12 +644,19 @@ class StockPicking(models.Model):
                 workorder = move_in.subcontract_workorder_id
                 workorders = workorder.production_id.workorder_ids
                 subcontract_workorders = workorders.filtered(lambda wo: wo.is_subcontract == True).sorted('sequence')
-                if workorder == subcontract_workorders[-1]: 
+                if workorder == subcontract_workorders[-1]:
                     self.env['stock.quant']._update_reserved_quantity(
-                        move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty, lot_id=move_in.move_line_ids.lot_id,
+                        move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
+                        lot_id=move_in.move_line_ids.lot_id,
                         package_id=False, owner_id=False, strict=False
                     )
-           
+                workorder.button_finish()
+        picking_type_out = self.env.ref('sf_manufacturing.outcontract_picking_out').id
+        if res and self.picking_type_id.id == picking_type_out:
+            move_out = self.move_ids
+            if move_out:
+                workorder = move_out.subcontract_workorder_id
+                workorder.button_start()
         return res
 
     # 创建 外协出库入单
@@ -671,14 +678,16 @@ class StockPicking(models.Model):
                 else:
                     # 从sorted_workorders中找到上一工单的move
                     if sorted_workorders.index(workorder) > 0:
-                        move_dest_id = sorted_workorders[sorted_workorders.index(workorder) - 1].move_subcontract_workorder_ids[1].id
+                        move_dest_id = \
+                        sorted_workorders[sorted_workorders.index(workorder) - 1].move_subcontract_workorder_ids[1].id
                 new_picking = True
                 outcontract_picking_type_in = self.env.ref(
                     'sf_manufacturing.outcontract_picking_in').id,
                 outcontract_picking_type_out = self.env.ref(
                     'sf_manufacturing.outcontract_picking_out').id,
                 moves_in = self.env['stock.move'].sudo().create(
-                    self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_in, procurement_group_id.id, move_dest_id))
+                    self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_in,
+                                                                      procurement_group_id.id, move_dest_id))
                 picking_in = self.create(
                     moves_in._get_new_picking_values_Res(item, workorder, 'WH/OCIN/'))
                 # pick_ids.append(picking_in.id)
@@ -686,7 +695,8 @@ class StockPicking(models.Model):
                     {'picking_id': picking_in.id, 'state': 'waiting'})
                 moves_in._assign_picking_post_process(new=new_picking)
                 moves_out = self.env['stock.move'].sudo().create(
-                    self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_out, procurement_group_id.id, moves_in.id))
+                    self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_out,
+                                                                      procurement_group_id.id, moves_in.id))
                 workorder.write({'move_subcontract_workorder_ids': [(6, 0, [moves_in.id, moves_out.id])]})
                 picking_out = self.create(
                     moves_out._get_new_picking_values_Res(item, workorder, 'WH/OCOUT/'))
@@ -694,8 +704,7 @@ class StockPicking(models.Model):
                 moves_out.write(
                     {'picking_id': picking_out.id, 'state': 'waiting'})
                 moves_out._assign_picking_post_process(new=new_picking)
-           
-                    
+
     @api.depends('move_type', 'immediate_transfer', 'move_ids.state', 'move_ids.picking_id')
     def _compute_state(self):
         super(StockPicking, self)._compute_state()
@@ -706,7 +715,9 @@ class StockPicking(models.Model):
                 if picking.move_ids:
                     workorder = picking.move_ids[0].subcontract_workorder_id
                     if picking.state == 'assigned':
-                        if workorder.state in ['pending', 'waiting'] or workorder._get_surface_technics_purchase_ids().state in ['draft', 'sent']:
+                        if workorder.state in ['pending',
+                                               'waiting'] or workorder._get_surface_technics_purchase_ids().state in [
+                            'draft', 'sent']:
                             picking.state = 'waiting'
 
 
@@ -719,7 +730,8 @@ class ReStockMove(models.Model):
 
     def _get_stock_move_values_Res(self, item, picking_type_id, group_id, move_dest_ids=False):
         route_id = self.env.ref('sf_manufacturing.route_surface_technology_outsourcing').id
-        stock_rule = self.env['stock.rule'].sudo().search([('route_id', '=', route_id), ('picking_type_id', '=', picking_type_id)])
+        stock_rule = self.env['stock.rule'].sudo().search(
+            [('route_id', '=', route_id), ('picking_type_id', '=', picking_type_id)])
         move_values = {
             'name': '推',
             'company_id': item.company_id.id,
@@ -997,8 +1009,9 @@ class ReStockMove(models.Model):
                     res['origin'] = ','.join(productions.mapped('name'))
                 res['retrospect_ref'] = production.product_id.name
         return res
-    
-    subcontract_workorder_id = fields.Many2one('mrp.workorder', '外协工单组件', check_company=True, index='btree_not_null')
+
+    subcontract_workorder_id = fields.Many2one('mrp.workorder', '外协工单组件', check_company=True,
+                                               index='btree_not_null')
 
 
 class ReStockQuant(models.Model):

From 3253b26818b6dcae289081873c1336b94e14bdc1 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 13 Dec 2024 13:38:22 +0800
Subject: [PATCH 014/147] =?UTF-8?q?1=E3=80=81=E6=8A=A5=E4=BB=B7=E3=80=81?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E6=B7=BB=E5=8A=A0=E5=B9=B3=E5=8F=B0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E3=80=822=E3=80=81=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E7=9A=84=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E9=93=BE=E6=8E=A5=E6=8C=89=E9=87=87=E8=B4=AD=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=8B=86=E5=88=86=E4=B8=BA=E5=A7=94=E5=A4=96=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E5=92=8C=E9=87=87=E8=B4=AD=E7=9A=84=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/controllers/main.py |  2 +-
 sf_sale/models/sale_order.py         | 69 +++++++++++++++++++++++++++-
 sf_sale/views/sale_order_view.xml    | 25 ++++++++--
 3 files changed, 89 insertions(+), 7 deletions(-)

diff --git a/sf_manufacturing/controllers/main.py b/sf_manufacturing/controllers/main.py
index e45265d3..839b87fe 100644
--- a/sf_manufacturing/controllers/main.py
+++ b/sf_manufacturing/controllers/main.py
@@ -27,7 +27,7 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
             bfm_process_order_list = json.loads(kw['bfm_process_order_list'])
             order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create(
                 company_id, kw['delivery_name'], kw['delivery_telephone'], kw['delivery_address'],
-                kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], state='draft')
+                kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], kw['order_number'], state='draft')
             i = 1
             # 给sale_order的default_code字段赋值
             # aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)])
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index ca851fc6..c9cf8af8 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -58,9 +58,11 @@ class ReSaleOrder(models.Model):
     delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
                                         tracking=True)
 
+    order_code = fields.Char('平台订单号', readonly=True)
+
     # 业务平台分配工厂后在智能工厂先创建销售订单
     def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
-                          deadline_of_delivery, payments_way, pay_way, state='sale'):
+                          deadline_of_delivery, payments_way, pay_way, order_number, state='sale'):
         now_time = datetime.datetime.now()
         partner = self.get_customer()
         data = {
@@ -76,6 +78,7 @@ class ReSaleOrder(models.Model):
             'address_of_delivery': delivery_address,
             'payments_way': payments_way,
             'pay_way': pay_way,
+            'order_code': order_number,
         }
         if deadline_of_delivery:
             # deadline_of_delivery字段存在为false字符串情况
@@ -158,6 +161,68 @@ class ReSaleOrder(models.Model):
                 if not line.tax_id:
                     raise UserError('请对【订单行】中的【税】进行选择')
 
+    consignment_purchase_order_count = fields.Integer(
+        "Number of consignment Purchase Order Generated",
+        compute='_compute_purchase_order_count')
+
+    @api.depends('order_line.purchase_line_ids.order_id')
+    def _compute_purchase_order_count(self):
+        for order in self:
+            order.purchase_order_count = len(order._get_purchase_orders().filtered(
+                lambda po: po.purchase_type not in ['consignment']))
+            order.consignment_purchase_order_count = len(order._get_purchase_orders().filtered(
+                lambda po: po.purchase_type in ['consignment']))
+
+    def action_view_purchase_orders(self):
+        """
+        采购
+        """
+        self.ensure_one()
+        purchase_order_ids = self._get_purchase_orders().filtered(
+            lambda po: po.purchase_type not in ['consignment']).ids
+        action = {
+            'res_model': 'purchase.order',
+            'type': 'ir.actions.act_window',
+        }
+        if len(purchase_order_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': purchase_order_ids[0],
+            })
+        else:
+            action.update({
+                'name': _("从 %s生成采购订单", self.name),
+                'domain': [('id', 'in', purchase_order_ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
+    def action_view_consignment_purchase_orders(self):
+        """
+        委外加工
+        """
+        self.ensure_one()
+        consignment_purchase_order_ids = self._get_purchase_orders().filtered(
+            lambda po: po.purchase_type in ['consignment']).ids
+        action = {
+            'res_model': 'purchase.order',
+            'type': 'ir.actions.act_window',
+        }
+        if len(consignment_purchase_order_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': consignment_purchase_order_ids[0],
+            })
+        else:
+            action.update({
+                'name': _("从 %s生成委外加工订单", self.name),
+                'domain': [('id', 'in', consignment_purchase_order_ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
+
+
 
 class ResaleOrderLine(models.Model):
     _inherit = 'sale.order.line'
@@ -255,7 +320,7 @@ class RePurchaseOrder(models.Model):
             else:
                 server_template = self.env['product.template'].search(
                     [('server_product_process_parameters_id', '=', pp.surface_technics_parameters_id.id),
-                    ('detailed_type', '=', 'service')])
+                     ('detailed_type', '=', 'service')])
                 server_product_process.append((0, 0, {
                     'product_id': server_template.product_variant_id.id,
                     'product_qty': 1,
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 673d7fa3..641e4278 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -170,19 +170,34 @@
                     <field name="is_incoming_material"/>
                 </xpath>
                 <xpath expr="//field[@name='date_order']" position="attributes">
-                    <attribute name="string">下单时间</attribute>
+                    <attribute name="string">下单日期</attribute>
                 </xpath>
             </field>
         </record>
 
+        <record id="sale_order_inherited_form_purchase_sf" model="ir.ui.view">
+        <field name="name">sale.order.inherited.form.purchase</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale_purchase.sale_order_inherited_form_purchase"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='action_view_purchase_orders']" position="before">
+                <button class="oe_stat_button" name="action_view_consignment_purchase_orders" type="object" icon="fa-credit-card"
+                        groups='purchase.group_purchase_user'
+                        attrs="{'invisible': [('consignment_purchase_order_count', '=', 0)]}">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_value"><field name="consignment_purchase_order_count"/></span>
+                        <span class="o_stat_text">委外加工</span>
+                    </div>
+                </button>
+            </xpath>
+        </field>
+    </record>
+
         <record model="ir.ui.view" id="view_sale_management_order_form_quote_inherit_sf">
             <field name="name">sale.management.order.form.quote.inherit.sf</field>
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale_management.sale_order_form_quote"/>
             <field name="arch" type="xml">
-                <field name="date_order" position="attributes">
-                    <attribute name="string">下单日期</attribute>
-                </field>
                 <field name="sale_order_template_id" position="after">
                     <field name="remark" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
                 </field>
@@ -224,6 +239,7 @@
                     <attribute name="optional">hide</attribute>
                 </xpath>
                 <xpath expr="//field[@name='create_date']" position="after">
+                    <field name="order_code"/>
                     <field name="deadline_of_delivery"/>
                 </xpath>
                 <!-- <field name="state" position="after">
@@ -268,6 +284,7 @@
                     <field name="delivery_warning" invisible="1"/>
                 </field>
                 <xpath expr="//field[@name='date_order']" position="after">
+                    <field name="order_code"/>
                     <field name="deadline_of_delivery"/>
                 </xpath>
                 <xpath expr="//field[@name='activity_ids']" position="attributes">

From b551777d49452f88aef71159c02468c3786e11c5 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Fri, 13 Dec 2024 16:24:25 +0800
Subject: [PATCH 015/147] =?UTF-8?q?=E9=80=BE=E6=9C=9F=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=89=B9=E9=87=8F=E9=87=8D=E6=96=B0=E5=AE=89?=
 =?UTF-8?q?=E6=8E=92=E7=9A=84=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

---
 .../views/mrp_workorder_batch_replan.xml      |  3 +-
 .../mrp_workorder_batch_replan_wizard.py      | 42 +++++++++++++++----
 ...rp_workorder_batch_replan_wizard_views.xml |  3 +-
 .../views/mrp_workcenter_views.xml            |  2 +-
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/sf_manufacturing/views/mrp_workorder_batch_replan.xml b/sf_manufacturing/views/mrp_workorder_batch_replan.xml
index a09b1a0e..972d77c7 100644
--- a/sf_manufacturing/views/mrp_workorder_batch_replan.xml
+++ b/sf_manufacturing/views/mrp_workorder_batch_replan.xml
@@ -8,7 +8,8 @@
                 <xpath expr="//tree/field[1]" position="before">
                     <header>
                         <button string="重新安排" name="%(sf_manufacturing.mrp_workorder_batch_replan_wizard)d" type="action"
-                                class="treeHeaderBtn"/>
+                                class="treeHeaderBtn"
+                                invisible="context.get('workorder_type') not in ('工件装夹中心','1#自动生产线','工件拆卸中心')"/>
                     </header>
                 </xpath>
             </field>
diff --git a/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard.py b/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard.py
index f9511040..5f5d5261 100644
--- a/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard.py
+++ b/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard.py
@@ -22,15 +22,12 @@ class MrpWorkorderBatchReplanWizard(models.TransientModel):
         if active_ids:
             workorders = self.env['mrp.workorder'].browse(active_ids)
             if workorders:
-                unique_types = set(workorders.mapped('type'))
-                return '/'.join(sorted(unique_types)) if unique_types else None
+                routing_type = set(workorders.mapped('routing_type'))
+                return '/'.join(sorted(routing_type)) if routing_type else None
         return None
 
     workorder_type = fields.Char(string='工单类型', default=_get_default_workorder_type, readonly=True)
 
-    date_planned_start = fields.Datetime(string='计划开始加工时间', index=True, copy=False,
-                                         default=_get_date_planned_start)
-
     workorder_count = fields.Integer(string='工单数量',
                                      default=_get_default_workorder_count,
                                      readonly=True)
@@ -38,5 +35,36 @@ class MrpWorkorderBatchReplanWizard(models.TransientModel):
     workorder_id = fields.Many2many('mrp.workorder', string=u'工单')
 
     def confirm(self):
-        print("ddd")
-        pass
+        routing_type = set(self.workorder_id.mapped('routing_type'))
+        if len(routing_type) > 1:
+            raise models.ValidationError("批量重新安排工单类型必须一致。")
+        show_json_popover = self.workorder_id.mapped('show_json_popover')
+        if any(not value for value in show_json_popover):
+            raise models.ValidationError("所选工单必须都为逾期状态")
+        failed_workorders = {}
+        for workorder_info in self.workorder_id:
+            try:
+                workorder_info.action_replan()
+            except Exception as e:
+                reason = str(e)
+                if reason in failed_workorders:
+                    failed_workorders[reason].append(
+                        workorder_info.production_id.name)
+                else:
+                    failed_workorders[reason] = [workorder_info.production_id.name]
+        if failed_workorders:
+            error_messages = "\n".join(
+                [f"制造订单: {', '.join(workorder_names)}, 原因: {reason}" for reason, workorder_names in
+                 failed_workorders.items()])
+            return {
+                'type': 'ir.actions.client',
+                'tag': 'display_notification',
+                'params': {
+                    'message': f"以下工单重新安排失败:\n{error_messages}",
+                    'sticky': False,
+                    'color': 'red',
+                    'next': {
+                        'type': 'ir.actions.act_window_close'
+                    }
+                },
+            }
diff --git a/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard_views.xml b/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard_views.xml
index e004cd6e..37d26ac7 100644
--- a/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard_views.xml
+++ b/sf_manufacturing/wizard/mrp_workorder_batch_replan_wizard_views.xml
@@ -7,7 +7,6 @@
             <form>
                 <group>
                     <field name="workorder_type"/>
-                    <field name="date_planned_start"/>
                     <field name="workorder_count"/>
                 </group>
                 <footer>
@@ -20,7 +19,7 @@
 
 
     <record id="mrp_workorder_batch_replan_wizard" model="ir.actions.act_window">
-        <field name="name">重新安排</field>
+        <field name="name">重新安排工单</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">mrp.workorder.batch.replan.wizard</field>
         <field name="view_mode">form</field>
diff --git a/sf_tool_management/views/mrp_workcenter_views.xml b/sf_tool_management/views/mrp_workcenter_views.xml
index dcc52f7b..f69d4869 100644
--- a/sf_tool_management/views/mrp_workcenter_views.xml
+++ b/sf_tool_management/views/mrp_workcenter_views.xml
@@ -23,7 +23,7 @@
                 <t t-if="record.workorder_count.raw_value &gt; 0">
                     <button class="btn btn-primary" name="action_work_order" type="object"
                             attrs="{'invisible': [('name', '=', '功能刀具组装中心')]}"
-                            context="{'search_default_ready': 1, 'search_default_progress': 1}">
+                            context="{'search_default_ready': 1, 'search_default_progress': 1, 'workorder_type': name}">
                         <span>工单</span>
                     </button>
                 </t>

From 2b9a44761f97dd619d63569600d2d98986744b6c Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 13 Dec 2024 17:03:45 +0800
Subject: [PATCH 016/147] =?UTF-8?q?1=E3=80=81=E9=87=87=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=B7=BB=E5=8A=A0=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B3=E8=81=94=E8=B7=B3=E8=BD=AC=E8=87=B3=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=EF=BC=9B2?=
 =?UTF-8?q?=E3=80=81=E9=87=87=E8=B4=AD=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py          | 15 +++++++-
 sf_sale/views/purchase_order_view.xml | 55 +++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index c9cf8af8..11fa0096 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -222,8 +222,6 @@ class ReSaleOrder(models.Model):
         return action
 
 
-
-
 class ResaleOrderLine(models.Model):
     _inherit = 'sale.order.line'
 
@@ -283,6 +281,19 @@ class RePurchaseOrder(models.Model):
     purchase_type = fields.Selection([('standard', '标准采购'), ('consignment', '委外加工')], string='采购类型',
                                      default='standard')
 
+    origin_sale_id = fields.Many2one('sale.order', string='销售订单号', compute='_compute_origin_sale_id')
+
+    @api.depends('order_line.move_dest_ids.group_id.mrp_production_ids',
+                 'order_line.move_ids.move_dest_ids.group_id.mrp_production_ids')
+    def _compute_origin_sale_id(self):
+        for purchase in self:
+            productions_ids = purchase._get_mrp_productions()
+            if productions_ids:
+                if productions_ids[0].sale_order_id:
+                    purchase.origin_sale_id = productions_ids[0].sale_order_id.id
+                    continue
+            purchase.origin_sale_id = False
+
     @api.depends('partner_id')
     def _compute_user_id(self):
         if not self.user_id:
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 23c71a1f..28890cbd 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -130,6 +130,9 @@
                 <xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="attributes">
                     <attribute name="options">{'no_create': True}</attribute>
                 </xpath>
+                <xpath expr="//field[@name='date_order']" position="attributes">
+                    <attribute name="string">报价截止日期</attribute>
+                </xpath>
                 <field name="partner_ref" position="attributes">
                     <attribute name="attrs">{'readonly': [('state', 'in', ['purchase'])]}
                     </attribute>
@@ -163,6 +166,10 @@
                 <field name="partner_ref" position="after">
                     <field name="purchase_type" string="采购类型" readonly="1"/>
                 </field>
+<!--                添加销售订单号字段-->
+                <field name="effective_date" position="after">
+                    <field name="origin_sale_id" readonly="1" attrs="{'invisible': [('origin_sale_id', '=', False)]}"/>
+                </field>
             </field>
         </record>
 
@@ -174,6 +181,19 @@
                 <xpath expr="//tree//header//button[@name='action_create_invoice']" position="attributes">
                     <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
                 </xpath>
+                <xpath expr="//field[@name='user_id']" position="attributes">
+                    <attribute name="string">采购员</attribute>
+                </xpath>
+                <xpath expr="//field[@name='activity_ids']" position="attributes">
+                    <attribute name="optional">hide</attribute>
+                </xpath>
+                <xpath expr="//field[@name='date_order']" position="attributes">
+                    <attribute name="string">报价截止日期</attribute>
+                    <attribute name="widget">''</attribute>
+                </xpath>
+                <xpath expr="//field[@name='name']" position="after">
+                    <field name="purchase_type"/>
+                </xpath>
             </field>
         </record>
 
@@ -201,6 +221,20 @@
                 <tree position="attributes">
                     <attribute name="default_order">date_approve asc</attribute>
                 </tree>
+                <xpath expr="//field[@name='activity_ids']" position="attributes">
+                    <attribute name="optional">hide</attribute>
+                </xpath>
+                <xpath expr="//field[@name='date_planned']" position="replace">
+                </xpath>
+                <xpath expr="//field[@name='user_id']" position="attributes">
+                    <attribute name="string">采购员</attribute>
+                </xpath>
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="date_planned" string="预计到货日期" optional="show"/>
+                </xpath>
+                <xpath expr="//field[@name='name']" position="after">
+                    <field name="purchase_type"/>
+                </xpath>
             </field>
         </record>
 
@@ -212,8 +246,29 @@
                 <xpath expr="//field[@name='name']" position="replace">
                     <field name="name" string="单据编码" filter_domain="[('name', 'ilike', self)]"/>
                 </xpath>
+<!--                <xpath expr="//search" position="inside">-->
+<!--                    <searchpanel>-->
+<!--                        <field name="purchase_type" icon="fa-filter"/>-->
+<!--                        <field name="state" icon="fa-filter"/>-->
+<!--                    </searchpanel>-->
+<!--                </xpath>-->
             </field>
         </record>
+
+        <record id="purchase_order_view_search_sf" model="ir.ui.view">
+            <field name="name">purchase.order.list.select.sf</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_view_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//search" position="inside">
+                    <searchpanel>
+                        <field name="purchase_type" icon="fa-filter" enable_counters="1"/>
+                        <field name="state" icon="fa-filter" enable_counters="1"/>
+                    </searchpanel>
+                </xpath>
+            </field>
+        </record>
+
         <record id="purchase.product_normal_action_puchased" model="ir.actions.act_window">
             <field name="context">
                 {"search_default_categ_id":1,"search_default_filter_to_purchase":1, "purchase_product_template": 1}

From 202fafac841e7e1e8c0c4fe3e10c71f89a1839fa Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 16 Dec 2024 17:22:39 +0800
Subject: [PATCH 017/147] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=E3=80=81=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=96=B0=E5=A2=9E=E3=80=90=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E5=A4=96=E5=8D=8F=E3=80=91=E3=80=81=E3=80=90=E5=A4=96=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E3=80=91=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/__manifest__.py                  |  1 +
 sf_sale/models/sale_order.py             | 10 ++++++----
 sf_sale/static/src/css/purchase_list.css |  3 +++
 sf_sale/views/purchase_order_view.xml    |  3 +++
 sf_sale/views/sale_order_view.xml        |  7 +++++++
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 sf_sale/static/src/css/purchase_list.css

diff --git a/sf_sale/__manifest__.py b/sf_sale/__manifest__.py
index 45c95030..0ca6457c 100644
--- a/sf_sale/__manifest__.py
+++ b/sf_sale/__manifest__.py
@@ -26,6 +26,7 @@
     'assets': {
         'web.assets_backend': [
             'sf_sale/static/js/setTableWidth.js',
+            'sf_sale/static/src/css/purchase_list.css',
         ]
     },
     'demo': [
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 11fa0096..a0e321a0 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -55,8 +55,9 @@ class ReSaleOrder(models.Model):
         store=True, readonly=False, copy=False, precompute=True,
         states=READONLY_FIELD_STATES, default=fields.Datetime.now)
 
-    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
-                                        tracking=True)
+    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')],
+                                        default='normal',
+                                        string='时效', tracking=True)
 
     order_code = fields.Char('平台订单号', readonly=True)
 
@@ -278,8 +279,9 @@ class RePurchaseOrder(models.Model):
         compute='_compute_user_id',
         store=True)
 
-    purchase_type = fields.Selection([('standard', '标准采购'), ('consignment', '委外加工')], string='采购类型',
-                                     default='standard')
+    purchase_type = fields.Selection(
+        [('standard', '标准采购'), ('consignment', '委外加工'), ('outsourcing', '工序外协'), ('outside', '外购订单')],
+        string='采购类型', default='standard')
 
     origin_sale_id = fields.Many2one('sale.order', string='销售订单号', compute='_compute_origin_sale_id')
 
diff --git a/sf_sale/static/src/css/purchase_list.css b/sf_sale/static/src/css/purchase_list.css
new file mode 100644
index 00000000..2deacb9c
--- /dev/null
+++ b/sf_sale/static/src/css/purchase_list.css
@@ -0,0 +1,3 @@
+.purchase_order_list_name {
+    min-width: 62px !important;
+}
\ No newline at end of file
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 28890cbd..f70dbb6d 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -235,6 +235,9 @@
                 <xpath expr="//field[@name='name']" position="after">
                     <field name="purchase_type"/>
                 </xpath>
+                <xpath expr="//field[@name='name']" position="attributes">
+                    <attribute name="class">purchase_order_list_name</attribute>
+                </xpath>
             </field>
         </record>
 
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 641e4278..4373689d 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -261,6 +261,10 @@
                     <separator/>
                     <filter string="预警" name="filter_order_warning" domain="[('delivery_warning', '=', 'warning')]"/>
                     <filter string="逾期" name="filter_order_overdue" domain="[('delivery_warning', '=', 'overdue')]"/>
+                    <searchpanel>
+                        <field name="delivery_warning" string="交期状态" icon="fa-filter" enable_counters="1"/>
+                        <field name="state" icon="fa-filter" enable_counters="1"/>
+                    </searchpanel>
                 </xpath>
             </field>
         </record>
@@ -293,6 +297,9 @@
                 <xpath expr="//field[@name='invoice_status']" position="after">
                     <field name="state"/>
                 </xpath>
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="delivery_warning" string="交期状态"/>
+                </xpath>
             </field>
         </record>
 

From 1da3989fa302a2f515bd624bdb406c5feee2ad34 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Tue, 17 Dec 2024 11:34:24 +0800
Subject: [PATCH 018/147] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_message/__manifest__.py                    |  2 +-
 sf_message/controllers/main.py                | 16 ++++++++
 sf_message/data/bussiness_node.xml            | 14 +++++++
 sf_message/data/template_data.xml             | 41 ++++++++++++++++++-
 sf_message/models/__init__.py                 |  1 +
 .../models/sf_message_mrp_production.py       | 32 +++++++++++++++
 .../sf_message_mrp_production_wizard.py       | 17 ++++++++
 sf_message/models/sf_message_sale.py          | 34 ++++++++-------
 8 files changed, 141 insertions(+), 16 deletions(-)
 create mode 100644 sf_message/models/sf_message_mrp_production_wizard.py

diff --git a/sf_message/__manifest__.py b/sf_message/__manifest__.py
index 8178973b..9181b422 100644
--- a/sf_message/__manifest__.py
+++ b/sf_message/__manifest__.py
@@ -11,7 +11,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock', 'sf_quality', 'mrp'],
+    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock', 'sf_quality', 'mrp','sf_manufacturing'],
     'data': [
         'data/bussiness_node.xml',
         'data/cron_data.xml',
diff --git a/sf_message/controllers/main.py b/sf_message/controllers/main.py
index 11e776dc..9537417e 100644
--- a/sf_message/controllers/main.py
+++ b/sf_message/controllers/main.py
@@ -4,6 +4,7 @@ import logging
 from odoo import http
 from odoo.http import request
 from odoo.addons.sf_mrs_connect.controllers.controllers import Sf_Mrs_Connect
+from odoo.addons.sf_bf_connect.controllers.controllers import Sf_Bf_Connect
 from odoo.addons.sf_base.commons.common import Common
 
 _logger = logging.getLogger(__name__)
@@ -58,3 +59,18 @@ class MessageSfMrsConnect(Sf_Mrs_Connect):
             res = {'code': 400, 'message': '设备故障信息推送失败', 'error': str(e)}
         return json.JSONEncoder().encode(res)
 
+
+class MessageSfBfConnect(Sf_Bf_Connect):
+    @http.route('/api/bfm_process_order/list', type='http', auth='sf_token', methods=['GET', 'POST'], csrf=False,
+                cors="*")
+    def get_bfm_process_order_list(self, **kw):
+        res = super(MessageSfBfConnect, self).get_bfm_process_order_list(**kw)
+        response_data = json.loads(res.data.decode('utf-8'))
+        if response_data['status'] == 1:
+            try:
+                _logger.info('已进入待接单消息推送:%s' % response_data)
+                sale_order = request.env['sale.order'].sudo().search([('name', '=', response_data['factory_order_no'])])
+                sale_order.add_queue('待接单')
+            except Exception as e:
+                logging.info('add_queue error:%s' % e)
+        return res
diff --git a/sf_message/data/bussiness_node.xml b/sf_message/data/bussiness_node.xml
index a00ed056..925dc505 100644
--- a/sf_message/data/bussiness_node.xml
+++ b/sf_message/data/bussiness_node.xml
@@ -22,6 +22,15 @@
             <field name="model">sale.order</field>
         </record>
 
+        <record id="bussiness_supply_method" model="jikimo.message.bussiness.node">
+            <field name="name">待确认供货方式</field>
+            <field name="model">sale.order</field>
+        </record>
+
+        <record id="bussiness_technology_to_confirmed" model="jikimo.message.bussiness.node">
+            <field name="name">待确认加工路线</field>
+            <field name="model">mrp.production</field>
+        </record>
 
         <record id="transfer_inventory" model="jikimo.message.bussiness.node">
             <field name="name">调拨入库</field>
@@ -106,5 +115,10 @@
             <field name="name">设备故障</field>
             <field name="model">sf.maintenance.logs</field>
         </record>
+
+        <record id="bussiness_state_draft" model="jikimo.message.bussiness.node">
+            <field name="name">待排程</field>
+            <field name="model">mrp.production</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml
index beb37771..acaf363f 100644
--- a/sf_message/data/template_data.xml
+++ b/sf_message/data/template_data.xml
@@ -10,7 +10,7 @@
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
             <field name="content">### 待接单提醒：
-单号：销售订单[{{name}}]({{url}})
+单号：询价单[{{name}}]({{url}})
 事项：请确认是否接单。
             </field>
         </record>
@@ -275,5 +275,44 @@
 机台号：[{{maintenance_equipment_id.name}}]({{url}})
 事项：{{create_date}}故障报警</field>
         </record>
+
+        <record id="template_supply_method" model="jikimo.message.template">
+            <field name="name">待确认供货方式</field>
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="model">sale.order</field>
+            <field name="bussiness_node_id" ref="bussiness_supply_method"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 待确认供货方式提醒：
+单号：销售订单[{{name}}]({{url}})
+事项：请确认供货方式。
+            </field>
+        </record>
+
+        <record id="template_technology_to_confirmed" model="jikimo.message.template">
+            <field name="name">待确认加工路线</field>
+            <field name="model_id" ref="mrp.model_mrp_production"/>
+            <field name="model">mrp.production</field>
+            <field name="bussiness_node_id" ref="bussiness_technology_to_confirmed"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 待确认加工路线提醒：
+单号：产品[{{name}}]({{url}})
+事项：有{{production_num}}个制造订单需要确认加工路线。
+            </field>
+        </record>
+
+        <record id="template_state_draft" model="jikimo.message.template">
+            <field name="name">待排程</field>
+            <field name="model_id" ref="mrp.model_mrp_production"/>
+            <field name="model">mrp.production</field>
+            <field name="bussiness_node_id" ref="bussiness_state_draft"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 待排程提醒：
+单号：产品[{{name}}]({{url}})
+事项：有{{production_num}}个制造订单待排程。
+            </field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_message/models/__init__.py b/sf_message/models/__init__.py
index 0b9c9ad6..b9cc5079 100644
--- a/sf_message/models/__init__.py
+++ b/sf_message/models/__init__.py
@@ -10,3 +10,4 @@ from . import sf_message_functional_tool_dismantle
 from . import sf_message_mrp_production
 from . import sf_message_quality_cnc_test
 from . import sf_message_maintenance_logs
+from . import sf_message_mrp_production_wizard
diff --git a/sf_message/models/sf_message_mrp_production.py b/sf_message/models/sf_message_mrp_production.py
index a60f2161..fed30ae9 100644
--- a/sf_message/models/sf_message_mrp_production.py
+++ b/sf_message/models/sf_message_mrp_production.py
@@ -27,6 +27,7 @@ class SFMessageMrpProduction(models.Model):
     # 获取发送消息内容
     def _get_message(self, message_queue_ids):
         contents = []
+        unique_products = set()
         for message_queue_id in message_queue_ids:
             if message_queue_id.message_template_id.name == '生产完工入库提醒':
                 content = message_queue_id.message_template_id.content
@@ -40,6 +41,37 @@ class SFMessageMrpProduction(models.Model):
                         content = content.replace('{{name}}', stock_picking_sfp.name).replace(
                             '{{sale_order_name}}', mrp_production.origin).replace('{{request_url}}', url)
                         contents.append(content)
+            if message_queue_id.message_template_id.name == '待确认加工路线':
+                content = message_queue_id.message_template_id.content
+                mrp_production = self.env['mrp.production'].sudo().search([('id', '=', int(message_queue_id.res_id))])
+                production_num = self.env['mrp.production'].sudo().search_count(
+                    [('product_id', '=', mrp_production.product_id.id), ('state', '=', 'technology_to_confirmed')])
+                if production_num >= 1:
+                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+                    action_id = self.env.ref('mrp.mrp_production_action').id
+                    url_with_id = f"{url}/web#view_type=list&action={action_id}"
+                    content = (content.replace('{{name}}', mrp_production.product_id.name)
+                               .replace('{{url}}', url_with_id)
+                               .replace('{{production_num}}', str(production_num)))
+                    contents.append(content)
+            if message_queue_id.message_template_id.name == '待排程':
+                content = message_queue_id.message_template_id.content
+                mrp_production = self.env['mrp.production'].sudo().search([('id', '=', int(message_queue_id.res_id))])
+                unique_products.add(mrp_production.product_id.id)
+        if unique_products:
+            content_info = content
+            for products_id in unique_products:
+                product_name = self.env['product.product'].sudo().search([('id', '=', products_id)]).name
+                production_num = self.env['mrp.production'].sudo().search_count(
+                    [('product_id', '=', products_id), ('state', '=', 'confirmed')])
+                if production_num >= 1:
+                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+                    action_id = self.env.ref('sf_plan.sf_production_plan_action1').id
+                    url_with_id = f"{url}/web#view_type=list&action={action_id}"
+                    new_content = (content_info.replace('{{name}}', product_name)
+                                   .replace('{{url}}', url_with_id)
+                                   .replace('{{production_num}}', str(production_num)))
+                    contents.append(new_content)
         logging.info('生产完工入库提醒: %s' % contents)
         return contents
 
diff --git a/sf_message/models/sf_message_mrp_production_wizard.py b/sf_message/models/sf_message_mrp_production_wizard.py
new file mode 100644
index 00000000..c98152d3
--- /dev/null
+++ b/sf_message/models/sf_message_mrp_production_wizard.py
@@ -0,0 +1,17 @@
+import logging
+from odoo import models, fields, api, _
+
+
+class SFMessageMrpProductionWizard(models.TransientModel):
+    _name = 'sf.production.technology.wizard'
+    _description = "制造订单工艺确认向导"
+    _inherit = ['sf.production.technology.wizard', 'jikimo.message.dispatch']
+
+    def confirm(self):
+        super(SFMessageMrpProductionWizard, self).confirm()
+        try:
+            for production_info in self.production_id:
+                if production_info.state == 'confirmed':
+                    production_info.add_queue('待排程')
+        except Exception as e:
+            logging.info('add_queue待排程 error:%s' % e)
diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py
index 58d1a021..c96c845b 100644
--- a/sf_message/models/sf_message_sale.py
+++ b/sf_message/models/sf_message_sale.py
@@ -8,17 +8,6 @@ class SFMessageSale(models.Model):
     _name = 'sale.order'
     _inherit = ['sale.order', 'jikimo.message.dispatch']
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        res = super(SFMessageSale, self).create(vals_list)
-        if res:
-            try:
-                logging.info('add_queue res:%s' % res)
-                res.add_queue('待接单')
-            except Exception as e:
-                logging.info('add_queue error:%s' % e)
-        return res
-
     # 确认接单
     def action_confirm(self):
         res = super(SFMessageSale, self).action_confirm()
@@ -27,21 +16,36 @@ class SFMessageSale(models.Model):
                 self.add_queue('确认接单')
                 picking_ids = self.mrp_production_ids
                 purchase_order_id = []
+                unique_products = set()
                 if picking_ids:
                     for picking_id in picking_ids:
+                        unique_products.add(picking_id.product_id.id)
                         purchase_order_ids = (
                                 picking_id.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id |
                                 picking_id.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id).ids
                         purchase_order_id.extend(purchase_order_ids)
                     if purchase_order_id:
-                        purchase_order_list = self.env['purchase.order'].sudo().search([('id', 'in', purchase_order_id)])
+                        purchase_order_list = self.env['purchase.order'].sudo().search(
+                            [('id', 'in', purchase_order_id)])
                         for purchase_order_info in purchase_order_list:
                             purchase_order_info.add_queue('坯料采购提醒')
+                    if unique_products:
+                        for product_id in unique_products:
+                            production_info = self.env['mrp.production'].sudo().search(
+                                [('product_id', '=', product_id)], limit=1, order='id')
+                            production_info.add_queue('待确认加工路线')
             except Exception as e:
                 logging.info('add_queue error:%s' % e)
         logging.info('action_confirm res:%s' % res)
         return res
 
+    def confirm_to_supply_method(self):
+        super(SFMessageSale, self).confirm_to_supply_method()
+        try:
+            self.add_queue('待确认供货方式')
+        except Exception as e:
+            logging.info('add_queue待确认供货方式 error:%s' % e)
+
     # 继承并重写jikimo.message.dispatch的_get_message()
     def _get_message(self, message_queue_ids):
         contents = []
@@ -53,9 +57,11 @@ class SFMessageSale(models.Model):
         time_range = timedelta(minutes=2)
         i = 0
         for item in message_queue_ids:
-            if item.message_template_id.bussiness_node_id.name == '待接单':
+            if item.message_template_id.bussiness_node_id.name in ('待接单', '待确认供货方式'):
                 content = super(SFMessageSale, self)._get_message(item)
-                action_id = self.env.ref('sale.action_quotations_with_onboarding').id
+                action_id = self.env.ref('sale.action_quotations_with_onboarding').id \
+                    if item.message_template_id.bussiness_node_id.name == '待接单' \
+                    else self.env.ref('sale.action_orders').id
                 url_with_id = f"{url}/web#id={item.res_id}&view_type=form&action={action_id}"
                 content = content[0].replace('{{url}}', url_with_id)
                 contents.append(content)

From d7a25580d197ba844d6204378b2878a29c226f13 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Tue, 17 Dec 2024 14:42:15 +0800
Subject: [PATCH 019/147] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_message/models/__init__.py                 |  1 +
 .../models/sf_message_mrp_production.py       | 49 ++++++++++---------
 ...sf_message_mrp_production_adjust_wizard.py | 17 +++++++
 sf_message/models/sf_message_sale.py          |  8 +--
 4 files changed, 45 insertions(+), 30 deletions(-)
 create mode 100644 sf_message/models/sf_message_mrp_production_adjust_wizard.py

diff --git a/sf_message/models/__init__.py b/sf_message/models/__init__.py
index b9cc5079..1e659c52 100644
--- a/sf_message/models/__init__.py
+++ b/sf_message/models/__init__.py
@@ -11,3 +11,4 @@ from . import sf_message_mrp_production
 from . import sf_message_quality_cnc_test
 from . import sf_message_maintenance_logs
 from . import sf_message_mrp_production_wizard
+from . import sf_message_mrp_production_adjust_wizard
diff --git a/sf_message/models/sf_message_mrp_production.py b/sf_message/models/sf_message_mrp_production.py
index fed30ae9..00748511 100644
--- a/sf_message/models/sf_message_mrp_production.py
+++ b/sf_message/models/sf_message_mrp_production.py
@@ -28,6 +28,7 @@ class SFMessageMrpProduction(models.Model):
     def _get_message(self, message_queue_ids):
         contents = []
         unique_products = set()
+        technology_to_confirmed = set()
         for message_queue_id in message_queue_ids:
             if message_queue_id.message_template_id.name == '生产完工入库提醒':
                 content = message_queue_id.message_template_id.content
@@ -44,37 +45,39 @@ class SFMessageMrpProduction(models.Model):
             if message_queue_id.message_template_id.name == '待确认加工路线':
                 content = message_queue_id.message_template_id.content
                 mrp_production = self.env['mrp.production'].sudo().search([('id', '=', int(message_queue_id.res_id))])
-                production_num = self.env['mrp.production'].sudo().search_count(
-                    [('product_id', '=', mrp_production.product_id.id), ('state', '=', 'technology_to_confirmed')])
-                if production_num >= 1:
-                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-                    action_id = self.env.ref('mrp.mrp_production_action').id
-                    url_with_id = f"{url}/web#view_type=list&action={action_id}"
-                    content = (content.replace('{{name}}', mrp_production.product_id.name)
-                               .replace('{{url}}', url_with_id)
-                               .replace('{{production_num}}', str(production_num)))
-                    contents.append(content)
+                technology_to_confirmed.add(mrp_production.product_id.id)
             if message_queue_id.message_template_id.name == '待排程':
                 content = message_queue_id.message_template_id.content
                 mrp_production = self.env['mrp.production'].sudo().search([('id', '=', int(message_queue_id.res_id))])
                 unique_products.add(mrp_production.product_id.id)
         if unique_products:
-            content_info = content
-            for products_id in unique_products:
-                product_name = self.env['product.product'].sudo().search([('id', '=', products_id)]).name
-                production_num = self.env['mrp.production'].sudo().search_count(
-                    [('product_id', '=', products_id), ('state', '=', 'confirmed')])
-                if production_num >= 1:
-                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-                    action_id = self.env.ref('sf_plan.sf_production_plan_action1').id
-                    url_with_id = f"{url}/web#view_type=list&action={action_id}"
-                    new_content = (content_info.replace('{{name}}', product_name)
-                                   .replace('{{url}}', url_with_id)
-                                   .replace('{{production_num}}', str(production_num)))
-                    contents.append(new_content)
+            unique_products_contents = self.get_production_info(content, unique_products, 'confirmed',
+                                                                'sf_plan.sf_production_plan_action1')
+            contents.extend(unique_products_contents)
+        if technology_to_confirmed:
+            technology_to_confirmed_contents = self.get_production_info(content, technology_to_confirmed,
+                                                                        'technology_to_confirmed',
+                                                                        'mrp.mrp_production_action')
+            contents.extend(technology_to_confirmed_contents)
         logging.info('生产完工入库提醒: %s' % contents)
         return contents
 
+    def get_production_info(self, content, product_ids, state, action_id):
+        contents = []
+        for products_id in product_ids:
+            product_name = self.env['product.product'].sudo().search([('id', '=', products_id)]).name
+            production_num = self.env['mrp.production'].sudo().search_count(
+                [('product_id', '=', products_id), ('state', '=', state)])
+            if production_num >= 1:
+                url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+                action_id = self.env.ref(action_id).id
+                url_with_id = f"{url}/web#view_type=list&action={action_id}"
+                new_content = (content.replace('{{name}}', product_name)
+                               .replace('{{url}}', url_with_id)
+                               .replace('{{production_num}}', str(production_num)))
+                contents.append(new_content)
+        return contents
+
     def request_url(self, id):
         url = self.env['ir.config_parameter'].get_param('web.base.url')
         action_id = self.env.ref('stock.action_picking_tree_all').id
diff --git a/sf_message/models/sf_message_mrp_production_adjust_wizard.py b/sf_message/models/sf_message_mrp_production_adjust_wizard.py
new file mode 100644
index 00000000..224b845f
--- /dev/null
+++ b/sf_message/models/sf_message_mrp_production_adjust_wizard.py
@@ -0,0 +1,17 @@
+import logging
+from odoo import models, fields, api, _
+
+
+class SFMessageMrpProductionAdjustWizard(models.TransientModel):
+    _name = 'sf.production.technology.re_adjust.wizard'
+    _description = "制造订单工艺调整"
+    _inherit = ['sf.production.technology.re_adjust.wizard', 'jikimo.message.dispatch']
+
+    def confirm(self):
+        super(SFMessageMrpProductionAdjustWizard, self).confirm()
+        try:
+            for production_info in self.production_id:
+                if production_info.state == 'technology_to_confirmed':
+                    production_info.add_queue('待确认加工路线')
+        except Exception as e:
+            logging.info('add_queue待确认加工路线 error:%s' % e)
diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py
index c96c845b..a76468dd 100644
--- a/sf_message/models/sf_message_sale.py
+++ b/sf_message/models/sf_message_sale.py
@@ -16,10 +16,9 @@ class SFMessageSale(models.Model):
                 self.add_queue('确认接单')
                 picking_ids = self.mrp_production_ids
                 purchase_order_id = []
-                unique_products = set()
                 if picking_ids:
                     for picking_id in picking_ids:
-                        unique_products.add(picking_id.product_id.id)
+                        picking_id.add_queue('待确认加工路线')
                         purchase_order_ids = (
                                 picking_id.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id |
                                 picking_id.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id).ids
@@ -29,11 +28,6 @@ class SFMessageSale(models.Model):
                             [('id', 'in', purchase_order_id)])
                         for purchase_order_info in purchase_order_list:
                             purchase_order_info.add_queue('坯料采购提醒')
-                    if unique_products:
-                        for product_id in unique_products:
-                            production_info = self.env['mrp.production'].sudo().search(
-                                [('product_id', '=', product_id)], limit=1, order='id')
-                            production_info.add_queue('待确认加工路线')
             except Exception as e:
                 logging.info('add_queue error:%s' % e)
         logging.info('action_confirm res:%s' % res)

From 42444e6c8358a440b2a8fbce2d0d4433ba751388 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Tue, 17 Dec 2024 17:21:36 +0800
Subject: [PATCH 020/147] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_message/data/template_data.xml             |  4 +-
 sf_message/models/sf_message_stock_picking.py | 39 +++++--------------
 2 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml
index acaf363f..bcc12441 100644
--- a/sf_message/data/template_data.xml
+++ b/sf_message/data/template_data.xml
@@ -72,8 +72,8 @@
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
             <field name="content">### 坯料发料提醒：
-单号：产品[{{product_id}}]({{request_url}})
-事项：共{{number}}个生产发料单待确认处理</field>
+单号：发料单[{{name}}]({{request_url}})
+事项：请确认坯料发料单并处理</field>
         </record>
 
         <record id="template_mrp_workorder_remind" model="jikimo.message.template">
diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py
index 6e80c670..38a6fc16 100644
--- a/sf_message/models/sf_message_stock_picking.py
+++ b/sf_message/models/sf_message_stock_picking.py
@@ -49,26 +49,18 @@ class SFMessageStockPicking(models.Model):
 
     def _get_message(self, message_queue_ids):
         contents = []
-        product_id = []
         for message_queue_id in message_queue_ids:
-            i = 0
             if message_queue_id.message_template_id.name == '坯料发料提醒':
                 content = message_queue_id.message_template_id.content
-                stock_picking_line = self.env['stock.picking'].sudo().search([('id', '=', int(message_queue_id.res_id))])
-                mrp_production_info = self.env['mrp.production'].sudo().search(
-                    [('name', '=', stock_picking_line.origin)])
-                mrp_production_list = self.env['mrp.production'].sudo().search(
-                    [('product_id', '=', mrp_production_info.product_id.id)])
-                for mrp_production_line in mrp_production_list:
-                    picking_ids = mrp_production_line.picking_ids
-                    for picking_id in picking_ids:
-                        if picking_id.state == 'assigned' and picking_id.check_in == 'PC':
-                            i += 1
-                if i > 0 and mrp_production_info.product_id.id not in product_id:
-                    url = self.request_url()
-                    content = content.replace('{{product_id}}', mrp_production_info.product_id.name).replace(
-                        '{{number}}', str(i)).replace('{{request_url}}', url)
-                    product_id.append(mrp_production_info.product_id.id)
+                stock_picking_line = self.env['stock.picking'].sudo().search(
+                    [('id', '=', int(message_queue_id.res_id))])
+                if stock_picking_line.state == 'assigned':
+                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+                    action_id = self.env.ref('stock.action_picking_tree_ready').id
+                    menu_id = self.env['ir.model.data'].sudo().search([('name', '=', 'module_theme_treehouse')]).id
+                    url_with_id = f"{url}/web#view_type=form&action={action_id}&menu_id={menu_id}&id={stock_picking_line.id}"
+                    content = content.replace('{{name}}', stock_picking_line.name).replace(
+                        '{{request_url}}', url_with_id)
                     contents.append(content)
             elif message_queue_id.message_template_id.name == '订单发货提醒':
                 content = self.deal_stock_picking_sfp(message_queue_id)
@@ -86,19 +78,6 @@ class SFMessageStockPicking(models.Model):
         else:
             return super(SFMessageStockPicking, self).get_special_url(id, tmplate_name, special_name, model_id)
 
-    def request_url(self):
-        url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-        action_id = self.env.ref('stock.stock_picking_type_action').id
-        menu_id = self.env['ir.model.data'].sudo().search([('name', '=', 'module_theme_treehouse')]).id
-        # 查询参数
-        params = {'menu_id': menu_id, 'action': action_id, 'model': 'stock.picking',
-                  'view_type': 'kanban'}
-        # 拼接查询参数
-        query_string = urlencode(params)
-        # 拼接URL
-        full_url = url + "/web#" + query_string
-        return full_url
-
     def request_url1(self, id):
         url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
         action_id = self.env.ref('stock.action_picking_tree_all').id

From 79d188fb5c7a099502e849cf32d982904befe48a Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Wed, 18 Dec 2024 16:26:28 +0800
Subject: [PATCH 021/147] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wizard/production_technology_wizard.py    |  1 +
 sf_message/data/bussiness_node.xml            | 15 ++++++++
 sf_message/data/template_data.xml             | 36 +++++++++++++++++++
 .../sf_message_mrp_production_wizard.py       |  8 ++++-
 sf_message/models/sf_message_purchase.py      | 29 ++++++++++++++-
 sf_message/models/sf_message_sale.py          |  6 ++++
 6 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/sf_manufacturing/wizard/production_technology_wizard.py b/sf_manufacturing/wizard/production_technology_wizard.py
index e5976aaa..6e91e053 100644
--- a/sf_manufacturing/wizard/production_technology_wizard.py
+++ b/sf_manufacturing/wizard/production_technology_wizard.py
@@ -116,3 +116,4 @@ class ProductionTechnologyWizard(models.TransientModel):
             if workorder[0].state in ['pending']:
                 if workorder[0].production_id.product_id.categ_id.type == '成品' and item.programming_state != '已编程':
                     workorder[0].state = 'waiting'
+        return productions
diff --git a/sf_message/data/bussiness_node.xml b/sf_message/data/bussiness_node.xml
index 925dc505..8864beda 100644
--- a/sf_message/data/bussiness_node.xml
+++ b/sf_message/data/bussiness_node.xml
@@ -120,5 +120,20 @@
             <field name="name">待排程</field>
             <field name="model">mrp.production</field>
         </record>
+
+        <record id="bussiness_outsourcing" model="jikimo.message.bussiness.node">
+            <field name="name">委外加工采购单提醒</field>
+            <field name="model">purchase.order</field>
+        </record>
+
+        <record id="bussiness_purchase" model="jikimo.message.bussiness.node">
+            <field name="name">外购订单采购单提醒</field>
+            <field name="model">purchase.order</field>
+        </record>
+
+        <record id="bussiness_process_outsourcing" model="jikimo.message.bussiness.node">
+            <field name="name">工序外协采购单通知</field>
+            <field name="model">purchase.order</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml
index bcc12441..b7e19a7b 100644
--- a/sf_message/data/template_data.xml
+++ b/sf_message/data/template_data.xml
@@ -314,5 +314,41 @@
 事项：有{{production_num}}个制造订单待排程。
             </field>
         </record>
+
+        <record id="template_outsourcing_remind" model="jikimo.message.template">
+            <field name="name">委外加工采购单提醒</field>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
+            <field name="model">purchase.order</field>
+            <field name="bussiness_node_id" ref="bussiness_outsourcing"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 委外加工采购通知：
+单号：委外加工采购单[{{name}}]({{request_url}})
+事项：请确认委外采购单并处理。</field>
+        </record>
+
+        <record id="template_purchase_remind" model="jikimo.message.template">
+            <field name="name">外购订单采购单提醒</field>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
+            <field name="model">purchase.order</field>
+            <field name="bussiness_node_id" ref="bussiness_purchase"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 外购订单采购通知：
+单号：外购采购单[{{name}}]({{request_url}})
+事项：请确认外购采购单并处理。</field>
+        </record>
+
+        <record id="template_process_outsourcing_remind" model="jikimo.message.template">
+            <field name="name">工序外协采购单通知</field>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
+            <field name="model">purchase.order</field>
+            <field name="bussiness_node_id" ref="bussiness_process_outsourcing"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 工序外协采购单通知：
+单号：工序外协采购单产品[{{name}}]({{url}})
+事项：有{{num}}个工序外协采购单需要确认。</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_message/models/sf_message_mrp_production_wizard.py b/sf_message/models/sf_message_mrp_production_wizard.py
index c98152d3..0defae7e 100644
--- a/sf_message/models/sf_message_mrp_production_wizard.py
+++ b/sf_message/models/sf_message_mrp_production_wizard.py
@@ -8,10 +8,16 @@ class SFMessageMrpProductionWizard(models.TransientModel):
     _inherit = ['sf.production.technology.wizard', 'jikimo.message.dispatch']
 
     def confirm(self):
-        super(SFMessageMrpProductionWizard, self).confirm()
+        productions = super(SFMessageMrpProductionWizard, self).confirm()
         try:
             for production_info in self.production_id:
                 if production_info.state == 'confirmed':
                     production_info.add_queue('待排程')
+            for production_id in productions:
+                workorder_ids = production_id.workorder_ids.filtered(
+                    lambda p: p.routing_type == '表面工艺' and p.state != 'cancel')
+                for workorder_id in workorder_ids:
+                    purchase_orders_id = workorder_id._get_surface_technics_purchase_ids()
+                    purchase_orders_id.add_queue('工序外协采购单通知')
         except Exception as e:
             logging.info('add_queue待排程 error:%s' % e)
diff --git a/sf_message/models/sf_message_purchase.py b/sf_message/models/sf_message_purchase.py
index e3fe269f..3f1c4709 100644
--- a/sf_message/models/sf_message_purchase.py
+++ b/sf_message/models/sf_message_purchase.py
@@ -8,14 +8,41 @@ class SFMessagePurchase(models.Model):
 
     def _get_message(self, message_queue_ids):
         contents = []
+        process_outsourcing = set()
         for message_queue_id in message_queue_ids:
-            if message_queue_id.message_template_id.name == '坯料采购提醒':
+            if message_queue_id.message_template_id.name in (
+                    '坯料采购提醒', '委外加工采购单提醒', '外购订单采购单提醒'):
                 content = message_queue_id.message_template_id.content
                 url = self.request_url(int(message_queue_id.res_id))
                 purchase_order_line = self.env['purchase.order'].search([('id', '=', int(message_queue_id.res_id))])
                 content = content.replace('{{name}}', purchase_order_line.name).replace(
                     '{{request_url}}', url)
                 contents.append(content)
+            if message_queue_id.message_template_id.name == '工序外协采购单通知':
+                content = message_queue_id.message_template_id.content
+                purchase_order_line = self.env['purchase.order'].sudo().search(
+                    [('id', '=', int(message_queue_id.res_id))])
+                mrp_production = self.env['mrp.production'].sudo().search([('name', '=', purchase_order_line.origin)])
+                process_outsourcing.add(mrp_production.product_id.id)
+        if process_outsourcing:
+            content_info = content
+            for products_id in process_outsourcing:
+                production_num = 0
+                product_name = self.env['product.product'].sudo().search([('id', '=', products_id)]).name
+                production_list = self.env['mrp.production'].sudo().search(
+                    [('product_id', '=', products_id), ('state', '=', 'confirmed')])
+                for production_info in production_list:
+                    workorder_ids = len(production_info.workorder_ids.filtered(
+                        lambda p: p.routing_type == '表面工艺' and p.state != 'cancel'))
+                    production_num += workorder_ids
+                if production_num >= 1:
+                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+                    action_id = self.env.ref('purchase.purchase_form_action').id
+                    url_with_id = f"{url}/web#view_type=list&action={action_id}"
+                    new_content = (content_info.replace('{{name}}', product_name)
+                                   .replace('{{url}}', url_with_id)
+                                   .replace('{{num}}', str(production_num)))
+                    contents.append(new_content)
         return contents
 
     def request_url(self, id):
diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py
index a76468dd..4200ea72 100644
--- a/sf_message/models/sf_message_sale.py
+++ b/sf_message/models/sf_message_sale.py
@@ -28,6 +28,12 @@ class SFMessageSale(models.Model):
                             [('id', 'in', purchase_order_id)])
                         for purchase_order_info in purchase_order_list:
                             purchase_order_info.add_queue('坯料采购提醒')
+                purchase_order_ids = self.order_line.purchase_line_ids.order_id | self.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id | self.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id
+                for purchase_order_id in purchase_order_ids:
+                    if purchase_order_id.purchase_type == 'consignment':
+                        purchase_order_id.add_queue('委外加工采购单提醒')
+                    if purchase_order_id.purchase_type == 'standard':
+                        purchase_order_id.add_queue('外购订单采购单提醒')
             except Exception as e:
                 logging.info('add_queue error:%s' % e)
         logging.info('action_confirm res:%s' % res)

From 15eb36a5bc7b9107e551b4a0754552537a251329 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 18 Dec 2024 16:39:54 +0800
Subject: [PATCH 022/147] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E3=80=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E4=BC=98=E5=8C=96=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E3=80=81=E8=AF=A6=E6=83=85=E9=A1=B5=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py          |  7 +++++++
 sf_sale/views/purchase_order_view.xml | 12 ++++++++++++
 sf_sale/views/sale_order_view.xml     |  6 +++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index a0e321a0..2e99de70 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -263,6 +263,7 @@ class ProductTemplate(models.Model):
     _inherit = 'product.template'
 
     manual_quotation = fields.Boolean('人工编程', default=False)
+    part_name = fields.Char(string='零件名称', readonly=True)
 
 
 class RePurchaseOrder(models.Model):
@@ -378,6 +379,12 @@ class RePurchaseOrder(models.Model):
         return result
 
 
+class PurchaseOrderLine(models.Model):
+    _inherit = 'purchase.order.line'
+
+    part_name = fields.Char('零件名称', related='product_id.part_name', readonly=True)
+
+
 class ResPartnerToSale(models.Model):
     _inherit = 'res.partner'
 
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index f70dbb6d..ccdee1d0 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -130,6 +130,12 @@
                 <xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="attributes">
                     <attribute name="options">{'no_create': True}</attribute>
                 </xpath>
+                <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="attributes">
+                    <attribute name="optional">hide</attribute>
+                </xpath>
+                <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="after">
+                    <field name="part_name" string="零件名称" optional="show"/>
+                </xpath>
                 <xpath expr="//field[@name='date_order']" position="attributes">
                     <attribute name="string">报价截止日期</attribute>
                 </xpath>
@@ -191,9 +197,15 @@
                     <attribute name="string">报价截止日期</attribute>
                     <attribute name="widget">''</attribute>
                 </xpath>
+                <xpath expr="//field[@name='date_order']" position="after">
+                    <field name="date_planned"/>
+                </xpath>
                 <xpath expr="//field[@name='name']" position="after">
                     <field name="purchase_type"/>
                 </xpath>
+                <xpath expr="//field[@name='name']" position="attributes">
+                    <attribute name="class">purchase_order_list_name</attribute>
+                </xpath>
             </field>
         </record>
 
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 4373689d..d6247823 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -169,9 +169,10 @@
                     <field name="manual_quotation" />
                     <field name="is_incoming_material"/>
                 </xpath>
-                <xpath expr="//field[@name='date_order']" position="attributes">
+                <xpath expr="//sheet//group//group[@name='order_details']//div[@class='o_td_label'][2]//label[@for='date_order']" position="attributes">
                     <attribute name="string">下单日期</attribute>
                 </xpath>
+
             </field>
         </record>
 
@@ -287,6 +288,9 @@
                 <field name="amount_total" position="after">
                     <field name="delivery_warning" invisible="1"/>
                 </field>
+                <field name="date_order" position="attributes">
+                    <attribute name="string">下单日期</attribute>
+                </field>
                 <xpath expr="//field[@name='date_order']" position="after">
                     <field name="order_code"/>
                     <field name="deadline_of_delivery"/>

From ff91aa1ad69b83ba560ff0361a1ce2dedb7a02d6 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 18 Dec 2024 16:56:26 +0800
Subject: [PATCH 023/147] =?UTF-8?q?sf-=E5=88=9B=E5=BB=BA=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E6=97=B6=E6=8F=90=E7=A4=BA=E5=91=98=E5=B7=A5=E5=B7=B2=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_hr/models/hr_employee.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sf_hr/models/hr_employee.py b/sf_hr/models/hr_employee.py
index 5d37f199..2a93ddc5 100644
--- a/sf_hr/models/hr_employee.py
+++ b/sf_hr/models/hr_employee.py
@@ -23,6 +23,16 @@ class JkmPracticeEmployee(models.Model):
             vals["we_id"] = self._get_we_id(vals.get('work_email'))
         return super(JkmPracticeEmployee, self).write(vals)
 
+    def unlink(self):
+        for record in self:
+            res_partner_obj = record.env['res.partner'].sudo().search([('email', '=', record.work_email)])
+            if res_partner_obj:
+                res_partner_obj.unlink()
+        res = super(JkmPracticeEmployee, self).unlink()
+
+        return res
+
+
     @api.depends('work_contact_id', 'work_contact_id.mobile', 'work_contact_id.email')
     def _compute_work_contact_details(self):
         for employee in self:

From 5eda4427df26745432ea096471561dca7de2f2cb Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Thu, 19 Dec 2024 13:09:20 +0800
Subject: [PATCH 024/147] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_message/data/bussiness_node.xml             |  5 +++++
 sf_message/data/template_data.xml              | 16 ++++++++++++++--
 sf_message/models/sf_message_mrp_production.py | 18 +++++++++++++++++-
 sf_message/models/sf_message_stock_picking.py  | 12 +++++++++++-
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/sf_message/data/bussiness_node.xml b/sf_message/data/bussiness_node.xml
index 8864beda..b273fab1 100644
--- a/sf_message/data/bussiness_node.xml
+++ b/sf_message/data/bussiness_node.xml
@@ -135,5 +135,10 @@
             <field name="name">工序外协采购单通知</field>
             <field name="model">purchase.order</field>
         </record>
+
+        <record id="bussiness_outsourced_outbound" model="jikimo.message.bussiness.node">
+            <field name="name">工序外协发料通知</field>
+            <field name="model">mrp.production</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml
index b7e19a7b..e9aee4bb 100644
--- a/sf_message/data/template_data.xml
+++ b/sf_message/data/template_data.xml
@@ -347,8 +347,20 @@
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
             <field name="content">### 工序外协采购单通知：
-单号：工序外协采购单产品[{{name}}]({{url}})
-事项：有{{num}}个工序外协采购单需要确认。</field>
+单号：工序外协采购，产品[{{name}}]({{url}})
+事项：请确认{{num}}个工序外协采购单并处理。</field>
+        </record>
+
+        <record id="template_outsourced_outbound_remind" model="jikimo.message.template">
+            <field name="name">工序外协发料通知</field>
+            <field name="model_id" ref="mrp.model_mrp_production"/>
+            <field name="model">mrp.production</field>
+            <field name="bussiness_node_id" ref="bussiness_outsourced_outbound"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 工序外协发料提醒：
+单号：产品[{{name}}]({{url}})发料单
+事项：请确认{{num}}个工序外协发料单并发料处理。</field>
         </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_message/models/sf_message_mrp_production.py b/sf_message/models/sf_message_mrp_production.py
index 00748511..37509e52 100644
--- a/sf_message/models/sf_message_mrp_production.py
+++ b/sf_message/models/sf_message_mrp_production.py
@@ -50,6 +50,22 @@ class SFMessageMrpProduction(models.Model):
                 content = message_queue_id.message_template_id.content
                 mrp_production = self.env['mrp.production'].sudo().search([('id', '=', int(message_queue_id.res_id))])
                 unique_products.add(mrp_production.product_id.id)
+            if message_queue_id.message_template_id.name == '工序外协发料通知':
+                content = message_queue_id.message_template_id.content
+                mrp_production = self.env['mrp.production'].sudo().search([('id', '=', int(message_queue_id.res_id))])
+                mrp_production_list = self.env['mrp.production'].sudo().search(
+                    [('product_id', '=', mrp_production.product_id.id)])
+                mrp_production_names = mrp_production_list.mapped('name')
+                stock_picking_num = self.env['stock.picking'].sudo().search_count(
+                    [('origin', 'in', mrp_production_names), ('state', '=', 'assigned')])
+                if stock_picking_num >= 1:
+                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+                    action_id = self.env.ref('stock.action_picking_tree_ready').id
+                    url_with_id = f"{url}/web#view_type=list&action={action_id}"
+                    content = content.replace('{{name}}', mrp_production.product_id.name).replace('{{url}}',
+                                                                                                  url_with_id).replace(
+                        '{{num}}', str(stock_picking_num))
+                    contents.append(content)
         if unique_products:
             unique_products_contents = self.get_production_info(content, unique_products, 'confirmed',
                                                                 'sf_plan.sf_production_plan_action1')
@@ -83,7 +99,7 @@ class SFMessageMrpProduction(models.Model):
         action_id = self.env.ref('stock.action_picking_tree_all').id
         menu_id = self.env['ir.model.data'].search([('name', '=', 'module_theme_treehouse')]).id
         # 查询参数
-        params = {'id': id, 'menu_id': menu_id, 'action': action_id,  'model': 'mrp.production',
+        params = {'id': id, 'menu_id': menu_id, 'action': action_id, 'model': 'mrp.production',
                   'view_type': 'form'}
         # 拼接查询参数
         query_string = urlencode(params)
diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py
index 38a6fc16..4637941b 100644
--- a/sf_message/models/sf_message_stock_picking.py
+++ b/sf_message/models/sf_message_stock_picking.py
@@ -21,7 +21,7 @@ class SFMessageStockPicking(models.Model):
     def _compute_state(self):
         super(SFMessageStockPicking, self)._compute_state()
         for record in self:
-            if record.state == 'assigned' and record.check_in == 'PC':
+            if record.state == 'assigned' and record.picking_type_id.sequence_code == 'PC':
                 record.add_queue('坯料发料提醒')
 
             if record.picking_type_id.sequence_code == 'SFP' and record.state == 'done':
@@ -32,6 +32,16 @@ class SFMessageStockPicking(models.Model):
                     stock_picking_send = self.env["jikimo.message.queue"].sudo().search([('res_id', '=', record.id)])
                     if not stock_picking_send:
                         record.add_queue('订单发货提醒')
+            if record.picking_type_id.sequence_code == 'OCOUT' and record.state == 'assigned':
+                mrp_production = self.env['mrp.production'].sudo().search([('name', '=', record.origin)])
+                production_list = self.env['mrp.production'].sudo().search(
+                    [('product_id', '=', mrp_production.product_id.id)])
+                manufacturing_order_names = production_list.mapped('name')
+                stock_picking_list = self.env['stock.picking'].sudo().search(
+                    [('origin', 'in', manufacturing_order_names), ('picking_type_id.sequence_code', '=', 'OCOUT')])
+                all_ready_or_done = all(picking.state in ['assigned', 'done'] for picking in stock_picking_list)
+                if all_ready_or_done:
+                    mrp_production.add_queue('工序外协发料通知')
 
     def deal_stock_picking_sfp(self, message_queue_id):  # 处理订单发货提醒
         content = None

From 97facdaf9c4cf3632da47ed8a774467a99d91f3a Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 19 Dec 2024 13:45:10 +0800
Subject: [PATCH 025/147] =?UTF-8?q?1=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E6=B7=BB=E5=8A=A0=E3=80=90=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E4=B8=AD=E3=80=91=E3=80=81=E3=80=90=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E4=B8=AD=E3=80=91=E3=80=81=E3=80=90=E5=B7=B2=E4=BA=A4=E4=BB=98?=
 =?UTF-8?q?=E3=80=91=E4=B8=89=E7=A7=8D=E7=8A=B6=E6=80=81=EF=BC=9B2?=
 =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=20=E8=8E=B7=E5=8F=96mrs=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E7=9A=84=E7=BC=96=E7=A8=8B=E5=8D=95=20=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AF=B9=E8=BF=94=E5=B7=A5?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BC=96=E7=A8=8B=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/sale_order.py       | 3 +++
 sf_manufacturing/views/sale_order_views.xml | 2 +-
 sf_mrs_connect/controllers/controllers.py   | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sf_manufacturing/models/sale_order.py b/sf_manufacturing/models/sale_order.py
index a56721a2..5d318141 100644
--- a/sf_manufacturing/models/sale_order.py
+++ b/sf_manufacturing/models/sale_order.py
@@ -13,6 +13,9 @@ class SaleOrder(models.Model):
         ('sent', "报价已发送"),
         ('supply method', "供货方式待确认"),
         ('sale', "销售订单"),
+        ('processing', "加工中"),
+        ('physical_distribution', "物流中"),
+        ('delivered', "已交付"),
         ('done', "已锁定"),
         ('cancel', "已取消"),
     ])
diff --git a/sf_manufacturing/views/sale_order_views.xml b/sf_manufacturing/views/sale_order_views.xml
index 1e5c4587..49cc752f 100644
--- a/sf_manufacturing/views/sale_order_views.xml
+++ b/sf_manufacturing/views/sale_order_views.xml
@@ -13,7 +13,7 @@
                 <button name="action_confirm" string="供货方式确认" type="object" attrs="{'invisible': [('state', '!=', 'supply method')]}" confirm="确认供货方式"/>
             </xpath>
             <xpath expr="//header/field[@name='state']" position="attributes">
-                <attribute name="statusbar_visible">draft,sent,supply method,sale</attribute>
+                <attribute name="statusbar_visible">supply method,sale,processing,physical_distribution,delivered</attribute>
             </xpath>
             <xpath expr="//page/field[@name='order_line']/tree/field[@name='remark']" position="before">
                 <field name="supply_method" attrs="{'invisible': [('state', '=', 'draft')], 'required': [('state', '=', 'supply method')]}" />
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 87aee0dd..85b3d5fa 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -26,7 +26,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
             ret = json.loads(ret['result'])
             logging.info('下发编程单:%s' % ret)
             domain = [('programming_no', '=', ret['programming_no'])]
-            if ret['manufacturing_type'] in ('scrap', 'invalid_tool_rework'):
+            if ret['manufacturing_type'] in ('scrap', 'invalid_tool_rework', 'rework'):
                 domain += [('state', 'not in', ['done', 'scrap', 'cancel'])]
             else:
                 domain += [('state', 'in', ['confirmed', 'pending_cam'])]
@@ -56,7 +56,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
                         res['message'] = '编程单号为%s的CNC程序文件从FTP拉取失败' % (ret['programming_no'])
                         return json.JSONEncoder().encode(res)
                 for production in productions:
-                    production.write({'programming_state': '已编程', 'work_state': '已编程'})
+                    production.write({'programming_state': '已编程', 'work_state': '已编程', 'is_rework': False})
                     for panel in ret['processing_panel'].split(','):
                         # 查询状态为进行中且工序类型为CNC加工的工单
                         cnc_workorder_has = production.workorder_ids.filtered(

From 72bf8ad01191f89e7adc2eda1f005c9910b7557b Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Thu, 19 Dec 2024 14:36:16 +0800
Subject: [PATCH 026/147] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_message/controllers/main.py                | 13 ++++-
 sf_message/data/bussiness_node.xml            |  2 +-
 sf_message/data/template_data.xml             |  4 +-
 .../models/sf_message_mrp_production.py       | 46 +++++++++++++---
 sf_message/models/sf_message_stock_picking.py | 55 +++++++++++--------
 sf_message/models/sf_message_template.py      |  1 +
 sf_message/models/sf_message_workorder.py     | 40 +-------------
 7 files changed, 84 insertions(+), 77 deletions(-)

diff --git a/sf_message/controllers/main.py b/sf_message/controllers/main.py
index 9537417e..5b94f50a 100644
--- a/sf_message/controllers/main.py
+++ b/sf_message/controllers/main.py
@@ -9,6 +9,7 @@ from odoo.addons.sf_base.commons.common import Common
 
 _logger = logging.getLogger(__name__)
 
+
 class MessageSfMrsConnect(Sf_Mrs_Connect):
 
     @http.route('/api/cnc_processing/create', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
@@ -38,9 +39,16 @@ class MessageSfMrsConnect(Sf_Mrs_Connect):
                     _logger.info('无效用刀异常消息推送接口:%s' % ret)
             except Exception as e:
                 _logger.info('无效用刀异常消息推送接口:%s' % e)
+
+            try:
+                productions = request.env['mrp.production'].sudo().search([('id', '=', res.get('production_ids')[0])])
+                productions.add_queue('工单已下发通知')
+            except Exception as e:
+                _logger.info('工单已下发通知异常:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/api/maintenance_logs/notify', type='json', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
+    @http.route('/api/maintenance_logs/notify', type='json', auth='public', methods=['GET', 'POST'], csrf=False,
+                cors="*")
     def maintenance_logs_notify(self, **kw):
         res = {'code': 200, 'message': '设备故障日志信息推送成功'}
         datas = request.httprequest.data
@@ -52,7 +60,8 @@ class MessageSfMrsConnect(Sf_Mrs_Connect):
         try:
             if not isinstance(log_id, list):
                 log_id = [log_id]
-            maintenance_logs = request.env['sf.maintenance.logs'].sudo().search([('id', 'in', [int(id) for id in log_id])])
+            maintenance_logs = request.env['sf.maintenance.logs'].sudo().search(
+                [('id', 'in', [int(id) for id in log_id])])
             if maintenance_logs:
                 maintenance_logs.add_queue('设备故障')
         except Exception as e:
diff --git a/sf_message/data/bussiness_node.xml b/sf_message/data/bussiness_node.xml
index b273fab1..cff79873 100644
--- a/sf_message/data/bussiness_node.xml
+++ b/sf_message/data/bussiness_node.xml
@@ -56,7 +56,7 @@
         <!--工单-->
         <record id="bussiness_mrp_workorder_remind" model="jikimo.message.bussiness.node">
             <field name="name">工单已下发通知</field>
-            <field name="model">mrp.workorder</field>
+            <field name="model">mrp.production</field>
         </record>
         <!--发货调拨-->
         <record id="production_completed_warehouse_reminder" model="jikimo.message.bussiness.node">
diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml
index e9aee4bb..42256ce6 100644
--- a/sf_message/data/template_data.xml
+++ b/sf_message/data/template_data.xml
@@ -78,8 +78,8 @@
 
         <record id="template_mrp_workorder_remind" model="jikimo.message.template">
             <field name="name">工单已下发通知</field>
-            <field name="model_id" ref="mrp_workorder.model_mrp_workorder"/>
-            <field name="model">mrp.workorder</field>
+            <field name="model_id" ref="mrp.model_mrp_production"/>
+            <field name="model">mrp.production</field>
             <field name="bussiness_node_id" ref="bussiness_mrp_workorder_remind"/>
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
diff --git a/sf_message/models/sf_message_mrp_production.py b/sf_message/models/sf_message_mrp_production.py
index 37509e52..94c8297e 100644
--- a/sf_message/models/sf_message_mrp_production.py
+++ b/sf_message/models/sf_message_mrp_production.py
@@ -14,15 +14,18 @@ class SFMessageMrpProduction(models.Model):
         'workorder_ids.state', 'product_qty', 'qty_producing')
     def _compute_state(self):
         super(SFMessageMrpProduction, self)._compute_state()
-        for record in self:
-            if record.state in ['scrap', 'done']:
-                # 查询制造订单下的所有未完成的生产订单
-                mrp_production = record.env['mrp.production'].search(
-                    [('origin', '=', record.origin), ('state', 'not in', ['scrap', 'done'])])
-                if not mrp_production:
-                    mrp_production_queue = self.env["jikimo.message.queue"].search([('res_id', '=', record.id)])
-                    if not mrp_production_queue:
-                        record.add_queue('生产完工入库提醒')
+        try:
+            for record in self:
+                if record.state in ['scrap', 'done']:
+                    # 查询制造订单下的所有未完成的生产订单
+                    mrp_production = record.env['mrp.production'].search(
+                        [('origin', '=', record.origin), ('state', 'not in', ['scrap', 'done'])])
+                    if not mrp_production:
+                        mrp_production_queue = self.env["jikimo.message.queue"].search([('res_id', '=', record.id)])
+                        if not mrp_production_queue:
+                            record.add_queue('生产完工入库提醒')
+        except Exception as e:
+            logging.info('add_queue生产完工入库提醒 error:%s' % e)
 
     # 获取发送消息内容
     def _get_message(self, message_queue_ids):
@@ -66,6 +69,17 @@ class SFMessageMrpProduction(models.Model):
                                                                                                   url_with_id).replace(
                         '{{num}}', str(stock_picking_num))
                     contents.append(content)
+            if message_queue_id.message_template_id.name == '工单已下发通知':
+                content = message_queue_id.message_template_id.content
+                mrp_production = self.env['mrp.production'].sudo().search([('id', '=', int(message_queue_id.res_id))])
+                production_num = self.env['mrp.production'].sudo().search_count(
+                    [('product_id', '=', mrp_production.product_id.id)])
+                if production_num >= 1:
+                    url = self.get_request_url()
+                    content = content.replace('{{product_id}}', mrp_production.product_id.name).replace(
+                        '{{number}}', str(production_num)).replace(
+                        '{{request_url}}', url)
+                    contents.append(content)
         if unique_products:
             unique_products_contents = self.get_production_info(content, unique_products, 'confirmed',
                                                                 'sf_plan.sf_production_plan_action1')
@@ -106,3 +120,17 @@ class SFMessageMrpProduction(models.Model):
         # 拼接URL
         full_url = url + "/web#" + query_string
         return full_url
+
+    def get_request_url(self):
+        url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+        action_id = self.env.ref('sf_message.mrp_workorder_issued_action').id
+        menu_id = self.env['ir.model.data'].sudo().search([('name', '=', 'module_stock_dropshipping')]).id
+        active_id = self.env['mrp.workcenter'].sudo().search([('name', '=', '工件装夹中心')]).id
+        # 查询参数
+        params = {'menu_id': menu_id, 'action': action_id, 'model': 'mrp.workorder',
+                  'view_type': 'list', 'active_id': active_id}
+        # 拼接查询参数
+        query_string = urlencode(params)
+        # 拼接URL
+        full_url = url + "/web#" + query_string
+        return full_url
diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py
index 4637941b..b3e1868e 100644
--- a/sf_message/models/sf_message_stock_picking.py
+++ b/sf_message/models/sf_message_stock_picking.py
@@ -12,36 +12,43 @@ class SFMessageStockPicking(models.Model):
     @api.model_create_multi
     def create(self, vals):
         result = super(SFMessageStockPicking, self).create(vals)
-        for obj in result:
-            if obj.location_id.name == '进货' and obj.location_dest_id.name == '刀具房':
-                obj.add_queue('调拨入库')
+        try:
+            for obj in result:
+                if obj.location_id.name == '进货' and obj.location_dest_id.name == '刀具房':
+                    obj.add_queue('调拨入库')
+        except Exception as e:
+            logging.info('add_queue调拨入库 error:%s' % e)
         return result
 
     @api.depends('move_type', 'immediate_transfer', 'move_ids.state', 'move_ids.picking_id')
     def _compute_state(self):
         super(SFMessageStockPicking, self)._compute_state()
-        for record in self:
-            if record.state == 'assigned' and record.picking_type_id.sequence_code == 'PC':
-                record.add_queue('坯料发料提醒')
+        try:
+            for record in self:
+                if record.state == 'assigned' and record.picking_type_id.sequence_code == 'PC':
+                    record.add_queue('坯料发料提醒')
 
-            if record.picking_type_id.sequence_code == 'SFP' and record.state == 'done':
-                stock_picking_sfp = record.env['stock.picking'].search(
-                    [('origin', '=', record.origin), ('state', '!=', 'done'),
-                     ('picking_type_id.sequence_code', '=', 'SFP')])
-                if not stock_picking_sfp:
-                    stock_picking_send = self.env["jikimo.message.queue"].sudo().search([('res_id', '=', record.id)])
-                    if not stock_picking_send:
-                        record.add_queue('订单发货提醒')
-            if record.picking_type_id.sequence_code == 'OCOUT' and record.state == 'assigned':
-                mrp_production = self.env['mrp.production'].sudo().search([('name', '=', record.origin)])
-                production_list = self.env['mrp.production'].sudo().search(
-                    [('product_id', '=', mrp_production.product_id.id)])
-                manufacturing_order_names = production_list.mapped('name')
-                stock_picking_list = self.env['stock.picking'].sudo().search(
-                    [('origin', 'in', manufacturing_order_names), ('picking_type_id.sequence_code', '=', 'OCOUT')])
-                all_ready_or_done = all(picking.state in ['assigned', 'done'] for picking in stock_picking_list)
-                if all_ready_or_done:
-                    mrp_production.add_queue('工序外协发料通知')
+                if record.picking_type_id.sequence_code == 'SFP' and record.state == 'done':
+                    stock_picking_sfp = record.env['stock.picking'].search(
+                        [('origin', '=', record.origin), ('state', '!=', 'done'),
+                         ('picking_type_id.sequence_code', '=', 'SFP')])
+                    if not stock_picking_sfp:
+                        stock_picking_send = self.env["jikimo.message.queue"].sudo().search(
+                            [('res_id', '=', record.id)])
+                        if not stock_picking_send:
+                            record.add_queue('订单发货提醒')
+                if record.picking_type_id.sequence_code == 'OCOUT' and record.state == 'assigned':
+                    mrp_production = self.env['mrp.production'].sudo().search([('name', '=', record.origin)])
+                    production_list = self.env['mrp.production'].sudo().search(
+                        [('product_id', '=', mrp_production.product_id.id)])
+                    manufacturing_order_names = production_list.mapped('name')
+                    stock_picking_list = self.env['stock.picking'].sudo().search(
+                        [('origin', 'in', manufacturing_order_names), ('picking_type_id.sequence_code', '=', 'OCOUT')])
+                    all_ready_or_done = all(picking.state in ['assigned', 'done'] for picking in stock_picking_list)
+                    if all_ready_or_done:
+                        mrp_production.add_queue('工序外协发料通知')
+        except Exception as e:
+            logging.info('add_queue_compute_state error:%s' % e)
 
     def deal_stock_picking_sfp(self, message_queue_id):  # 处理订单发货提醒
         content = None
diff --git a/sf_message/models/sf_message_template.py b/sf_message/models/sf_message_template.py
index 8d1a2b9d..87328849 100644
--- a/sf_message/models/sf_message_template.py
+++ b/sf_message/models/sf_message_template.py
@@ -16,4 +16,5 @@ class SfMessageTemplate(models.Model):
         res.append('mrp.workorder')
         res.append('sf.maintenance.logs')
         res.append('quality.cnc.test')
+        res.append('mrp.production')
         return res
diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py
index d5186797..c604534d 100644
--- a/sf_message/models/sf_message_workorder.py
+++ b/sf_message/models/sf_message_workorder.py
@@ -12,19 +12,8 @@ class SFMessageWork(models.Model):
     _name = 'mrp.workorder'
     _inherit = ['mrp.workorder', 'jikimo.message.dispatch']
 
-    @api.depends('production_availability', 'blocked_by_workorder_ids.state', 'production_id.tool_state')
-    def _compute_state(self):
-        super(SFMessageWork, self)._compute_state()
-        for workorder in self:
-            if workorder.state == 'ready' and workorder.routing_type == '装夹预调':
-                jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
-                    [('res_id', '=', workorder.id), ("message_status", "=", "pending")])
-                if not jikimo_message_queue:
-                    workorder.add_queue('工单已下发通知')
-
     def _get_message(self, message_queue_ids):
         contents = []
-        product_id = []
         bussiness_node = None
         url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
         current_time_strf = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -37,20 +26,7 @@ class SFMessageWork(models.Model):
         }
         i = 0
         for message_queue_id in message_queue_ids:
-            if message_queue_id.message_template_id.name == '工单已下发通知':
-                content = message_queue_id.message_template_id.content
-                mrp_workorder_line = self.env['mrp.workorder'].sudo().search([('id', '=', int(message_queue_id.res_id))])
-                mrp_workorder_list = self.env['mrp.workorder'].sudo().search(
-                    [('product_id', '=', mrp_workorder_line.product_id.id), ('state', '=', 'ready'),
-                     ('routing_type', '=', '装夹预调')])
-                if len(mrp_workorder_list) > 0 and mrp_workorder_line.product_id.id not in product_id:
-                    url = self.request_url()
-                    content = content.replace('{{product_id}}', mrp_workorder_line.product_id.name).replace(
-                        '{{number}}', str(len(mrp_workorder_list))).replace(
-                        '{{request_url}}', url)
-                    product_id.append(mrp_workorder_line.product_id.id)
-                    contents.append(content)
-            elif message_queue_id.message_template_id.name in template_names['预警'] + template_names['已逾期']:
+            if message_queue_id.message_template_id.name in template_names['预警'] + template_names['已逾期']:
                 item = message_queue_id.message_template_id
                 bussiness_node = item.bussiness_node_id.name
                 for reminder_time in item.reminder_time_ids:
@@ -95,20 +71,6 @@ class SFMessageWork(models.Model):
             contents.append(content)
         return contents
 
-    def request_url(self):
-        url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-        action_id = self.env.ref('sf_message.mrp_workorder_issued_action').id
-        menu_id = self.env['ir.model.data'].sudo().search([('name', '=', 'module_stock_dropshipping')]).id
-        active_id = self.env['mrp.workcenter'].sudo().search([('name', '=', '工件装夹中心')]).id
-        # 查询参数
-        params = {'menu_id': menu_id, 'action': action_id, 'model': 'mrp.workorder',
-                  'view_type': 'list', 'active_id': active_id}
-        # 拼接查询参数
-        query_string = urlencode(params)
-        # 拼接URL
-        full_url = url + "/web#" + query_string
-        return full_url
-
     def _overdue_or_warning_func(self):
         workorders = self.env['mrp.workorder'].search(
             [("state", "in", ["ready", "progress", "to be detected"]), ('schedule_state', '=', '已排')])

From 23afbc14c936cc0744ed252eb32eb73e5c8b69aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Thu, 19 Dec 2024 17:00:40 +0800
Subject: [PATCH 027/147] =?UTF-8?q?=E5=A2=9E=E5=8A=A0agv=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E4=B8=8B=E5=8F=91=E4=B8=8E=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/__manifest__.py              |  2 +
 sf_manufacturing/models/agv_scheduling.py     | 54 +++++++++++++++++--
 sf_manufacturing/models/mrp_workorder.py      |  2 +-
 .../src/js/agv_scheduling_cancel_confirm.js   | 50 +++++++++++++++++
 .../src/js/agv_scheduling_resend_confirm.js   | 50 +++++++++++++++++
 .../js/workpiece_delivery_wizard_confirm.js   |  3 +-
 .../views/agv_scheduling_views.xml            | 14 +++++
 7 files changed, 169 insertions(+), 6 deletions(-)
 create mode 100644 sf_manufacturing/static/src/js/agv_scheduling_cancel_confirm.js
 create mode 100644 sf_manufacturing/static/src/js/agv_scheduling_resend_confirm.js

diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index 612577c2..904aac56 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -52,6 +52,8 @@
             'sf_manufacturing/static/src/scss/kanban_change.scss',
             'sf_manufacturing/static/src/xml/button_show_on_tree.xml',
             'sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js',
+            'sf_manufacturing/static/src/js/agv_scheduling_resend_confirm.js',
+            'sf_manufacturing/static/src/js/agv_scheduling_cancel_confirm.js',
             'sf_manufacturing/static/src/js/qr.js',
             'sf_manufacturing/static/src/xml/qr.xml',
         ]
diff --git a/sf_manufacturing/models/agv_scheduling.py b/sf_manufacturing/models/agv_scheduling.py
index 868964d5..f39c07e7 100644
--- a/sf_manufacturing/models/agv_scheduling.py
+++ b/sf_manufacturing/models/agv_scheduling.py
@@ -1,6 +1,7 @@
 
 import logging
 import requests
+from datetime import timedelta
 
 from odoo import models, fields, api, _
 from odoo.exceptions import UserError
@@ -210,9 +211,18 @@ class AgvScheduling(models.Model):
     def button_cancel(self):
         # 弹出二次确认窗口后执行
         for rec in self:
-            if rec.state != '待下发':
-                raise UserError('只有待下发状态的AGV调度任务才能取消！')
             rec.state = '已取消'
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'target': 'new',
+            'params': {
+                'message': '任务取消成功！',
+                'type': 'success',
+                'sticky': False,
+                'next': {'type': 'ir.actions.act_window_close'},
+            }
+        }
 
     def finish_scheduling(self):
         """
@@ -232,7 +242,7 @@ class AgvScheduling(models.Model):
                 agv_route sf.agv.task.route对象
         """
         for rec in self:
-            if rec.state != '待下发':
+            if rec.state not in ['待下发', '配送中']:
                 return False
             _logger.info('AGV任务调度：下发调度任务，路线为%s' % agv_task_route)
             rec.state = '配送中'
@@ -264,7 +274,45 @@ class AgvScheduling(models.Model):
                     'task_delivery_time': fields.Datetime.now()
                 })
         return super().write(vals)
+    
+    def button_cancel_confirm(self):
+        if self.task_delivery_time > fields.Datetime.now() - timedelta(minutes=10):
+            return {
+                'type': 'ir.actions.client',
+                'tag': 'agv_scheduling_cancel_confirm',
+                'params': {
+                    'agv_scheduling_id': self.id,
+                }
+            }
+        else:
+            return self.button_cancel()
 
+    def button_resend_confirm(self):
+        if self.task_delivery_time > fields.Datetime.now() - timedelta(minutes=10):
+            return {
+                'type': 'ir.actions.client',
+                'tag': 'agv_scheduling_resend_confirm',
+                'params': {
+                    'agv_scheduling_id': self.id,
+                    'context': self.env.context,
+                }
+            }
+        else:
+            return self.button_resend()
+        
+    def button_resend(self):
+        self.dispatch_scheduling(self.agv_route_id)
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'target': 'new',
+            'params': {
+                'message': '任务重新下发成功！',
+                'type': 'success',
+                'sticky': False,
+                'next': {'type': 'ir.actions.act_window_close'},
+            }
+        }
 
 class ResMrpWorkOrder(models.Model):
     _inherit = 'mrp.workorder'
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index bab7e282..bcc3aafd 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -36,7 +36,7 @@ class ResMrpWorkOrder(models.Model):
                                                    store=True, check_company=True, string="材料")
     product_tmpl_id_materials_type_id = fields.Many2one(related='production_id.product_tmpl_id.materials_type_id',
                                                         readonly=True, store=True, check_company=True, string="型号")
-    workcenter_id = fields.Many2one('mrp.workcenter', string='工作中心', required=False)
+    # workcenter_id = fields.Many2one('mrp.workcenter', string='工作中心', required=False)
     users_ids = fields.Many2many("res.users", 'users_workorder', related="workcenter_id.users_ids")
     processing_panel = fields.Char('加工面')
     sequence = fields.Integer(string='工序')
diff --git a/sf_manufacturing/static/src/js/agv_scheduling_cancel_confirm.js b/sf_manufacturing/static/src/js/agv_scheduling_cancel_confirm.js
new file mode 100644
index 00000000..7fd19178
--- /dev/null
+++ b/sf_manufacturing/static/src/js/agv_scheduling_cancel_confirm.js
@@ -0,0 +1,50 @@
+odoo.define('sf_manufacturing.agv_scheduling_button_confirm', function (require) {
+    const core = require('web.core');
+    const ajax = require('web.ajax');
+    const Dialog = require('web.Dialog');
+    var rpc = require('web.rpc');
+    var _t = core._t;
+
+    async function agv_scheduling_cancel_confirm(parent, {params}) {
+        const dialog = new Dialog(parent, {
+            title: "确认",
+            $content: $('<div>').append("工件正在配送中，确定取消"),
+            buttons: [
+                { text: "确认", classes: 'btn-primary', close: true, click: () => dispatchConfirmed(parent, params) },
+                { text: "取消", close: true },
+            ],
+        });
+        dialog.open();
+
+
+        async function dispatchConfirmed(parent, params) {
+            rpc.query({
+                model: 'sf.agv.scheduling',
+                method: 'button_cancel',
+                args: [params.agv_scheduling_id],
+                kwargs: {
+                    context: params.context,
+                }
+            }).then(res => {
+                parent.services.action.doAction({
+                    'type': 'ir.actions.client',
+                    'tag': 'display_notification',
+                    'target': 'new',
+                    'params': {
+                        'message': '取消成功！',
+                        'type': 'success',
+                        'sticky': false,
+                        'next': {'type': 'ir.actions.act_window_close'},
+                    }
+                });
+                parent.services.action.doAction({
+                    'type': 'ir.actions.client',
+                    'tag': 'reload',
+                });
+            })
+        }
+    }
+
+    core.action_registry.add('agv_scheduling_cancel_confirm', agv_scheduling_cancel_confirm);
+    return agv_scheduling_cancel_confirm;
+});
diff --git a/sf_manufacturing/static/src/js/agv_scheduling_resend_confirm.js b/sf_manufacturing/static/src/js/agv_scheduling_resend_confirm.js
new file mode 100644
index 00000000..2ccda0e4
--- /dev/null
+++ b/sf_manufacturing/static/src/js/agv_scheduling_resend_confirm.js
@@ -0,0 +1,50 @@
+odoo.define('sf_manufacturing.agv_scheduling_resend_confirm', function (require) {
+    const core = require('web.core');
+    const ajax = require('web.ajax');
+    const Dialog = require('web.Dialog');
+    var rpc = require('web.rpc');
+    var _t = core._t;
+
+    async function agv_scheduling_resend_confirm(parent, {params}) {
+        const dialog = new Dialog(parent, {
+            title: "确认",
+            $content: $('<div>').append("工件正在配送中，确定重新下发"),
+            buttons: [
+                { text: "确认", classes: 'btn-primary', close: true, click: () => dispatchConfirmed(parent, params) },
+                { text: "取消", close: true },
+            ],
+        });
+        dialog.open();
+
+
+        async function dispatchConfirmed(parent, params) {
+            rpc.query({
+                model: 'sf.agv.scheduling',
+                method: 'button_resend',
+                args: [params.agv_scheduling_id],
+                kwargs: {
+                    context: params.context,
+                }
+            }).then(res => {
+                parent.services.action.doAction({
+                    'type': 'ir.actions.client',
+                    'tag': 'display_notification',
+                    'target': 'new',
+                    'params': {
+                        'message': '重新下发成功！',
+                        'type': 'success',
+                        'sticky': false,
+                        'next': {'type': 'ir.actions.act_window_close'},
+                    }
+                });
+                parent.services.action.doAction({
+                    'type': 'ir.actions.client',
+                    'tag': 'reload',
+                });
+            })
+        }
+    }
+
+    core.action_registry.add('agv_scheduling_resend_confirm', agv_scheduling_resend_confirm );
+    return agv_scheduling_resend_confirm;
+});
diff --git a/sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js b/sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js
index d7900984..e99b4473 100644
--- a/sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js
+++ b/sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js
@@ -22,8 +22,7 @@ odoo.define('sf_manufacturing.action_dispatch_confirm', function (require) {
             rpc.query({
                 model: 'sf.workpiece.delivery.wizard',
                 method: 'confirm',
-                args: [params.active_id]
-                ,
+                args: [params.active_id],
                 kwargs: {
                     context: params.context,
                 }
diff --git a/sf_manufacturing/views/agv_scheduling_views.xml b/sf_manufacturing/views/agv_scheduling_views.xml
index c24cdf94..d0d0bb85 100644
--- a/sf_manufacturing/views/agv_scheduling_views.xml
+++ b/sf_manufacturing/views/agv_scheduling_views.xml
@@ -33,6 +33,20 @@
                             class="btn-danger"
                             confirm="你确定要取消这条记录吗？"
                     />
+                    <button
+                            name="button_cancel_confirm"
+                            string="取消" type="object"
+                            attrs="{'invisible': [('state', '!=', '配送中')]}"
+                            icon="fa-times"
+                            class="btn-danger"
+                    />
+                    <button
+                            name="button_resend_confirm"
+                            string="重新下发" type="object"
+                            attrs="{'invisible': [('state', '!=', '配送中')]}"
+                            icon="fa-circle-o-notch"
+                            class="btn-success  "
+                    />
                 </tree>
             </field>
         </record>

From 03dbeaf98823db121c25da2134e39268a708ec20 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 19 Dec 2024 17:14:48 +0800
Subject: [PATCH 028/147] =?UTF-8?q?1=E3=80=81=E9=9A=90=E8=97=8F=E8=BF=94?=
 =?UTF-8?q?=E5=B7=A5=E7=8A=B6=E6=80=81=E5=B7=A5=E5=8D=95=E7=9A=84=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E6=8C=89=E9=92=AE=EF=BC=9B2=E3=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=B7=A5=E5=8D=95=E7=8A=B6=E6=80=81=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=9B3=E3=80=81=E4=BC=98=E5=8C=96=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mrp_workorder/views/mrp_workorder_views.xml           |  2 +-
 sf_manufacturing/models/mrp_workorder.py              |  4 +---
 .../views/mrp_production_addional_change.xml          |  2 +-
 sf_manufacturing/views/mrp_workorder_view.xml         |  6 +++---
 sf_manufacturing/wizard/rework_wizard.py              | 11 ++++++-----
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/mrp_workorder/views/mrp_workorder_views.xml b/mrp_workorder/views/mrp_workorder_views.xml
index 8c208f19..eba33155 100644
--- a/mrp_workorder/views/mrp_workorder_views.xml
+++ b/mrp_workorder/views/mrp_workorder_views.xml
@@ -138,7 +138,7 @@ if env.user.has_group('mrp.group_mrp_workorder_dependencies'):
                         <button name="openMenuPopup" t-att-disabled="isBlocked" class="btn btn-secondary o_workorder_icon_btn fa fa-bars" type="workorder_event" title="menu"/>
                         <span groups="mrp_workorder.group_mrp_wo_tablet_timer">
                             <button name="button_pending" type="object" class="btn btn-secondary" attrs="{'invisible': ['|', ('is_user_working', '=', False), ('working_state', '=', 'blocked')]}" barcode_trigger="pause" string="PAUSE"/>
-                            <button name="button_start" type="object" class="btn btn-warning" attrs="{'invisible': ['|', '|', ('is_user_working', '=', True), ('working_state', '=', 'blocked'), ('state', '=', ('done', 'cancel'))]}" barcode_trigger="pause" string="CONTINUE"/>
+                            <button name="button_start" type="object" class="btn btn-warning" attrs="{'invisible': ['|', '|', ('is_user_working', '=', True), ('working_state', '=', 'blocked'), ('state', '=', ('done','rework', 'cancel'))]}" barcode_trigger="pause" string="CONTINUE"/>
                             <button name="button_unblock" type="object" class="btn btn-secondary btn-danger o_unblock" attrs="{'invisible': [('working_state', '!=', 'blocked')]}">Unblock</button>
                             <field name="duration" widget="mrp_timer" class="ms-1" readonly="1"/>
                         </span>
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index bab7e282..acbb4bfe 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1114,9 +1114,7 @@ class ResMrpWorkOrder(models.Model):
             # ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
             if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
                     or workorder.production_id.schedule_state != '已排'
-                    or workorder.production_id.reservation_state not in ['assigned']
-                    or workorder.production_id.workorder_ids.filtered(
-                        lambda wk: wk.sequence == workorder.sequence - 1).test_results in ['报废', '返工']):
+                    or workorder.production_id.reservation_state not in ['assigned']):
                 if workorder.state != 'waiting':
                     workorder.state = 'waiting'
                 continue
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 043990ef..d08ff81f 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -442,7 +442,7 @@
                     <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', '!=',
+                    ('working_state', '=', 'blocked'), ('state', 'in', ('done','rework', 'cancel')), ('is_user_working', '!=',
                     False), ('routing_type', '=', 'CNC加工')]}"
                             groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 3828f00e..1a2682be 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -55,7 +55,7 @@
                 <!--                </attribute>-->
                 <attribute name="attrs">{'invisible': ['|', '|', '|','|','|', ('production_state','in', ('draft',
                     'done',
-                    'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),
+                    'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done','rework', 'cancel')),
                     ('is_user_working', '!=', False),("user_permissions","=",False),("name","in",("CNC加工","解除装夹"))]}
                 </attribute>
             </xpath>
@@ -174,9 +174,9 @@
                 <!--                <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','to be detected')), ('is_user_working', '!=', False)]}"/>-->
                 <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"
-                        attrs="{'invisible': ['|', '|', '|', '|', '|', ('routing_type', '=', '装夹预调'), ('routing_type', '=', '解除装夹'), ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>
+                        attrs="{'invisible': ['|', '|', '|', '|', '|', ('routing_type', '=', '装夹预调'), ('routing_type', '=', '解除装夹'), ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done','rework', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>
                 <button name="button_start" type="object" string="开始" class="btn-success"
-                        attrs="{'invisible': ['|', '|', '|', '|', ('routing_type', '!=', '装夹预调'), ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>
+                        attrs="{'invisible': ['|', '|', '|', '|', ('routing_type', '!=', '装夹预调'), ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done','rework', 'cancel','to be detected')), ('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)]}"/>
                 <button name="button_finish" type="object" string="完成" class="btn-success" confirm="是否确认完工"
diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py
index bcc8514b..1352e84d 100644
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -267,11 +267,7 @@ class ReworkWizard(models.TransientModel):
                         elif self.programming_state in ['待编程', '编程中']:
                             self.production_id.write(
                                 {'programming_state': '编程中', 'work_state': '编程中', 'is_rework': True})
-                # ==================申请重新编程=======================
-                if self.is_reprogramming is True:
-                    self.production_id.update_programming_state()
-                    self.production_id.write(
-                        {'programming_state': '编程中', 'work_state': '编程中'})
+                # =================================================
                 if self.production_id.state == 'progress':
                     self.production_id.write({'programming_state': '已编程', 'work_state': '已编程'})
                     if self.reprogramming_num >= 1 and self.programming_state == '已编程':
@@ -282,6 +278,11 @@ class ReworkWizard(models.TransientModel):
                             productions_not_delivered.write(
                                 {'state': 'progress', 'programming_state': '已编程', 'work_state': '已编程',
                                  'is_rework': False})
+                # ==================申请重新编程=======================
+                if self.is_reprogramming is True:
+                    self.production_id.update_programming_state()
+                    self.production_id.write(
+                        {'programming_state': '编程中', 'work_state': '编程中', 'state': 'progress'})
 
     @api.onchange('production_id')
     def onchange_processing_panel_id(self):

From bdac1e7460e13f915ed5b065f754e378c8b985f0 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 20 Dec 2024 11:06:41 +0800
Subject: [PATCH 029/147] =?UTF-8?q?1=E3=80=81=E5=A4=84=E7=90=86=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E8=BF=94=E5=B7=A5=E6=97=B6=E5=B0=B1=E8=A7=A3=E9=99=A4?=
 =?UTF-8?q?rfid=E7=BB=91=E5=AE=9A=E9=97=AE=E9=A2=98=EF=BC=9B2=E3=80=81?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5bfm=E7=9A=84=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=B0=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/models/jd_eclp.py          |  6 +++++
 sf_manufacturing/models/mrp_workorder.py |  3 +--
 sf_manufacturing/wizard/rework_wizard.py | 32 +++++++++++++-----------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py
index 58691ca0..aa27736c 100644
--- a/sf_bf_connect/models/jd_eclp.py
+++ b/sf_bf_connect/models/jd_eclp.py
@@ -151,6 +151,12 @@ class JdEclp(models.Model):
         _logger.info('准备调接口1')
         url1 = config['bfm_url_new'] + '/api/create/jd/order'
         requests.post(url1, json=json1, data=None)
+        # ===============修改销售订单状态为【物流中】===================
+        item = self.env['sale.order'].sudo().search([('name', '=', self.origin)])
+        if not item:
+            raise ValidationError('没有查询到订单号为【%s】的销售订单！' % self.origin)
+        else:
+            item.write({'state': 'physical_distribution'})
         _logger.info('调用成功1')
         _logger.info('准备调接口2')
         json2 = {
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index e9a5c5d9..52fa30c8 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1423,8 +1423,7 @@ class ResMrpWorkOrder(models.Model):
                     len(done_workorder) == len(record.production_id.workorder_ids)):
                 is_production_id = True
             if record.routing_type in ['解除装夹'] or (
-                    record.is_rework is True and record.routing_type in ['装夹预调']) or (
-                    record.test_results in ['返工', '报废'] and record.routing_type in ['CNC加工']):
+                    record.is_rework is True and record.routing_type in ['装夹预调']):
                 for workorder in record.production_id.workorder_ids:
                     if workorder.processing_panel == record.processing_panel:
                         rfid_code = workorder.rfid_code
diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py
index 1352e84d..fcafd490 100644
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -85,7 +85,8 @@ class ReworkWizard(models.TransientModel):
             # 2、当FM工单在CNC工单进行选择返工，并将已全部完成的ZM面工序全部勾选上时，FM工单上所有的已完成的工单（装夹预调工单）也必须进行勾选
             if not wk_ids.filtered(lambda wk: wk.name == '装夹预调' and wk.processing_panel == panel):
                 if wk_ids.filtered(lambda wk: wk.name == 'CNC加工' and wk.processing_panel == panel):
-                    sequence_max = wk_ids.filtered(lambda wk: wk.name == 'CNC加工' and wk.processing_panel == panel).sequence
+                    sequence_max = wk_ids.filtered(
+                        lambda wk: wk.name == 'CNC加工' and wk.processing_panel == panel).sequence
                     for wk_id in wk_ids.filtered(lambda wk: wk.sequence < sequence_max):
                         if len(wk_ids.filtered(lambda wk: wk.processing_panel == wk_id.processing_panel)) == 3:
                             raise ValidationError(
@@ -114,19 +115,17 @@ class ReworkWizard(models.TransientModel):
             else:
                 raise ValidationError('请选择返工工单！！！')
             if rework_workorder_ids:
-                clamp_workorder_ids = None
-                if rework_workorder_ids:
-                    # 限制
-                    # 1、单独返工CNC工单则不解绑托盘RFID，如单独返工装夹预调工单，则自动解绑托盘RFID；
-                    # 2、返工CNC工单和装夹预调工单则自动解绑RFID
-                    clamp_workorder_ids = rework_workorder_ids.filtered(lambda rp: rp.routing_type == '装夹预调')
-                    if clamp_workorder_ids:
-                        for clamp_workorder_id in clamp_workorder_ids:
-                            self.production_id.workorder_ids.filtered(
-                                lambda wk: wk.processing_panel == clamp_workorder_id.processing_panel).write(
-                                {'rfid_code': None})
-                    # 返工工单状态设置为【返工】
-                    rework_workorder_ids.write({'state': 'rework'})
+                # 限制
+                # 1、单独返工CNC工单则不解绑托盘RFID，如单独返工装夹预调工单，则自动解绑托盘RFID；
+                # 2、返工CNC工单和装夹预调工单则自动解绑RFID
+                clamp_workorder_ids = rework_workorder_ids.filtered(lambda rp: rp.routing_type == '装夹预调')
+                if clamp_workorder_ids:
+                    for clamp_workorder_id in clamp_workorder_ids:
+                        self.production_id.workorder_ids.filtered(
+                            lambda wk: wk.processing_panel == clamp_workorder_id.processing_panel).write(
+                            {'rfid_code': None})
+                # 返工工单状态设置为【返工】
+                rework_workorder_ids.write({'state': 'rework'})
                 # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单
                 workorders_values = []
                 for work in rework_workorder_ids:
@@ -147,6 +146,11 @@ class ReworkWizard(models.TransientModel):
                     new_pre_workorder_ids = self.production_id.workorder_ids.filtered(
                         lambda kw: kw.routing_type == '装夹预调' and kw.sequence == 0)
                     self.production_id._reset_work_order_sequence()
+                    # ====新工单绑定rfid===
+                    for new_work_id in new_work_ids:
+                        if new_work_id.routing_type in ['CNC加工', '解除装夹']:
+                            new_work_id.write({'rfid_code': self.production_id.workorder_ids.filtered(
+                                lambda wk: wk.sequence == new_work_id.sequence - 1).rfid_code})
                     self.production_id.detection_result_ids.filtered(
                         lambda ap1: ap1.handle_result == '待处理').write({'handle_result': '已处理'})
                     panels = []  # 返工的加工面

From f2e8d0175bc17af5ddd4c3cb267ffc110ae66bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Fri, 20 Dec 2024 12:51:42 +0800
Subject: [PATCH 030/147] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=8E=92=E9=99=A4=E5=B7=B2=E7=BB=8F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9A=84=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/model_type.py             | 2 +-
 sf_manufacturing/models/mrp_routing_workcenter.py | 6 ++++++
 sf_manufacturing/views/model_type_view.xml        | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sf_manufacturing/models/model_type.py b/sf_manufacturing/models/model_type.py
index 1fe36b90..601c34e8 100644
--- a/sf_manufacturing/models/model_type.py
+++ b/sf_manufacturing/models/model_type.py
@@ -75,7 +75,7 @@ class ManualProductModelTypeRoutingSort(models.Model):
     _description = '成品工序排序（人工线下加工）'
 
     sequence = fields.Integer('Sequence')
-    route_workcenter_id = fields.Many2one('mrp.routing.workcenter')
+    route_workcenter_id = fields.Many2one('mrp.routing.workcenter', domain=[('routing_type', 'in', ['人工线下加工'])])
     is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat')
     routing_type = fields.Selection(string="工序类型", related='route_workcenter_id.routing_type')
     workcenter_ids = fields.Many2many('mrp.workcenter', required=False, related='route_workcenter_id.workcenter_ids')
diff --git a/sf_manufacturing/models/mrp_routing_workcenter.py b/sf_manufacturing/models/mrp_routing_workcenter.py
index e28bd091..e09b0aa5 100644
--- a/sf_manufacturing/models/mrp_routing_workcenter.py
+++ b/sf_manufacturing/models/mrp_routing_workcenter.py
@@ -94,4 +94,10 @@ class ResMrpRoutingWorkcenter(models.Model):
                     route_ids.append(t.route_id.surface_technics_id.id)
             domain = [('id', 'not in', route_ids), ('routing_tag', '=', 'special')]
             return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
+        if self._context.get('is_duplicate') and self._context.get('model_type'):
+            # 查询出已经选择的工序
+            model_type = self.env[self._context.get('model_type')].search_read([],['route_workcenter_id'])
+            route_workcenter_ids = [item['route_workcenter_id'][0] if item['route_workcenter_id'] else False for item in model_type]
+            domain = args + [('id', 'not in', route_workcenter_ids)]
+            return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
         return super()._name_search(name, args, operator, limit, name_get_uid)
diff --git a/sf_manufacturing/views/model_type_view.xml b/sf_manufacturing/views/model_type_view.xml
index 0f8b3085..d3f90fd7 100644
--- a/sf_manufacturing/views/model_type_view.xml
+++ b/sf_manufacturing/views/model_type_view.xml
@@ -37,7 +37,7 @@
                         <field name='product_routing_tmpl_ids'>
                             <tree editable='bottom'>
                                 <field name="sequence" widget="handle" string="序号"/>
-                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}"/>
+                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}" context="{'is_duplicate': True, 'model_type': 'sf.product.model.type.routing.sort'}"/>
                                 <field name="routing_type" string="类型"/>
                                 <field name="is_repeat" string="重复"/>
                                 <field name="workcenter_ids" string="工作中心" widget="many2many_tags"/>
@@ -48,7 +48,7 @@
                         <field name='manual_product_routing_tmpl_ids'>
                             <tree editable='bottom'>
                                 <field name="sequence" widget="handle" string="序号"/>
-                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}"/>
+                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}" context="{'is_duplicate': True, 'model_type': 'sf.manual.product.model.type.routing.sort'}}"/>
                                 <field name="routing_type" string="类型"/>
                                 <field name="is_repeat" string="重复"/>
                                 <field name="workcenter_ids" string="工作中心" widget="many2many_tags"/>
@@ -59,7 +59,7 @@
                         <field name='embryo_routing_tmpl_ids'>
                             <tree editable='bottom'>
                                 <field name="sequence" widget="handle" string="序号"/>
-                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}"/>
+                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}" context="{'is_duplicate': True, 'model_type': 'sf.embryo.model.type.routing.sort'}}"/>
                                 <field name="routing_type" string="类型"/>
                                 <field name="is_repeat" string="重复"/>
                                 <field name="workcenter_ids" string="工作中心" widget="many2many_tags"/>
@@ -70,7 +70,7 @@
                         <field name='surface_technics_routing_tmpl_ids' style="white-space: pre-wrap;">
                             <tree editable='bottom'>
                                 <field name="sequence" widget="handle" string="序号"/>
-                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}"/>
+                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}" context="{'is_duplicate': True, 'model_type': 'sf.surface_technics.model.type.routing.sort'}}"/>
                                 <field name="routing_type" string="类型"/>
                                 <field name="is_repeat" string="重复"/>
                                 <field name="workcenter_ids" string="工作中心" widget="many2many_tags"/>

From 2a20d54530dd36a2fc488f90efa65c7c6d343627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Fri, 20 Dec 2024 13:02:10 +0800
Subject: [PATCH 031/147] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=8E=92=E9=99=A4=E5=B7=B2=E7=BB=8F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9A=84=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/mrp_routing_workcenter.py          |  4 ++--
 sf_manufacturing/views/model_type_view.xml    | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sf_manufacturing/models/mrp_routing_workcenter.py b/sf_manufacturing/models/mrp_routing_workcenter.py
index e09b0aa5..27c8e9d2 100644
--- a/sf_manufacturing/models/mrp_routing_workcenter.py
+++ b/sf_manufacturing/models/mrp_routing_workcenter.py
@@ -94,9 +94,9 @@ class ResMrpRoutingWorkcenter(models.Model):
                     route_ids.append(t.route_id.surface_technics_id.id)
             domain = [('id', 'not in', route_ids), ('routing_tag', '=', 'special')]
             return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
-        if self._context.get('is_duplicate') and self._context.get('model_type'):
+        if self._context.get('is_duplicate') and self._context.get('model_name'):
             # 查询出已经选择的工序
-            model_type = self.env[self._context.get('model_type')].search_read([],['route_workcenter_id'])
+            model_type = self.env[self._context.get('model_name')].search_read([],['route_workcenter_id'])
             route_workcenter_ids = [item['route_workcenter_id'][0] if item['route_workcenter_id'] else False for item in model_type]
             domain = args + [('id', 'not in', route_workcenter_ids)]
             return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
diff --git a/sf_manufacturing/views/model_type_view.xml b/sf_manufacturing/views/model_type_view.xml
index d3f90fd7..f4c1f994 100644
--- a/sf_manufacturing/views/model_type_view.xml
+++ b/sf_manufacturing/views/model_type_view.xml
@@ -3,7 +3,7 @@
     <data>
         #------------------模型类型------------------
 
-        <record model="ir.ui.view" id="search_sf_model_type_view">
+        <record model="ir.ui.view" id="search_sf_model_name_view">
             <field name="name">search.sf.model.type</field>
             <field name="model">sf.model.type</field>
             <field name="arch" type="xml">
@@ -14,7 +14,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="tree_sf_model_type_view">
+        <record model="ir.ui.view" id="tree_sf_model_name_view">
             <field name="name">tree.sf.model.type</field>
             <field name="model">sf.model.type</field>
             <field name="arch" type="xml">
@@ -24,7 +24,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="form_sf_model_type">
+        <record model="ir.ui.view" id="form_sf_model_name">
             <field name="name">form.sf.model.type</field>
             <field name="model">sf.model.type</field>
             <field name="arch" type="xml">
@@ -37,7 +37,7 @@
                         <field name='product_routing_tmpl_ids'>
                             <tree editable='bottom'>
                                 <field name="sequence" widget="handle" string="序号"/>
-                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}" context="{'is_duplicate': True, 'model_type': 'sf.product.model.type.routing.sort'}"/>
+                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}" context="{'is_duplicate': True, 'model_name': 'sf.product.model.type.routing.sort'}"/>
                                 <field name="routing_type" string="类型"/>
                                 <field name="is_repeat" string="重复"/>
                                 <field name="workcenter_ids" string="工作中心" widget="many2many_tags"/>
@@ -48,7 +48,7 @@
                         <field name='manual_product_routing_tmpl_ids'>
                             <tree editable='bottom'>
                                 <field name="sequence" widget="handle" string="序号"/>
-                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}" context="{'is_duplicate': True, 'model_type': 'sf.manual.product.model.type.routing.sort'}}"/>
+                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}" context="{'is_duplicate': True, 'model_name': 'sf.manual.product.model.type.routing.sort'}"/>
                                 <field name="routing_type" string="类型"/>
                                 <field name="is_repeat" string="重复"/>
                                 <field name="workcenter_ids" string="工作中心" widget="many2many_tags"/>
@@ -59,7 +59,7 @@
                         <field name='embryo_routing_tmpl_ids'>
                             <tree editable='bottom'>
                                 <field name="sequence" widget="handle" string="序号"/>
-                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}" context="{'is_duplicate': True, 'model_type': 'sf.embryo.model.type.routing.sort'}}"/>
+                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}" context="{'is_duplicate': True, 'model_name': 'sf.embryo.model.type.routing.sort'}"/>
                                 <field name="routing_type" string="类型"/>
                                 <field name="is_repeat" string="重复"/>
                                 <field name="workcenter_ids" string="工作中心" widget="many2many_tags"/>
@@ -70,7 +70,7 @@
                         <field name='surface_technics_routing_tmpl_ids' style="white-space: pre-wrap;">
                             <tree editable='bottom'>
                                 <field name="sequence" widget="handle" string="序号"/>
-                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}" context="{'is_duplicate': True, 'model_type': 'sf.surface_technics.model.type.routing.sort'}}"/>
+                                <field name="route_workcenter_id" string="工序" options="{'no_create': True}" context="{'is_duplicate': True, 'model_name': 'sf.surface_technics.model.type.routing.sort'}"/>
                                 <field name="routing_type" string="类型"/>
                                 <field name="is_repeat" string="重复"/>
                                 <field name="workcenter_ids" string="工作中心" widget="many2many_tags"/>
@@ -81,7 +81,7 @@
             </field>
         </record>
 
-        <record id="action_sf_model_type" model="ir.actions.act_window">
+        <record id="action_sf_model_name" model="ir.actions.act_window">
             <field name="name">模型类型</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.model.type</field>
@@ -96,11 +96,11 @@
         </record>
 
         <menuitem
-                id="menu_sf_model_type"
+                id="menu_sf_model_name"
                 name="模型类型"
                 parent="mrp.menu_mrp_configuration"
                 sequence="9"
-                action="action_sf_model_type"
+                action="action_sf_model_name"
         />
     </data>
 </odoo>
\ No newline at end of file

From 9d883d112cb008c2614bce66b3cc7411ebd30e03 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Fri, 20 Dec 2024 13:51:11 +0800
Subject: [PATCH 032/147] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_message/data/bussiness_node.xml       | 10 +++++++
 sf_message/data/template_data.xml        | 27 +++++++++++++++++
 sf_message/models/sf_message_purchase.py | 37 ++++++++++++++++++++++++
 sf_sale/__manifest__.py                  |  1 +
 sf_sale/data/cron_data.xml               | 16 ++++++++++
 sf_sale/models/sale_order.py             | 27 +++++++++++++++++
 6 files changed, 118 insertions(+)
 create mode 100644 sf_sale/data/cron_data.xml

diff --git a/sf_message/data/bussiness_node.xml b/sf_message/data/bussiness_node.xml
index cff79873..8a95f525 100644
--- a/sf_message/data/bussiness_node.xml
+++ b/sf_message/data/bussiness_node.xml
@@ -140,5 +140,15 @@
             <field name="name">工序外协发料通知</field>
             <field name="model">mrp.production</field>
         </record>
+
+        <record id="bussiness_purchase_order_warning" model="jikimo.message.bussiness.node">
+            <field name="name">采购订单预警提醒</field>
+            <field name="model">purchase.order</field>
+        </record>
+
+        <record id="bussiness_purchase_order_overdue" model="jikimo.message.bussiness.node">
+            <field name="name">采购单已逾期提醒</field>
+            <field name="model">purchase.order</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml
index 42256ce6..e1ba0a93 100644
--- a/sf_message/data/template_data.xml
+++ b/sf_message/data/template_data.xml
@@ -362,5 +362,32 @@
 单号：产品[{{name}}]({{url}})发料单
 事项：请确认{{num}}个工序外协发料单并发料处理。</field>
         </record>
+
+
+        <record id="template_purchase_order_warning" model="jikimo.message.template">
+            <field name="name">采购订单预警提醒</field>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
+            <field name="model">purchase.order</field>
+            <field name="bussiness_node_id" ref="bussiness_purchase_order_warning"/>
+            <field name="msgtype">markdown</field>
+            <field name="send_type">timing</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 采购订单预警提醒
+事项：[共有{{num}}个采购订单有逾期风险]({{url}})
+            </field>
+        </record>
+
+        <record id="template_purchase_order_overdue" model="jikimo.message.template">
+            <field name="name">采购单已逾期提醒</field>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
+            <field name="model">purchase.order</field>
+            <field name="bussiness_node_id" ref="bussiness_purchase_order_overdue"/>
+            <field name="msgtype">markdown</field>
+            <field name="send_type">timing</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 采购单已逾期提醒
+事项：[共有{{num}}个采购订单已逾期]({{url}})
+            </field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_message/models/sf_message_purchase.py b/sf_message/models/sf_message_purchase.py
index 3f1c4709..b9505414 100644
--- a/sf_message/models/sf_message_purchase.py
+++ b/sf_message/models/sf_message_purchase.py
@@ -24,6 +24,19 @@ class SFMessagePurchase(models.Model):
                     [('id', '=', int(message_queue_id.res_id))])
                 mrp_production = self.env['mrp.production'].sudo().search([('name', '=', purchase_order_line.origin)])
                 process_outsourcing.add(mrp_production.product_id.id)
+            if message_queue_id.message_template_id.name in ('采购订单预警提醒', '采购单已逾期提醒'):
+                content = message_queue_id.message_template_id.content
+                if message_queue_id.message_template_id.name == '采购订单预警提醒':
+                    domain = [('delivery_warning', '=', 'warning')]
+                else:
+                    domain = [('delivery_warning', '=', 'overdue')]
+                purchase_order_num = self.env['purchase.order'].sudo().search_count(domain)
+                if purchase_order_num >= 1:
+                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+                    action_id = self.env.ref("purchase.purchase_form_action").id
+                    url_with_id = f"{url}/web#view_type=list&action={action_id}"
+                    content = content.replace('{{url}}', url_with_id).replace('{{num}}', str(purchase_order_num))
+                    contents.append(content)
         if process_outsourcing:
             content_info = content
             for products_id in process_outsourcing:
@@ -58,3 +71,27 @@ class SFMessagePurchase(models.Model):
         # 拼接URL
         full_url = url + "/web#" + query_string
         return full_url
+
+    def _overdue_or_warning_func(self):
+        last_overdue_order, last_warning_order = super(SFMessagePurchase, self)._overdue_or_warning_func()
+        if last_overdue_order:
+            business_node_id = self.env.ref('sf_message.template_purchase_order_overdue').id
+            purchase_order_has = self._get_message_queue(business_node_id)
+            if not purchase_order_has:
+                last_overdue_order.add_queue("采购单已逾期提醒")
+        if last_warning_order:
+            business_node_id = self.env.ref('sf_message.template_purchase_order_warning').id
+            purchase_order_has = self._get_message_queue(business_node_id)
+            if not purchase_order_has:
+                last_warning_order.add_queue("采购订单预警提醒")
+
+    def _get_message_queue(self, business_node_id):
+        message_template = self.env["jikimo.message.template"].sudo().search([
+            ("model", "=", self._name),
+            ("bussiness_node_id", "=", business_node_id)
+        ], limit=1)
+        purchase_order_has = self.env['jikimo.message.queue'].sudo().search([
+            ('message_status', '=', 'pending'),
+            ('message_template_id', '=', message_template.id)
+        ])
+        return purchase_order_has
diff --git a/sf_sale/__manifest__.py b/sf_sale/__manifest__.py
index 45c95030..12d50f5f 100644
--- a/sf_sale/__manifest__.py
+++ b/sf_sale/__manifest__.py
@@ -16,6 +16,7 @@
         'security/ir.model.access.csv',
         'wizard/sale_order_wizard_views.xml',
         'wizard/purchase_order_wizard_views.xml',
+        'data/cron_data.xml',
         'views/sale_team.xml',
         'views/sale_order_view.xml',
         'views/res_partner_view.xml',
diff --git a/sf_sale/data/cron_data.xml b/sf_sale/data/cron_data.xml
new file mode 100644
index 00000000..3a1d2ea7
--- /dev/null
+++ b/sf_sale/data/cron_data.xml
@@ -0,0 +1,16 @@
+<odoo>
+    <data noupdate="1">
+        <record model="ir.cron" id="ir_cron_purchase_order_overdue_warning">
+            <field name="name">检查采购单是否已逾期预警和逾期</field>
+            <field name="model_id" ref="model_purchase_order"/>
+            <field name="state">code</field>
+            <field name="code">model._overdue_or_warning_func()</field>
+            <field name="interval_number">10</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="active" eval="True"/>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index ca851fc6..492c0316 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -1,8 +1,10 @@
 import datetime
 import base64
+import logging
 from odoo import Command
 from odoo import models, fields, api, _
 from odoo.exceptions import UserError, ValidationError
+from datetime import datetime, timedelta
 
 READONLY_FIELD_STATES = {
     state: [('readonly', True)]
@@ -218,6 +220,10 @@ class RePurchaseOrder(models.Model):
     purchase_type = fields.Selection([('standard', '标准采购'), ('consignment', '委外加工')], string='采购类型',
                                      default='standard')
 
+    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '预警'), ('overdue', '已逾期')],
+                                        string='交期状态',
+                                        tracking=True)
+
     @api.depends('partner_id')
     def _compute_user_id(self):
         if not self.user_id:
@@ -299,6 +305,27 @@ class RePurchaseOrder(models.Model):
 
         return result
 
+    # # 采购订单逾期预警和已逾期
+    def _overdue_or_warning_func(self):
+        purchase_order = self.sudo().search(
+            [('state', 'in', ['purchase']), ('date_planned', '!=', False),
+             ('receipt_status', 'in', ('partial', 'pending'))])
+        last_overdue_order = None
+        last_warning_order = None
+        for item in purchase_order:
+            current_time = datetime.now()
+            if item.date_planned <= current_time:  # 已逾期
+                item.delivery_warning = 'overdue'
+                last_overdue_order = item
+            elif (item.date_planned - current_time).total_seconds() < 48 * 3600:  # 预警
+                item.delivery_warning = 'warning'
+                last_warning_order = item
+        purchase_order_done = self.sudo().search([('state', 'in', ['purchase']), ('receipt_status', '=', 'full')])
+        purchase_order_overdue = purchase_order_done.filtered(lambda x: x.delivery_warning in ['overdue', 'warning'])
+        if purchase_order_overdue:
+            purchase_order_overdue.write({'delivery_warning': 'normal'})
+        return last_overdue_order, last_warning_order
+
 
 class ResPartnerToSale(models.Model):
     _inherit = 'res.partner'

From c8df5ed1794653af65108c57b88c4fbc31cb678c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Fri, 20 Dec 2024 14:16:25 +0800
Subject: [PATCH 033/147] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=B7=A5=E5=BA=8F=E9=87=87=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E5=B7=B2=E5=88=9B=E5=BB=BA=E8=B4=A6=E5=8D=95=E5=B9=B6=E4=B8=94?=
 =?UTF-8?q?=E8=BF=87=E8=B4=A6=EF=BC=8C=E9=80=80=E5=9B=9E=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 7bfc0abb..4d8f11df 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -440,6 +440,18 @@ class MrpProduction(models.Model):
         process_parameters = []
         account_moves = []
         parameters_not = []
+        # 获取原有的工单对应的工序
+        origin_designs = self.workorder_ids.technology_design_id
+        # 获取已删除的工序
+        deleted_designs = origin_designs - self.technology_design_ids
+        if deleted_designs:
+            for deleted_design in deleted_designs:
+                workorder = self.env['mrp.workorder'].search([('technology_design_id', '=', deleted_design.id)])
+                purchase = workorder._get_surface_technics_purchase_ids()
+                account = self.env['account.move'].search([('id', 'in', purchase.invoice_ids.ids)])
+                if account.state not in ['cancel', False]:
+                    if purchase.name not in account_moves:
+                        account_moves.append(purchase.name)
         special_design = self.technology_design_ids.filtered(
             lambda a: a.routing_tag == 'special' and a.is_auto is False)
         for special in special_design:
@@ -451,11 +463,7 @@ class MrpProduction(models.Model):
                 if not product_production_process:
                     if special.process_parameters_id not in process_parameters:
                         process_parameters.append(special.process_parameters_id.display_name)
-            purchase = self.env['purchase.order'].search([('origin', '=', special.production_id.name)])
-            account = self.env['account.move'].search([('id', 'in', purchase.invoice_ids)])
-            if account.state not in ['cancel', False]:
-                if purchase.name not in account_moves:
-                    account_moves.append(purchase.name)
+            
         if account_moves:
             raise UserError(_("请联系工厂生产经理对采购订单为%s生成的账单进行取消", ", ".join(account_moves)))
         if parameters_not:

From bf227e3e92dee81b00f2cc57719f9a410b797b66 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Fri, 20 Dec 2024 14:33:23 +0800
Subject: [PATCH 034/147] =?UTF-8?q?=E4=BA=A4=E6=9C=9F=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/purchase_order_view.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 23c71a1f..0c02e41d 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -200,7 +200,27 @@
             <field name="arch" type="xml">
                 <tree position="attributes">
                     <attribute name="default_order">date_approve asc</attribute>
+                    <attribute name="decoration-warning">delivery_warning == 'warning'</attribute>
+                    <attribute name="decoration-danger">delivery_warning == 'overdue'</attribute>
                 </tree>
+                <field name="name" position="after">
+                    <field name="delivery_warning" invisible="1"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_purchase_order_view_search_inherit_sf" model="ir.ui.view">
+            <field name="name">purchase.order.search.inherit.sf</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_view_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//filter[@name='order_date']" position="after">
+                    <separator/>
+                    <filter string="正常" name="filter_order_normal"
+                            domain="['|', ('delivery_warning', '=', 'normal'), ('delivery_warning', '=', False)]"/>
+                    <filter string="预警" name="filter_order_warning" domain="[('delivery_warning', '=', 'warning')]"/>
+                    <filter string="逾期" name="filter_order_overdue" domain="[('delivery_warning', '=', 'overdue')]"/>
+                </xpath>
             </field>
         </record>
 

From 41096c9c6503a1ecd5a47c5623dada8ea07f02b1 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Fri, 20 Dec 2024 14:55:04 +0800
Subject: [PATCH 035/147] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=9B=BE=E5=8F=B7?=
 =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/__manifest__.py              |  1 +
 sf_manufacturing/models/__init__.py           |  1 +
 sf_manufacturing/models/product_template.py   |  5 ++--
 sf_manufacturing/models/purchase_order.py     |  7 +++++
 sf_manufacturing/models/sale_order.py         |  2 +-
 .../views/mrp_production_addional_change.xml  |  3 ++
 sf_manufacturing/views/mrp_workorder_view.xml |  2 ++
 .../views/purchase_order_view.xml             | 15 ++++++++++
 sf_manufacturing/views/sale_order_views.xml   |  4 +++
 sf_plan/models/custom_plan.py                 |  3 +-
 sf_plan/views/view.xml                        |  2 ++
 sf_quality/views/quality_cnc_test_view.xml    |  3 +-
 sf_sale/models/sale_order.py                  |  5 ++--
 sf_sale/views/purchase_order_view.xml         | 28 ++++++++++---------
 sf_sale/views/sale_order_view.xml             |  1 +
 15 files changed, 61 insertions(+), 21 deletions(-)
 create mode 100644 sf_manufacturing/models/purchase_order.py
 create mode 100644 sf_manufacturing/views/purchase_order_view.xml

diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index 904aac56..936afaaf 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -40,6 +40,7 @@
         'views/res_config_settings_views.xml',
         'views/sale_order_views.xml',
         'views/mrp_workorder_batch_replan.xml',
+        'views/purchase_order_view.xml',
     ],
     'assets': {
 
diff --git a/sf_manufacturing/models/__init__.py b/sf_manufacturing/models/__init__.py
index 9f77d841..c4d8ad94 100644
--- a/sf_manufacturing/models/__init__.py
+++ b/sf_manufacturing/models/__init__.py
@@ -15,3 +15,4 @@ from . import sf_technology_design
 from . import sf_production_common
 from . import sale_order
 from . import quick_easy_order
+from . import purchase_order
\ No newline at end of file
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 460fd994..4b927596 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -774,11 +774,10 @@ class ResProductMo(models.Model):
 
     # bfm下单
     manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
-    part_number = fields.Char(string='零件图号', readonly=True)
     machining_drawings = fields.Binary('2D加工图纸', readonly=True)
     quality_standard = fields.Binary('质检标准', readonly=True)
     part_name = fields.Char(string='零件名称', readonly=True)
-
+    part_number = fields.Char(string='零件图号', readonly=True)
     @api.constrains('tool_length')
     def _check_tool_length_size(self):
         if self.tool_length > 1000000:
@@ -892,7 +891,7 @@ class ResProductMo(models.Model):
             'machining_drawings': '' if not item['machining_drawings'] else base64.b64decode(
                 item['machining_drawings']),
             'quality_standard': '' if not item['quality_standard'] else base64.b64decode(item['quality_standard']),
-            'part_name': item['part_name'],
+            'part_name': item.get('part_name') or '',
         }
         tax_id = self.env['account.tax'].sudo().search(
             [('type_tax_use', '=', 'sale'), ('amount', '=', item.get('tax')), ('price_include', '=', 'True')])
diff --git a/sf_manufacturing/models/purchase_order.py b/sf_manufacturing/models/purchase_order.py
new file mode 100644
index 00000000..52095fc7
--- /dev/null
+++ b/sf_manufacturing/models/purchase_order.py
@@ -0,0 +1,7 @@
+import logging
+from odoo import models, fields, api
+
+_logger = logging.getLogger(__name__)
+class PurchaseOrderLine(models.Model):
+    _inherit = 'purchase.order.line'
+    part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
diff --git a/sf_manufacturing/models/sale_order.py b/sf_manufacturing/models/sale_order.py
index 5d318141..e31faf1c 100644
--- a/sf_manufacturing/models/sale_order.py
+++ b/sf_manufacturing/models/sale_order.py
@@ -152,7 +152,7 @@ class SaleOrder(models.Model):
 
 class SaleOrderLine(models.Model):
     _inherit = 'sale.order.line'
-
+    part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
     # 供货方式
     supply_method = fields.Selection([
         ('automation', "自动化产线加工"),
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index d08ff81f..c9856cb8 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -18,9 +18,12 @@
                 <xpath expr="//field[@name='date_deadline']" position="replace"/>
                 <xpath expr="//field[@name='name']" position="after">
                     <field name="product_id" readonly="1" optional="show"/>
+                    <field name="part_name" readonly="1" optional="hide"/>
+                    <field name="part_number" readonly="1" optional="show"/>
                 </xpath>
                 <xpath expr="//field[@name='product_id']" position="after">
                     <field name="product_qty" sum="Total Qty" string="数量" readonly="1" optional="show"/>
+                    <field name="deadline_of_delivery" optional="show"/>
                 </xpath>
                 <xpath expr="//field[@name='product_qty']" position="after">
                     <field name="product_uom_id" string="计量单位" options="{'no_open':True,'no_create':True}"
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 1a2682be..de94390a 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -29,6 +29,8 @@
             </field>
             <field name="product_id" position="after">
                 <field name="equipment_id" optional="hide"/>
+                <field name="part_name" optional="hide"/>
+                <field name="part_number" optional="show"/>
             </field>
             <xpath expr="//field[@name='qty_remaining']" position="after">
                 <field name="manual_quotation" optional="show"/>
diff --git a/sf_manufacturing/views/purchase_order_view.xml b/sf_manufacturing/views/purchase_order_view.xml
new file mode 100644
index 00000000..5fbd7bd1
--- /dev/null
+++ b/sf_manufacturing/views/purchase_order_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record model="ir.ui.view" id="view_purchase_order_line_form_inherit_sf1">
+            <field name="name">purchase.order.form.inherit.sf</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="after">
+                    <field name="part_number" optional="show"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/sf_manufacturing/views/sale_order_views.xml b/sf_manufacturing/views/sale_order_views.xml
index 49cc752f..8e1d1061 100644
--- a/sf_manufacturing/views/sale_order_views.xml
+++ b/sf_manufacturing/views/sale_order_views.xml
@@ -18,6 +18,10 @@
             <xpath expr="//page/field[@name='order_line']/tree/field[@name='remark']" position="before">
                 <field name="supply_method" attrs="{'invisible': [('state', '=', 'draft')], 'required': [('state', '=', 'supply method')]}" />
             </xpath>
+            <xpath expr="//field[@name='order_line']/tree/field[@name='model_glb_file']" position="before">
+                                    <field name="part_number" optional="show"/>
+                </xpath>
+
             <xpath expr="//header/button[@name='action_cancel']" position="attributes">
                 <attribute name="attrs">{'invisible': [('state', '!=', 'draft')]}</attribute>
             </xpath>
diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index 6ee1d3ee..5f4003da 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -13,7 +13,8 @@ class sf_production_plan(models.Model):
     _description = 'sf_production_plan'
     _inherit = ['mail.thread']
     # _order = 'state desc, write_date desc'
-
+    part_name = fields.Char('零件名称', related='product_id.part_name', readonly=True)
+    part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
     state = fields.Selection([
         ('draft', '待排程'),
         ('done', '已排程'),
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 47e1dd54..09bd790c 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -17,6 +17,8 @@
                            decoration-danger="state == 'finished'"/>
                     <field name="name"/>
                     <field name="origin"/>
+                    <field name="part_number" optional="show"/>
+                    <field name="part_name" optional="hide"/>
                     <field name="order_deadline" widget="date"/>
                     <field name="product_qty"/>
                     <field name="production_line_id"/>
diff --git a/sf_quality/views/quality_cnc_test_view.xml b/sf_quality/views/quality_cnc_test_view.xml
index 29cab866..d2d37686 100644
--- a/sf_quality/views/quality_cnc_test_view.xml
+++ b/sf_quality/views/quality_cnc_test_view.xml
@@ -18,7 +18,8 @@
                 <field name="production_id"/>
                 <field name="processing_panel"/>
                 <field name="product_id"/>
-                <field name="part_number"/>
+                <field name="part_number" optional="show"/>
+                <field name="part_name" optional="hide"/>
                 <field name="number"/>
                 <field name="state" widget="badge"
                        decoration-success="state == 'done'"
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 2e99de70..c97b027b 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -225,7 +225,8 @@ class ReSaleOrder(models.Model):
 
 class ResaleOrderLine(models.Model):
     _inherit = 'sale.order.line'
-
+    # part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
+    part_name = fields.Char('零件名称', related='product_id.part_name', readonly=True)
     model_glb_file = fields.Binary('模型的glb文件', compute='_compute_model_glb_file', store=True)
     # product_template_id = fields.Many2one(
     #     string="产品",
@@ -383,7 +384,7 @@ class PurchaseOrderLine(models.Model):
     _inherit = 'purchase.order.line'
 
     part_name = fields.Char('零件名称', related='product_id.part_name', readonly=True)
-
+    # part_number = fields.Char('零件图号',related='product_id.part_number', readonly=True)
 
 class ResPartnerToSale(models.Model):
     _inherit = 'res.partner'
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index ccdee1d0..bb2b957b 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -16,10 +16,11 @@
                     <button name="button_confirm" type="object" states="draft" context="{'validate_analytic': True}"
                             string="Confirm Order" id="draft_confirm"/>
                     <button name="action_view_picking"
-                    string="接收产品" class="oe_highlight" type="object"
-                    attrs="{'invisible': ['|', '|' , ('is_shipped', '=', True), ('state','not in', ('purchase','done')), ('incoming_picking_count', '=', 0)]}"
-                    data-hotkey="y" groups="stock.group_stock_user"/>
-                    <button name="button_cancel" states="draft,to approve,sent,purchase" string="取消" type="object" data-hotkey="x" />
+                            string="接收产品" class="oe_highlight" type="object"
+                            attrs="{'invisible': ['|', '|' , ('is_shipped', '=', True), ('state','not in', ('purchase','done')), ('incoming_picking_count', '=', 0)]}"
+                            data-hotkey="y" groups="stock.group_stock_user"/>
+                    <button name="button_cancel" states="draft,to approve,sent,purchase" string="取消" type="object"
+                            data-hotkey="x"/>
                 </xpath>
                 <xpath expr="//header/button[@name='button_cancel'][2]" position="attributes">
                     <attribute name="invisible">1</attribute>
@@ -134,7 +135,8 @@
                     <attribute name="optional">hide</attribute>
                 </xpath>
                 <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="after">
-                    <field name="part_name" string="零件名称" optional="show"/>
+                    <field name="part_name" optional="hide"/>
+<!--                    <field name="part_number" optional="show"/>-->
                 </xpath>
                 <xpath expr="//field[@name='date_order']" position="attributes">
                     <attribute name="string">报价截止日期</attribute>
@@ -168,11 +170,11 @@
                     </attribute>
                 </field>
 
-<!--                 添加采购类型字段 -->
+                <!--                 添加采购类型字段 -->
                 <field name="partner_ref" position="after">
                     <field name="purchase_type" string="采购类型" readonly="1"/>
                 </field>
-<!--                添加销售订单号字段-->
+                <!--                添加销售订单号字段-->
                 <field name="effective_date" position="after">
                     <field name="origin_sale_id" readonly="1" attrs="{'invisible': [('origin_sale_id', '=', False)]}"/>
                 </field>
@@ -261,12 +263,12 @@
                 <xpath expr="//field[@name='name']" position="replace">
                     <field name="name" string="单据编码" filter_domain="[('name', 'ilike', self)]"/>
                 </xpath>
-<!--                <xpath expr="//search" position="inside">-->
-<!--                    <searchpanel>-->
-<!--                        <field name="purchase_type" icon="fa-filter"/>-->
-<!--                        <field name="state" icon="fa-filter"/>-->
-<!--                    </searchpanel>-->
-<!--                </xpath>-->
+                <!--                <xpath expr="//search" position="inside">-->
+                <!--                    <searchpanel>-->
+                <!--                        <field name="purchase_type" icon="fa-filter"/>-->
+                <!--                        <field name="state" icon="fa-filter"/>-->
+                <!--                    </searchpanel>-->
+                <!--                </xpath>-->
             </field>
         </record>
 
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index d6247823..0de2287b 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -103,6 +103,7 @@
                 <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="before">
                     <field name="model_glb_file" widget="Viewer3D" optional="show"
                            string="模型文件" attrs="{'readonly': [('state', 'in', ['draft'])]}"/>
+                    <field name="part_name" optional="hide"/>
                 </xpath>
                 <xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
                     <field name="remark"/>

From 091b9940efd3098ce5f16490138efca509846faf Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Fri, 20 Dec 2024 14:59:26 +0800
Subject: [PATCH 036/147] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=9B=BE=E5=8F=B7?=
 =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/purchase_order.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sf_manufacturing/models/purchase_order.py b/sf_manufacturing/models/purchase_order.py
index 9ca72267..1ffed728 100644
--- a/sf_manufacturing/models/purchase_order.py
+++ b/sf_manufacturing/models/purchase_order.py
@@ -10,7 +10,6 @@ from odoo.tools import OrderedSet
 # _get_surface_technics_purchase_ids
 class PurchaseOrder(models.Model):
     _inherit = 'purchase.order'
-
     def button_confirm(self):
         super().button_confirm()
         workorders = self.env['mrp.workorder'].search([('purchase_id', '=', self.id)])

From c4b02f771728e2d91d7965eb82c0c238b4ac7c75 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Fri, 20 Dec 2024 15:31:55 +0800
Subject: [PATCH 037/147] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_message/__manifest__.py               |  4 ++-
 sf_message/models/sf_message_purchase.py |  6 ++--
 sf_message/views/purchase_order_view.xml | 46 ++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 sf_message/views/purchase_order_view.xml

diff --git a/sf_message/__manifest__.py b/sf_message/__manifest__.py
index 9181b422..fcfcba8f 100644
--- a/sf_message/__manifest__.py
+++ b/sf_message/__manifest__.py
@@ -11,13 +11,15 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock', 'sf_quality', 'mrp','sf_manufacturing'],
+    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock', 'sf_quality', 'mrp',
+                'sf_manufacturing'],
     'data': [
         'data/bussiness_node.xml',
         'data/cron_data.xml',
         'data/template_data.xml',
         'security/ir.model.access.csv',
         'views/mrp_workorder_views.xml',
+        'views/purchase_order_view.xml',
     ],
     'test': [
     ],
diff --git a/sf_message/models/sf_message_purchase.py b/sf_message/models/sf_message_purchase.py
index b9505414..f4012555 100644
--- a/sf_message/models/sf_message_purchase.py
+++ b/sf_message/models/sf_message_purchase.py
@@ -28,13 +28,15 @@ class SFMessagePurchase(models.Model):
                 content = message_queue_id.message_template_id.content
                 if message_queue_id.message_template_id.name == '采购订单预警提醒':
                     domain = [('delivery_warning', '=', 'warning')]
+                    action_id = self.env.ref("sf_message.purchase_form_warning_action").id
                 else:
                     domain = [('delivery_warning', '=', 'overdue')]
+                    action_id = self.env.ref("sf_message.purchase_form_overdue_action").id
                 purchase_order_num = self.env['purchase.order'].sudo().search_count(domain)
                 if purchase_order_num >= 1:
                     url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-                    action_id = self.env.ref("purchase.purchase_form_action").id
-                    url_with_id = f"{url}/web#view_type=list&action={action_id}"
+                    menu_id = self.env.ref('purchase.menu_purchase_form_action').id
+                    url_with_id = f"{url}/web#view_type=list&action={action_id}&menu_id={menu_id}"
                     content = content.replace('{{url}}', url_with_id).replace('{{num}}', str(purchase_order_num))
                     contents.append(content)
         if process_outsourcing:
diff --git a/sf_message/views/purchase_order_view.xml b/sf_message/views/purchase_order_view.xml
new file mode 100644
index 00000000..3000d576
--- /dev/null
+++ b/sf_message/views/purchase_order_view.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="purchase_form_warning_action" model="ir.actions.act_window">
+        <field name="name">采购订单</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">purchase.order</field>
+        <field name="view_mode">tree,kanban,form,pivot,graph,calendar,activity</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+                (0, 0, {'view_mode': 'tree', 'view_id': ref('purchase.purchase_order_view_tree')}),
+                (0, 0, {'view_mode': 'kanban', 'view_id': ref('purchase.purchase_order_view_kanban_without_dashboard')}),
+            ]"/>
+        <field name="domain">[('state','in',('purchase', 'done'))]</field>
+        <field name="search_view_id" ref="purchase.purchase_order_view_search"/>
+        <field name="context">{'search_default_filter_order_warning':1}</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                还没有采购订单， 我们先创建一个!
+            </p>
+            <p>
+                当您下单到您的供应商，确定您的询价它会变成采购订单.
+            </p>
+        </field>
+    </record>
+
+    <record id="purchase_form_overdue_action" model="ir.actions.act_window">
+        <field name="name">采购订单</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">purchase.order</field>
+        <field name="view_mode">tree,kanban,form,pivot,graph,calendar,activity</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+                (0, 0, {'view_mode': 'tree', 'view_id': ref('purchase.purchase_order_view_tree')}),
+                (0, 0, {'view_mode': 'kanban', 'view_id': ref('purchase.purchase_order_view_kanban_without_dashboard')}),
+            ]"/>
+        <field name="domain">[('state','in',('purchase', 'done'))]</field>
+        <field name="search_view_id" ref="purchase.purchase_order_view_search"/>
+        <field name="context">{'search_default_filter_order_overdue':1}</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                还没有采购订单， 我们先创建一个!
+            </p>
+            <p>
+                当您下单到您的供应商，确定您的询价它会变成采购订单.
+            </p>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file

From 5a06811732867dd090a1da603afede36fa18c7c1 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Fri, 20 Dec 2024 16:12:30 +0800
Subject: [PATCH 038/147] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_message/models/sf_message_mrp_production.py | 2 +-
 sf_message/models/sf_message_purchase.py       | 2 +-
 sf_message/models/sf_message_stock_picking.py  | 2 +-
 sf_sale/models/sale_order.py                   | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/sf_message/models/sf_message_mrp_production.py b/sf_message/models/sf_message_mrp_production.py
index 94c8297e..d9dd0f1b 100644
--- a/sf_message/models/sf_message_mrp_production.py
+++ b/sf_message/models/sf_message_mrp_production.py
@@ -124,7 +124,7 @@ class SFMessageMrpProduction(models.Model):
     def get_request_url(self):
         url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
         action_id = self.env.ref('sf_message.mrp_workorder_issued_action').id
-        menu_id = self.env['ir.model.data'].sudo().search([('name', '=', 'module_stock_dropshipping')]).id
+        menu_id = self.env.ref('mrp.menu_mrp_root').id
         active_id = self.env['mrp.workcenter'].sudo().search([('name', '=', '工件装夹中心')]).id
         # 查询参数
         params = {'menu_id': menu_id, 'action': action_id, 'model': 'mrp.workorder',
diff --git a/sf_message/models/sf_message_purchase.py b/sf_message/models/sf_message_purchase.py
index f4012555..7375eba6 100644
--- a/sf_message/models/sf_message_purchase.py
+++ b/sf_message/models/sf_message_purchase.py
@@ -63,7 +63,7 @@ class SFMessagePurchase(models.Model):
     def request_url(self, id):
         url = self.env['ir.config_parameter'].get_param('web.base.url')
         action_id = self.env.ref('purchase.purchase_form_action').id
-        menu_id = self.env['ir.model.data'].search([('name', '=', 'module_website_payment')]).id
+        menu_id = self.env.ref('purchase.menu_purchase_form_action').id
         # 查询参数
         params = {'id': id, 'menu_id': menu_id, 'action': action_id,
                   'model': 'purchase.order',
diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py
index b3e1868e..5d15d34a 100644
--- a/sf_message/models/sf_message_stock_picking.py
+++ b/sf_message/models/sf_message_stock_picking.py
@@ -74,7 +74,7 @@ class SFMessageStockPicking(models.Model):
                 if stock_picking_line.state == 'assigned':
                     url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
                     action_id = self.env.ref('stock.action_picking_tree_ready').id
-                    menu_id = self.env['ir.model.data'].sudo().search([('name', '=', 'module_theme_treehouse')]).id
+                    menu_id = self.env.ref('stock.menu_stock_root').id
                     url_with_id = f"{url}/web#view_type=form&action={action_id}&menu_id={menu_id}&id={stock_picking_line.id}"
                     content = content.replace('{{name}}', stock_picking_line.name).replace(
                         '{{request_url}}', url_with_id)
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 492c0316..93a52ef6 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -1,10 +1,8 @@
 import datetime
 import base64
-import logging
 from odoo import Command
 from odoo import models, fields, api, _
 from odoo.exceptions import UserError, ValidationError
-from datetime import datetime, timedelta
 
 READONLY_FIELD_STATES = {
     state: [('readonly', True)]

From 098e8c25189cc6340174b7afb0599d969c8fb874 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 20 Dec 2024 17:22:56 +0800
Subject: [PATCH 039/147] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 7bfc0abb..7322d75c 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -955,10 +955,11 @@ class MrpProduction(models.Model):
                 work_ids = workorder_ids.filtered(lambda item: item.sequence == 0)
                 # 对工单进行逐个插入
                 for work_id in work_ids:
-                    for order_id in rec.workorder_ids.filtered(lambda item: item.sequence > 0):
-                        if work_id.name == order_id.name and work_id.processing_panel == order_id.processing_panel:
-                            work_id.sequence = order_id.sequence + 1
-                            break
+                    order_rework_ids = rec.workorder_ids.filtered(
+                            lambda item: (item.sequence > 0 and work_id.name == item.name
+                                          and work_id.processing_panel == item.processing_panel))
+                    order_rework_ids = sorted(order_rework_ids, key=lambda item: item.sequence, reverse=True)
+                    work_id.sequence = order_rework_ids[0].sequence + 1
                     # 对该工单之后的工单工序进行加一
                     work_order_ids = rec.workorder_ids.filtered(
                         lambda item: item.sequence >= work_id.sequence and item.id != work_id.id)

From 0e7e7af85a0820b407905083fe0f08513e2adc20 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 23 Dec 2024 13:46:30 +0800
Subject: [PATCH 040/147] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=EF=BC=9B2?=
 =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E5=A4=B9=E5=85=B7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=89=98=E7=9B=98=E5=8F=AF=E7=94=A8?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=9B3=E3=80=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=BC=80=E5=A7=8B=E6=8C=89=E9=94=AE=EF=BC=9B?=
 =?UTF-8?q?4=E3=80=81=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E4=BE=9B=E8=B4=A7=E6=96=B9=E5=BC=8F=E5=92=8C=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=97=B6=E6=98=AF=E5=90=A6=E5=A4=96=E5=8D=8F?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=80=89=E6=8B=A9=E5=AF=B9=E5=BA=94=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E7=B1=BB=E5=9E=8B=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/models/process_status.py        |  2 ++
 sf_manufacturing/models/mrp_workorder.py      | 10 ++++---
 .../views/mrp_production_addional_change.xml  |  4 +--
 sf_manufacturing/views/mrp_workorder_view.xml |  9 +++----
 sf_sale/models/sale_order.py                  | 26 ++++++++++++++++---
 .../models/maintenance_equipment.py           |  2 +-
 6 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/sf_bf_connect/models/process_status.py b/sf_bf_connect/models/process_status.py
index 09fecfae..69eb84f1 100644
--- a/sf_bf_connect/models/process_status.py
+++ b/sf_bf_connect/models/process_status.py
@@ -36,6 +36,8 @@ class StatusChange(models.Model):
         # 使用super()来调用原始方法（在本例中为'sale.order'模型的'action_confirm'方法）
         try:
             res = super(StatusChange, self).action_confirm()
+            # 修改销售订单状态为【加工中】
+            self.write({'state': 'processing'})
             logging.info('原生方法返回结果:%s' % res)
             # 原有方法执行后，进行额外的操作（如调用外部API）
             process_start_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 52fa30c8..410f8d1b 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -138,7 +138,8 @@ class ResMrpWorkOrder(models.Model):
     is_subcontract = fields.Boolean(string='是否外协')
     surface_technics_parameters_id = fields.Many2one('sf.production.process.parameter', string="表面工艺可选参数")
 
-    picking_ids = fields.Many2many('stock.picking', string='外协出入库单', compute='_compute_surface_technics_picking_ids')
+    picking_ids = fields.Many2many('stock.picking', string='外协出入库单',
+                                   compute='_compute_surface_technics_picking_ids')
 
     purchase_id = fields.Many2many('purchase.order', string='外协采购单')
     surface_technics_picking_count = fields.Integer("外协出入库", compute='_compute_surface_technics_picking_ids')
@@ -327,7 +328,7 @@ class ResMrpWorkOrder(models.Model):
             'view_mode': 'form',
         }
         return result
-    
+
     def _get_surface_technics_purchase_ids(self):
         domain = [('origin', '=', self.production_id.name), ('purchase_type', '=', 'consignment')]
         purchase_orders = self.env['purchase.order'].search(domain)
@@ -1429,6 +1430,8 @@ class ResMrpWorkOrder(models.Model):
                         rfid_code = workorder.rfid_code
                         workorder.write({'rfid_code_old': rfid_code,
                                          'rfid_code': False})
+                        self.env['stock.lot'].sudo().search([('rfid', '=', rfid_code)]).write(
+                            {'tool_material_status': '可用'})
                         if workorder.rfid_code:
                             raise ValidationError(f'【{workorder.name}】工单解绑失败，请重新点击完成按钮！！！')
                         # workorder.rfid_code_old = rfid_code
@@ -1567,7 +1570,7 @@ class ResMrpWorkOrder(models.Model):
                 'default_confirm_button': '确认解除',
                 # 'default_feeder_station_start_id': feeder_station_start_id,
             }}
-    
+
     move_subcontract_workorder_ids = fields.One2many('stock.move', 'subcontract_workorder_id', string='组件')
 
 
@@ -1778,6 +1781,7 @@ class SfWorkOrderBarcodes(models.Model):
                             if workorder_rfid:
                                 for item in workorder_rfid:
                                     item.write({'rfid_code': barcode})
+                            lot.sudo().write({'tool_material_status': '在用'})
                             logging.info("Rfid[%s]绑定成功！！！" % barcode)
                         else:
                             raise UserError('该Rfid【%s】绑定的是【%s】, 不是托盘！！！' % (barcode, lot.product_id.name))
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index d08ff81f..f144a91c 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -441,9 +441,7 @@
                 <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','rework', 'cancel')), ('is_user_working', '!=',
-                    False), ('routing_type', '=', 'CNC加工')]}"
+                            attrs="{'invisible': [('state', '!=', 'ready')]}"
                             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 1a2682be..5241249a 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -53,10 +53,7 @@
                 <!--                    'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),-->
                 <!--                    ('is_user_working', '!=', False),("user_permissions","=",False),("name","=","CNC加工")]}-->
                 <!--                </attribute>-->
-                <attribute name="attrs">{'invisible': ['|', '|', '|','|','|', ('production_state','in', ('draft',
-                    'done',
-                    'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done','rework', 'cancel')),
-                    ('is_user_working', '!=', False),("user_permissions","=",False),("name","in",("CNC加工","解除装夹"))]}
+                <attribute name="attrs">{'invisible': [('state', '!=', 'ready')]}
                 </attribute>
             </xpath>
             <xpath expr="//button[@name='%(mrp.act_mrp_block_workcenter_wo)d']" position="attributes">
@@ -174,9 +171,9 @@
                 <!--                <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','to be detected')), ('is_user_working', '!=', False)]}"/>-->
                 <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"
-                        attrs="{'invisible': ['|', '|', '|', '|', '|', ('routing_type', '=', '装夹预调'), ('routing_type', '=', '解除装夹'), ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done','rework', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>
+                        attrs="{'invisible': [('state', '!=', 'ready')]}"/>
                 <button name="button_start" type="object" string="开始" class="btn-success"
-                        attrs="{'invisible': ['|', '|', '|', '|', ('routing_type', '!=', '装夹预调'), ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done','rework', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>
+                        attrs="{'invisible': [('state', '!=', 'ready')]}"/>
                 <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)]}"/>
                 <button name="button_finish" type="object" string="完成" class="btn-success" confirm="是否确认完工"
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 2e99de70..b2a94d27 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -282,12 +282,28 @@ class RePurchaseOrder(models.Model):
 
     purchase_type = fields.Selection(
         [('standard', '标准采购'), ('consignment', '委外加工'), ('outsourcing', '工序外协'), ('outside', '外购订单')],
-        string='采购类型', default='standard')
+        string='采购类型', default='standard', store=True, compute='_compute_purchase_type')
 
     origin_sale_id = fields.Many2one('sale.order', string='销售订单号', compute='_compute_origin_sale_id')
 
+    @api.depends('origin')
+    def _compute_purchase_type(self):
+        for purchase in self:
+            order_id = self.env['sale.order'].sudo().search([('name', '=', purchase.origin)])
+            if order_id:
+                product_list = [line.product_id.id for line in purchase.order_line]
+                for order_line in order_id.order_line:
+                    if order_line.supply_method == 'purchase':
+                        if order_line.product_id.id in product_list:
+                            purchase.purchase_type = 'outside'
+                            break
+                    elif order_line.supply_method == 'outsourcing':
+                        if order_line.product_id.id in product_list:
+                            purchase.purchase_type = 'consignment'
+                            break
+
     @api.depends('order_line.move_dest_ids.group_id.mrp_production_ids',
-                 'order_line.move_ids.move_dest_ids.group_id.mrp_production_ids')
+                 'order_line.move_ids.move_dest_ids.group_id.mrp_production_ids', 'origin')
     def _compute_origin_sale_id(self):
         for purchase in self:
             productions_ids = purchase._get_mrp_productions()
@@ -295,6 +311,10 @@ class RePurchaseOrder(models.Model):
                 if productions_ids[0].sale_order_id:
                     purchase.origin_sale_id = productions_ids[0].sale_order_id.id
                     continue
+            order_id = self.env['sale.order'].sudo().search([('name', '=', purchase.origin)])
+            if order_id:
+                purchase.origin_sale_id = order_id.id
+                continue
             purchase.origin_sale_id = False
 
     @api.depends('partner_id')
@@ -344,7 +364,7 @@ class RePurchaseOrder(models.Model):
                     'partner_id': server_template.seller_ids[0].partner_id.id,
                     'origin': production.name,
                     'state': 'draft',
-                    'purchase_type': 'consignment',
+                    'purchase_type': 'outsourcing',
                     'order_line': server_product_process})
                 pp.purchase_id = [(6, 0, [purchase_order.id])]
         # self.env.cr.commit()
diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index 18142e24..5da56016 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -126,7 +126,7 @@ class StockLot(models.Model):
     tool_material_search_id = fields.Many2one('sf.tool.material.search', string='刀具物料搜索')
     fixture_material_search_id = fields.Many2one('sf.fixture.material.search', string='夹具物料搜索')
     tool_material_status = fields.Selection(
-        [('未入库', '未入库'), ('可用', '可用'), ('在用', '在用'), ('报废', '报废')], string='状态',
+        [('未入库', '未入库'), ('可用', '可用'), ('在用', '空闲'), ('报废', '报废')], string='状态',
         compute='_compute_tool_material_status', store=True)
 
     @api.depends('quant_ids')

From d6c8120b7cb78b56aa7593eefd044ed22daf1483 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Mon, 23 Dec 2024 15:42:07 +0800
Subject: [PATCH 041/147] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=B7=A5=E5=8D=95=E9=80=9A=E8=BF=87=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA=E8=AE=BE=E8=AE=A1=E6=8E=92=E5=BA=8F=E5=86=8D=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=95=B0=E6=8D=AE=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 4d8f11df..8cd31441 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -769,7 +769,8 @@ class MrpProduction(models.Model):
                     }]
             if production.product_id.categ_id.type in ['成品', '坯料']:
                 # # 根据工序设计生成工单
-                for route in production.technology_design_ids:
+                technology_design_ids = sorted(production.technology_design_ids, key=lambda x: x.sequence)
+                for route in technology_design_ids:
                     workorder_has = self.env['mrp.workorder'].search(
                         [('technology_design_id', '=', route.id), ('production_id', '=', production.id)])
                     if not workorder_has:

From 6db5e727529d0731d170815c7c1c9942bf4d51a2 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 23 Dec 2024 17:13:12 +0800
Subject: [PATCH 042/147] =?UTF-8?q?1=E3=80=81=E9=87=87=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=96=E5=8D=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py          | 6 +++---
 sf_sale/views/purchase_order_view.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index d41b0e0d..3679316a 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -282,7 +282,7 @@ class RePurchaseOrder(models.Model):
         store=True)
 
     purchase_type = fields.Selection(
-        [('standard', '标准采购'), ('consignment', '委外加工'), ('outsourcing', '工序外协'), ('outside', '外购订单')],
+        [('standard', '标准采购'), ('consignment', '工序外协'), ('outsourcing', '委外加工'), ('outside', '外购订单')],
         string='采购类型', default='standard', store=True, compute='_compute_purchase_type')
 
     origin_sale_id = fields.Many2one('sale.order', string='销售订单号', compute='_compute_origin_sale_id')
@@ -300,7 +300,7 @@ class RePurchaseOrder(models.Model):
                             break
                     elif order_line.supply_method == 'outsourcing':
                         if order_line.product_id.id in product_list:
-                            purchase.purchase_type = 'consignment'
+                            purchase.purchase_type = 'outsourcing'
                             break
 
     @api.depends('order_line.move_dest_ids.group_id.mrp_production_ids',
@@ -365,7 +365,7 @@ class RePurchaseOrder(models.Model):
                     'partner_id': server_template.seller_ids[0].partner_id.id,
                     'origin': production.name,
                     'state': 'draft',
-                    'purchase_type': 'outsourcing',
+                    'purchase_type': 'consignment',
                     'order_line': server_product_process})
                 pp.purchase_id = [(6, 0, [purchase_order.id])]
         # self.env.cr.commit()
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index bb2b957b..7b53cf0b 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -135,7 +135,7 @@
                     <attribute name="optional">hide</attribute>
                 </xpath>
                 <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="after">
-                    <field name="part_name" optional="hide"/>
+                    <field name="part_name" optional="show"/>
 <!--                    <field name="part_number" optional="show"/>-->
                 </xpath>
                 <xpath expr="//field[@name='date_order']" position="attributes">

From 4bd40aeeb081fb25b6458739a0aaf8662971ca6a Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Tue, 24 Dec 2024 09:07:11 +0800
Subject: [PATCH 043/147] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 6506cc1a..8c202e6f 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -672,8 +672,8 @@ class StockPicking(models.Model):
                     'partner_id': self.partner_id.id,
                 })
                 move_dest_id = False
-                # 如果当前工单是是制造订单的最后一个工单
-                if workorder == item.workorder_ids[-1]:
+                # 如果当前工单是是制造订单的最后一个工艺外协工单
+                if workorder == next((workorder for workorder in reversed(item.workorder_ids) if workorder.is_subcontract), None):
                     move_dest_id = item.move_raw_ids[0].id
                 else:
                     # 从sorted_workorders中找到上一工单的move

From 78eea6aad0a33cc737a338394f66ee9dc9766f8d Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Tue, 24 Dec 2024 14:49:17 +0800
Subject: [PATCH 044/147] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_message/__manifest__.py                    |  2 +-
 sf_message/controllers/main.py                |  6 ---
 sf_message/data/bussiness_node.xml            |  2 +-
 sf_message/data/template_data.xml             |  4 +-
 sf_message/models/__init__.py                 |  1 +
 .../models/sf_message_mrp_production.py       | 32 ++--------------
 .../sf_message_mrp_production_wizard.py       |  2 +-
 sf_message/models/sf_message_product.py       | 38 +++++++++++++++++++
 sf_message/models/sf_message_stock_picking.py |  3 +-
 sf_message/models/sf_message_template.py      |  1 +
 sf_message/models/sf_message_workorder.py     | 17 +++++++++
 11 files changed, 68 insertions(+), 40 deletions(-)
 create mode 100644 sf_message/models/sf_message_product.py

diff --git a/sf_message/__manifest__.py b/sf_message/__manifest__.py
index fcfcba8f..6796a50b 100644
--- a/sf_message/__manifest__.py
+++ b/sf_message/__manifest__.py
@@ -12,7 +12,7 @@
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
     'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock', 'sf_quality', 'mrp',
-                'sf_manufacturing'],
+                'sf_manufacturing','product'],
     'data': [
         'data/bussiness_node.xml',
         'data/cron_data.xml',
diff --git a/sf_message/controllers/main.py b/sf_message/controllers/main.py
index 5b94f50a..dc555dc9 100644
--- a/sf_message/controllers/main.py
+++ b/sf_message/controllers/main.py
@@ -39,12 +39,6 @@ class MessageSfMrsConnect(Sf_Mrs_Connect):
                     _logger.info('无效用刀异常消息推送接口:%s' % ret)
             except Exception as e:
                 _logger.info('无效用刀异常消息推送接口:%s' % e)
-
-            try:
-                productions = request.env['mrp.production'].sudo().search([('id', '=', res.get('production_ids')[0])])
-                productions.add_queue('工单已下发通知')
-            except Exception as e:
-                _logger.info('工单已下发通知异常:%s' % e)
         return json.JSONEncoder().encode(res)
 
     @http.route('/api/maintenance_logs/notify', type='json', auth='public', methods=['GET', 'POST'], csrf=False,
diff --git a/sf_message/data/bussiness_node.xml b/sf_message/data/bussiness_node.xml
index 8a95f525..e7c3b0ba 100644
--- a/sf_message/data/bussiness_node.xml
+++ b/sf_message/data/bussiness_node.xml
@@ -56,7 +56,7 @@
         <!--工单-->
         <record id="bussiness_mrp_workorder_remind" model="jikimo.message.bussiness.node">
             <field name="name">工单已下发通知</field>
-            <field name="model">mrp.production</field>
+            <field name="model">product.product</field>
         </record>
         <!--发货调拨-->
         <record id="production_completed_warehouse_reminder" model="jikimo.message.bussiness.node">
diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml
index e1ba0a93..52b226e3 100644
--- a/sf_message/data/template_data.xml
+++ b/sf_message/data/template_data.xml
@@ -78,8 +78,8 @@
 
         <record id="template_mrp_workorder_remind" model="jikimo.message.template">
             <field name="name">工单已下发通知</field>
-            <field name="model_id" ref="mrp.model_mrp_production"/>
-            <field name="model">mrp.production</field>
+            <field name="model_id" ref="product.model_product_product"/>
+            <field name="model">product.product</field>
             <field name="bussiness_node_id" ref="bussiness_mrp_workorder_remind"/>
             <field name="msgtype">markdown</field>
             <field name="urgency">normal</field>
diff --git a/sf_message/models/__init__.py b/sf_message/models/__init__.py
index 1e659c52..8c215042 100644
--- a/sf_message/models/__init__.py
+++ b/sf_message/models/__init__.py
@@ -12,3 +12,4 @@ from . import sf_message_quality_cnc_test
 from . import sf_message_maintenance_logs
 from . import sf_message_mrp_production_wizard
 from . import sf_message_mrp_production_adjust_wizard
+from . import sf_message_product
diff --git a/sf_message/models/sf_message_mrp_production.py b/sf_message/models/sf_message_mrp_production.py
index d9dd0f1b..260c591c 100644
--- a/sf_message/models/sf_message_mrp_production.py
+++ b/sf_message/models/sf_message_mrp_production.py
@@ -69,25 +69,16 @@ class SFMessageMrpProduction(models.Model):
                                                                                                   url_with_id).replace(
                         '{{num}}', str(stock_picking_num))
                     contents.append(content)
-            if message_queue_id.message_template_id.name == '工单已下发通知':
-                content = message_queue_id.message_template_id.content
-                mrp_production = self.env['mrp.production'].sudo().search([('id', '=', int(message_queue_id.res_id))])
-                production_num = self.env['mrp.production'].sudo().search_count(
-                    [('product_id', '=', mrp_production.product_id.id)])
-                if production_num >= 1:
-                    url = self.get_request_url()
-                    content = content.replace('{{product_id}}', mrp_production.product_id.name).replace(
-                        '{{number}}', str(production_num)).replace(
-                        '{{request_url}}', url)
-                    contents.append(content)
         if unique_products:
+            action_id = self.env.ref('sf_plan.sf_production_plan_action1').id
             unique_products_contents = self.get_production_info(content, unique_products, 'confirmed',
-                                                                'sf_plan.sf_production_plan_action1')
+                                                                action_id)
             contents.extend(unique_products_contents)
         if technology_to_confirmed:
+            action_id = self.env.ref('mrp.mrp_production_action').id
             technology_to_confirmed_contents = self.get_production_info(content, technology_to_confirmed,
                                                                         'technology_to_confirmed',
-                                                                        'mrp.mrp_production_action')
+                                                                        action_id)
             contents.extend(technology_to_confirmed_contents)
         logging.info('生产完工入库提醒: %s' % contents)
         return contents
@@ -100,7 +91,6 @@ class SFMessageMrpProduction(models.Model):
                 [('product_id', '=', products_id), ('state', '=', state)])
             if production_num >= 1:
                 url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-                action_id = self.env.ref(action_id).id
                 url_with_id = f"{url}/web#view_type=list&action={action_id}"
                 new_content = (content.replace('{{name}}', product_name)
                                .replace('{{url}}', url_with_id)
@@ -120,17 +110,3 @@ class SFMessageMrpProduction(models.Model):
         # 拼接URL
         full_url = url + "/web#" + query_string
         return full_url
-
-    def get_request_url(self):
-        url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-        action_id = self.env.ref('sf_message.mrp_workorder_issued_action').id
-        menu_id = self.env.ref('mrp.menu_mrp_root').id
-        active_id = self.env['mrp.workcenter'].sudo().search([('name', '=', '工件装夹中心')]).id
-        # 查询参数
-        params = {'menu_id': menu_id, 'action': action_id, 'model': 'mrp.workorder',
-                  'view_type': 'list', 'active_id': active_id}
-        # 拼接查询参数
-        query_string = urlencode(params)
-        # 拼接URL
-        full_url = url + "/web#" + query_string
-        return full_url
diff --git a/sf_message/models/sf_message_mrp_production_wizard.py b/sf_message/models/sf_message_mrp_production_wizard.py
index 0defae7e..990bdd49 100644
--- a/sf_message/models/sf_message_mrp_production_wizard.py
+++ b/sf_message/models/sf_message_mrp_production_wizard.py
@@ -11,7 +11,7 @@ class SFMessageMrpProductionWizard(models.TransientModel):
         productions = super(SFMessageMrpProductionWizard, self).confirm()
         try:
             for production_info in self.production_id:
-                if production_info.state == 'confirmed':
+                if production_info.state == 'confirmed' and production_info.product_id.categ_id.type == '成品':
                     production_info.add_queue('待排程')
             for production_id in productions:
                 workorder_ids = production_id.workorder_ids.filtered(
diff --git a/sf_message/models/sf_message_product.py b/sf_message/models/sf_message_product.py
new file mode 100644
index 00000000..4f983e49
--- /dev/null
+++ b/sf_message/models/sf_message_product.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api, _
+from urllib.parse import urlencode
+
+
+class SFMessagePlan(models.Model):
+    _name = 'product.product'
+    _inherit = ['product.product', 'jikimo.message.dispatch']
+
+    def _get_message(self, message_queue_ids):
+        contents = []
+        for message_queue_id in message_queue_ids:
+            if message_queue_id.message_template_id.name == '工单已下发通知':
+                content = message_queue_id.message_template_id.content
+                product_product = self.env['product.product'].sudo().search([('id', '=', int(message_queue_id.res_id))])
+                production_num = self.env['mrp.production'].sudo().search_count(
+                    [('product_id', '=', product_product.id)])
+                if production_num >= 1:
+                    url = self.get_request_url()
+                    content = content.replace('{{product_id}}', product_product.name).replace(
+                        '{{number}}', str(production_num)).replace(
+                        '{{request_url}}', url)
+                    contents.append(content)
+        return contents
+
+    def get_request_url(self):
+        url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+        action_id = self.env.ref('sf_message.mrp_workorder_issued_action').id
+        menu_id = self.env.ref('mrp.menu_mrp_root').id
+        active_id = self.env['mrp.workcenter'].sudo().search([('name', '=', '工件装夹中心')]).id
+        # 查询参数
+        params = {'menu_id': menu_id, 'action': action_id, 'model': 'mrp.workorder',
+                  'view_type': 'list', 'active_id': active_id}
+        # 拼接查询参数
+        query_string = urlencode(params)
+        # 拼接URL
+        full_url = url + "/web#" + query_string
+        return full_url
diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py
index 5d15d34a..05bd6f3e 100644
--- a/sf_message/models/sf_message_stock_picking.py
+++ b/sf_message/models/sf_message_stock_picking.py
@@ -25,7 +25,8 @@ class SFMessageStockPicking(models.Model):
         super(SFMessageStockPicking, self)._compute_state()
         try:
             for record in self:
-                if record.state == 'assigned' and record.picking_type_id.sequence_code == 'PC':
+                if (record.state == 'assigned' and record.picking_type_id.sequence_code == 'PC'
+                        and record.product_id.categ_id.type == '坯料'):
                     record.add_queue('坯料发料提醒')
 
                 if record.picking_type_id.sequence_code == 'SFP' and record.state == 'done':
diff --git a/sf_message/models/sf_message_template.py b/sf_message/models/sf_message_template.py
index 87328849..d97c5467 100644
--- a/sf_message/models/sf_message_template.py
+++ b/sf_message/models/sf_message_template.py
@@ -17,4 +17,5 @@ class SfMessageTemplate(models.Model):
         res.append('sf.maintenance.logs')
         res.append('quality.cnc.test')
         res.append('mrp.production')
+        res.append('product.product')
         return res
diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py
index c604534d..ee8f6c00 100644
--- a/sf_message/models/sf_message_workorder.py
+++ b/sf_message/models/sf_message_workorder.py
@@ -12,6 +12,23 @@ class SFMessageWork(models.Model):
     _name = 'mrp.workorder'
     _inherit = ['mrp.workorder', 'jikimo.message.dispatch']
 
+    @api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state',
+                 'production_id.tool_state', 'production_id.schedule_state', 'sequence',
+                 'production_id.programming_state')
+    def _compute_state(self):
+        super(SFMessageWork, self)._compute_state()
+        for workorder in self:
+            work_ids = workorder.production_id.workorder_ids.filtered(lambda w: w.routing_type == '装夹预调')
+            if work_ids:
+                min_sequence_wk = work_ids.sorted(key=lambda w: w.sequence)[0]
+                if workorder.state == 'ready' and workorder.routing_type == '装夹预调' and workorder.id == min_sequence_wk.id:
+                    message_template = self.env["jikimo.message.template"].sudo().search([("name", "=", '工单已下发通知')], limit=1)
+                    jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
+                        [('res_id', '=', workorder.production_id.product_id.id), ("message_status", "in", ("pending", "sent")),
+                         ('message_template_id', '=', message_template.id)])
+                    if not jikimo_message_queue:
+                        workorder.production_id.product_id.add_queue('工单已下发通知')
+
     def _get_message(self, message_queue_ids):
         contents = []
         bussiness_node = None

From c2d346282c07c065651edc8d00ed91916d6bbaf5 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 24 Dec 2024 16:47:10 +0800
Subject: [PATCH 045/147] =?UTF-8?q?1=E3=80=81=E5=88=B6=E9=80=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=9A=90=E8=97=8F=E4=B8=8D=E5=BF=85=E7=9A=84=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE=E3=80=81=E6=B7=BB=E5=8A=A0=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE=E7=9A=84=E9=9A=90=E8=97=8F=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=9B2=E3=80=81=E6=B7=BB=E5=8A=A0=E8=BF=94?=
 =?UTF-8?q?=E5=B7=A5=E5=AE=8C=E6=88=90=E5=90=8E=E5=88=B6=E9=80=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E7=BD=AE=E4=B8=BA=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mrp_production_addional_change.xml   | 18 ++++--------------
 sf_manufacturing/wizard/rework_wizard.py       |  2 ++
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 567930dd..8a44b621 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -131,11 +131,6 @@
                     <field name="deadline_of_delivery" readonly="1"/>
                     <field name="tool_state_remark2" invisible="1"/>
                 </xpath>
-                <xpath expr="//header//button[@name='action_cancel']" position="replace">
-                    <button name="action_cancel" type="object" string="取消" data-hotkey="z"
-                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', True)]}"
-                            groups="sf_base.group_sf_mrp_user"/>
-                </xpath>
                 <xpath expr="(//header//button[@name='button_mark_done'])[1]" position="replace">
                     <button name="button_mark_done"
                             attrs="{'invisible': ['|', '|', ('state', 'in', ('draft', 'cancel', 'done', 'to_close')), ('qty_producing', '=', 0), ('move_raw_ids', '!=', [])]}"
@@ -260,13 +255,6 @@
                             type="object" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
-                <xpath expr="//header//button[@name='action_cancel']" position="replace">
-                    <button name="action_cancel" type="object" string="Cancel" data-hotkey="z"
-                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', False)]}"
-                            confirm="Some product moves have already been confirmed, this manufacturing order can't be completely cancelled. Are you still sure you want to process ?"
-                            groups="sf_base.group_sf_mrp_user"/>
-                </xpath>
-
                 <xpath expr="//header//button[@name='button_unbuild']" position="replace">
                     <button name="button_unbuild" type="object" string="拆单"
                             attrs="{'invisible': [('state', '!=', 'done')]}" data-hotkey="shift+v"
@@ -310,12 +298,14 @@
                             type="object" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
-                <xpath expr="//header//button[@name='action_cancel']" position="replace">
+                <xpath expr="//header//button[@name='action_cancel'][2]" position="replace">
                     <button name="action_cancel" type="object" string="取消" data-hotkey="z"
-                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', False)]}"
+                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'rework', 'cancel')), ('confirm_cancel', '=', False)]}"
                             confirm="Some product moves have already been confirmed, this manufacturing order can't be completely cancelled. Are you still sure you want to process ?"
                             groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
+                <xpath expr="//header//button[@name='action_cancel'][1]" position="replace"></xpath>
+
                 <xpath expr="//header//button[@name='button_unbuild']" position="replace">
                     <button name="button_unbuild" type="object" string="拆单"
                             attrs="{'invisible': [('state', '!=', 'done')]}" data-hotkey="shift+v"
diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py
index fcafd490..148967be 100644
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -287,6 +287,8 @@ class ReworkWizard(models.TransientModel):
                     self.production_id.update_programming_state()
                     self.production_id.write(
                         {'programming_state': '编程中', 'work_state': '编程中', 'state': 'progress'})
+                # ================= 返工完成，制造订单状态置为加工中 ==============
+                self.production_id.write({'state': 'progress', 'is_rework': False})
 
     @api.onchange('production_id')
     def onchange_processing_panel_id(self):

From ed3feaf2a0a208a3e40b89a6627876ae5133e6a0 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 24 Dec 2024 17:17:53 +0800
Subject: [PATCH 046/147] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 8c2ffada..66ab3183 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -381,6 +381,10 @@ class MrpProduction(models.Model):
             # 如果制造订单的功能刀具为【无效刀】则制造订单状态改为返工
             if production.tool_state == '2':
                 production.state = 'rework'
+            if all(wo_state in ('done', 'rework', 'cancel') for wo_state in production.workorder_ids.mapped('state')):
+                if production.state not in ['scrap', 'rework']:
+                    production.state = 'done'
+
 
     # 退回调整
     def technology_back_adjust(self):

From aaf3b20e65572d7d54573e8e9e68c3d439f5acff Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 24 Dec 2024 17:27:08 +0800
Subject: [PATCH 047/147] =?UTF-8?q?=E8=AF=A2=E4=BB=B7=E5=8D=95=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=8E=92=E7=89=88=E5=8F=8A=E5=A2=9E=E5=8A=A0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/__init__.py   |  4 ++
 .../__manifest__.py                           | 35 +++++++++++
 .../controllers/__init__.py                   |  3 +
 .../controllers/controllers.py                | 21 +++++++
 jikimo_purchase_tier_validation/demo/demo.xml | 30 ++++++++++
 .../models/__init__.py                        |  3 +
 .../models/models.py                          | 19 ++++++
 .../security/ir.model.access.csv              |  2 +
 .../views/templates.xml                       | 24 ++++++++
 .../views/views.xml                           | 60 +++++++++++++++++++
 sf_sale/models/sale_order.py                  |  5 ++
 sf_sale/views/purchase_order_view.xml         | 59 +++++++++++++++---
 12 files changed, 258 insertions(+), 7 deletions(-)
 create mode 100644 jikimo_purchase_tier_validation/__init__.py
 create mode 100644 jikimo_purchase_tier_validation/__manifest__.py
 create mode 100644 jikimo_purchase_tier_validation/controllers/__init__.py
 create mode 100644 jikimo_purchase_tier_validation/controllers/controllers.py
 create mode 100644 jikimo_purchase_tier_validation/demo/demo.xml
 create mode 100644 jikimo_purchase_tier_validation/models/__init__.py
 create mode 100644 jikimo_purchase_tier_validation/models/models.py
 create mode 100644 jikimo_purchase_tier_validation/security/ir.model.access.csv
 create mode 100644 jikimo_purchase_tier_validation/views/templates.xml
 create mode 100644 jikimo_purchase_tier_validation/views/views.xml

diff --git a/jikimo_purchase_tier_validation/__init__.py b/jikimo_purchase_tier_validation/__init__.py
new file mode 100644
index 00000000..511a0ca3
--- /dev/null
+++ b/jikimo_purchase_tier_validation/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import controllers
+from . import models
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/__manifest__.py b/jikimo_purchase_tier_validation/__manifest__.py
new file mode 100644
index 00000000..99945b9e
--- /dev/null
+++ b/jikimo_purchase_tier_validation/__manifest__.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "机企猫 采购审批流程",
+
+    'summary': """
+        Short (1 phrase/line) summary of the module's purpose, used as
+        subtitle on modules listing or apps.openerp.com""",
+
+    'description': """
+        Long description of module's purpose
+    """,
+
+    'author': "My Company",
+    'website': "https://www.yourcompany.com",
+
+    # Categories can be used to filter modules in modules listing
+    # Check https://github.com/odoo/odoo/blob/16.0/odoo/addons/base/data/ir_module_category_data.xml
+    # for the full list
+    'category': 'Uncategorized',
+    'version': '0.1',
+
+    # any module necessary for this one to work correctly
+    'depends': ['purchase', 'base_tier_validation'],
+
+    # always loaded
+    'data': [
+        # 'security/ir.model.access.csv',
+        'views/views.xml',
+        'views/templates.xml',
+    ],
+    # only loaded in demonstration mode
+    'demo': [
+        'demo/demo.xml',
+    ],
+}
diff --git a/jikimo_purchase_tier_validation/controllers/__init__.py b/jikimo_purchase_tier_validation/controllers/__init__.py
new file mode 100644
index 00000000..457bae27
--- /dev/null
+++ b/jikimo_purchase_tier_validation/controllers/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import controllers
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/controllers/controllers.py b/jikimo_purchase_tier_validation/controllers/controllers.py
new file mode 100644
index 00000000..6bbe5e40
--- /dev/null
+++ b/jikimo_purchase_tier_validation/controllers/controllers.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# from odoo import http
+
+
+# class JikimoPurchaseTierValidation(http.Controller):
+#     @http.route('/jikimo_purchase_tier_validation/jikimo_purchase_tier_validation', auth='public')
+#     def index(self, **kw):
+#         return "Hello, world"
+
+#     @http.route('/jikimo_purchase_tier_validation/jikimo_purchase_tier_validation/objects', auth='public')
+#     def list(self, **kw):
+#         return http.request.render('jikimo_purchase_tier_validation.listing', {
+#             'root': '/jikimo_purchase_tier_validation/jikimo_purchase_tier_validation',
+#             'objects': http.request.env['jikimo_purchase_tier_validation.jikimo_purchase_tier_validation'].search([]),
+#         })
+
+#     @http.route('/jikimo_purchase_tier_validation/jikimo_purchase_tier_validation/objects/<model("jikimo_purchase_tier_validation.jikimo_purchase_tier_validation"):obj>', auth='public')
+#     def object(self, obj, **kw):
+#         return http.request.render('jikimo_purchase_tier_validation.object', {
+#             'object': obj
+#         })
diff --git a/jikimo_purchase_tier_validation/demo/demo.xml b/jikimo_purchase_tier_validation/demo/demo.xml
new file mode 100644
index 00000000..cbba42ce
--- /dev/null
+++ b/jikimo_purchase_tier_validation/demo/demo.xml
@@ -0,0 +1,30 @@
+<odoo>
+    <data>
+<!--
+          <record id="object0" model="jikimo_purchase_tier_validation.jikimo_purchase_tier_validation">
+            <field name="name">Object 0</field>
+            <field name="value">0</field>
+          </record>
+
+          <record id="object1" model="jikimo_purchase_tier_validation.jikimo_purchase_tier_validation">
+            <field name="name">Object 1</field>
+            <field name="value">10</field>
+          </record>
+
+          <record id="object2" model="jikimo_purchase_tier_validation.jikimo_purchase_tier_validation">
+            <field name="name">Object 2</field>
+            <field name="value">20</field>
+          </record>
+
+          <record id="object3" model="jikimo_purchase_tier_validation.jikimo_purchase_tier_validation">
+            <field name="name">Object 3</field>
+            <field name="value">30</field>
+          </record>
+
+          <record id="object4" model="jikimo_purchase_tier_validation.jikimo_purchase_tier_validation">
+            <field name="name">Object 4</field>
+            <field name="value">40</field>
+          </record>
+-->
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/models/__init__.py b/jikimo_purchase_tier_validation/models/__init__.py
new file mode 100644
index 00000000..5305644d
--- /dev/null
+++ b/jikimo_purchase_tier_validation/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
new file mode 100644
index 00000000..bb61cd5b
--- /dev/null
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -0,0 +1,19 @@
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+
+class jikimo_purchase_tier_validation(models.Model):
+    _name = 'purchase.order'
+    _inherit = ['purchase.order', 'tier.validation']
+
+    def request_validation(self):
+        for record in self:
+            missing_fields = []
+            if not record.partner_ref:
+                missing_fields.append('合同名称')
+            if not record.contract_number:
+                missing_fields.append('合同编号')
+            
+            if missing_fields:
+                raise ValidationError(_('如下字段要求必须填写：%s') % '、'.join(missing_fields))
+                
+        return super(jikimo_purchase_tier_validation, self).request_validation()
diff --git a/jikimo_purchase_tier_validation/security/ir.model.access.csv b/jikimo_purchase_tier_validation/security/ir.model.access.csv
new file mode 100644
index 00000000..ccd753fc
--- /dev/null
+++ b/jikimo_purchase_tier_validation/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_jikimo_purchase_tier_validation_jikimo_purchase_tier_validation,jikimo_purchase_tier_validation.jikimo_purchase_tier_validation,model_jikimo_purchase_tier_validation_jikimo_purchase_tier_validation,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/views/templates.xml b/jikimo_purchase_tier_validation/views/templates.xml
new file mode 100644
index 00000000..cea6b39a
--- /dev/null
+++ b/jikimo_purchase_tier_validation/views/templates.xml
@@ -0,0 +1,24 @@
+<odoo>
+    <data>
+<!--
+        <template id="listing">
+          <ul>
+            <li t-foreach="objects" t-as="object">
+              <a t-attf-href="#{ root }/objects/#{ object.id }">
+                <t t-esc="object.display_name"/>
+              </a>
+            </li>
+          </ul>
+        </template>
+        <template id="object">
+          <h1><t t-esc="object.display_name"/></h1>
+          <dl>
+            <t t-foreach="object._fields" t-as="field">
+              <dt><t t-esc="field"/></dt>
+              <dd><t t-esc="object[field]"/></dd>
+            </t>
+          </dl>
+        </template>
+-->
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/views/views.xml b/jikimo_purchase_tier_validation/views/views.xml
new file mode 100644
index 00000000..5c87a811
--- /dev/null
+++ b/jikimo_purchase_tier_validation/views/views.xml
@@ -0,0 +1,60 @@
+<odoo>
+  <data>
+    <!-- explicit list view definition -->
+<!--
+    <record model="ir.ui.view" id="jikimo_purchase_tier_validation.list">
+      <field name="name">jikimo_purchase_tier_validation list</field>
+      <field name="model">jikimo_purchase_tier_validation.jikimo_purchase_tier_validation</field>
+      <field name="arch" type="xml">
+        <tree>
+          <field name="name"/>
+          <field name="value"/>
+          <field name="value2"/>
+        </tree>
+      </field>
+    </record>
+-->
+
+    <!-- actions opening views on models -->
+<!--
+    <record model="ir.actions.act_window" id="jikimo_purchase_tier_validation.action_window">
+      <field name="name">jikimo_purchase_tier_validation window</field>
+      <field name="res_model">jikimo_purchase_tier_validation.jikimo_purchase_tier_validation</field>
+      <field name="view_mode">tree,form</field>
+    </record>
+-->
+
+    <!-- server action to the one above -->
+<!--
+    <record model="ir.actions.server" id="jikimo_purchase_tier_validation.action_server">
+      <field name="name">jikimo_purchase_tier_validation server</field>
+      <field name="model_id" ref="model_jikimo_purchase_tier_validation_jikimo_purchase_tier_validation"/>
+      <field name="state">code</field>
+      <field name="code">
+        action = {
+          "type": "ir.actions.act_window",
+          "view_mode": "tree,form",
+          "res_model": model._name,
+        }
+      </field>
+    </record>
+-->
+
+    <!-- Top menu item -->
+<!--
+    <menuitem name="jikimo_purchase_tier_validation" id="jikimo_purchase_tier_validation.menu_root"/>
+-->
+    <!-- menu categories -->
+<!--
+    <menuitem name="Menu 1" id="jikimo_purchase_tier_validation.menu_1" parent="jikimo_purchase_tier_validation.menu_root"/>
+    <menuitem name="Menu 2" id="jikimo_purchase_tier_validation.menu_2" parent="jikimo_purchase_tier_validation.menu_root"/>
+-->
+    <!-- actions -->
+<!--
+    <menuitem name="List" id="jikimo_purchase_tier_validation.menu_1_list" parent="jikimo_purchase_tier_validation.menu_1"
+              action="jikimo_purchase_tier_validation.action_window"/>
+    <menuitem name="Server to list" id="jikimo_purchase_tier_validation" parent="jikimo_purchase_tier_validation.menu_2"
+              action="jikimo_purchase_tier_validation.action_server"/>
+-->
+  </data>
+</odoo>
\ No newline at end of file
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 2958ce00..8717fe13 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -287,6 +287,11 @@ class RePurchaseOrder(models.Model):
 
     origin_sale_id = fields.Many2one('sale.order', string='销售订单号', compute='_compute_origin_sale_id')
 
+    # 合同编号
+    contract_number = fields.Char(string='合同编号', size=20)
+    # 合同概况
+    contract_summary = fields.Text(string='合同概况')
+
     @api.depends('origin')
     def _compute_purchase_type(self):
         for purchase in self:
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index be35d8a2..bce50f1f 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -36,7 +36,7 @@
                     <field name="partner_id" widget="res_partner_many2one" context="{'is_supplier': True }"/>
                 </field>
                 <field name="currency_id" position="after">
-                    <field name="remark" attrs="{'readonly': [('state', 'in', ['purchase'])]}"/>
+                    <field name="remark" attrs="{'readonly': [('state', 'in', ['purchase'])]}" string="订单备注"/>
                 </field>
                 <xpath expr="//form/header/button[@name='button_confirm'][2]" position="replace">
                     <button name="button_confirm" type="object" context="{'validate_analytic': True}"
@@ -139,7 +139,14 @@
 <!--                    <field name="part_number" optional="show"/>-->
                 </xpath>
                 <xpath expr="//field[@name='date_order']" position="attributes">
-                    <attribute name="string">报价截止日期</attribute>
+                    <attribute name="string">签约日期</attribute>
+                </xpath>
+                <field name="payment_term_id" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </field>
+                <xpath expr="//field[@name='date_order']" position="after">
+                    <field name="payment_term_id" attrs="{'readonly': ['|', ('invoice_status','=', 'invoiced'), ('state', '=', 'done')]}" options="{'no_create': True}"/>
+                    <field name="contract_summary"/>
                 </xpath>
                 <field name="partner_ref" position="attributes">
                     <attribute name="attrs">{'readonly': [('state', 'in', ['purchase'])]}
@@ -171,13 +178,49 @@
                 </field>
 
                 <!--                 添加采购类型字段 -->
-                <field name="partner_ref" position="after">
+                <field name="partner_id" position="after">
                     <field name="purchase_type" string="采购类型" readonly="1"/>
+                    <field name="picking_type_id" string="作业类型" domain="[('code','=','incoming'), '|', ('warehouse_id', '=', False), ('warehouse_id.company_id', '=', company_id)]" options="{'no_create': True}" groups="stock.group_stock_multi_locations"/>
+                    <label for="date_planned" string="最近交货日期"/>
+                    <div name="date_planned_div" class="o_row">
+                        <field name="date_planned" attrs="{'readonly': [('state', 'not in', ('draft', 'sent', 'to approve', 'purchase'))]}"/>
+                        <field name="mail_reminder_confirmed" invisible="1"/>
+                        <span class="text-muted" attrs="{'invisible': [('mail_reminder_confirmed', '=', False)]}">(confirmed by vendor)</span>
+                    </div>
+                    <field name="effective_date" attrs="{'invisible': [('effective_date', '=', False)]}" string="到货时间"/>
                 </field>
+                <field name="partner_ref" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </field>
+                <xpath expr="//sheet/group/group[2]/field[1]" position="before">
+                    <field name="partner_ref" string="合同名称"/>
+                    <field name="contract_number"/>
+                </xpath>
                 <!--                添加销售订单号字段-->
-                <field name="effective_date" position="after">
-                    <field name="origin_sale_id" readonly="1" attrs="{'invisible': [('origin_sale_id', '=', False)]}"/>
-                </field>
+                <xpath expr="//sheet/group/group[2]/div[@name='date_approve']" position="after">
+<!--                     <field name="origin_sale_id" readonly="1" attrs="{'invisible': [('origin_sale_id', '=', False)]}" string="参考销售订单"/> -->
+                    <field name="origin_sale_id" readonly="1" string="参考销售订单"/>
+                </xpath>
+                <xpath expr="//sheet/group/group[2]/field[@name='effective_date']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+
+                <!-- 隐藏 label -->
+                <xpath expr="//label[@for='receipt_reminder_email']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+
+                <!-- 隐藏整个 reminder div -->
+                <xpath expr="//div[@name='reminder']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <!-- 使用更精确的路径定位原始元素 -->
+                <xpath expr="//sheet/group/group[2]/label[@for='date_planned']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath expr="//sheet/group/group[2]/div[@name='date_planned_div']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
             </field>
         </record>
 
@@ -196,7 +239,7 @@
                     <attribute name="optional">hide</attribute>
                 </xpath>
                 <xpath expr="//field[@name='date_order']" position="attributes">
-                    <attribute name="string">报价截止日期</attribute>
+                    <attribute name="string">签约日期</attribute>
                     <attribute name="widget">''</attribute>
                 </xpath>
                 <xpath expr="//field[@name='date_order']" position="after">
@@ -224,6 +267,8 @@
                     <attribute name="attrs">{'readonly': [('state', 'in', ['purchase'])]}
                     </attribute>
                 </field>
+                <xpath expr="//field[@name='picking_type_id'][1]" position="replace">
+                </xpath>
             </field>
         </record>
 

From 5a1ebabc872a5d19ced1213bc87d927ef94b50eb Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 25 Dec 2024 09:41:07 +0800
Subject: [PATCH 048/147] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=97=B6=EF=BC=8C=E5=88=B6=E9=80=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=B0=B1=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90=E7=9A=84?=
 =?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_production.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 66ab3183..66d0a678 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -381,7 +381,7 @@ class MrpProduction(models.Model):
             # 如果制造订单的功能刀具为【无效刀】则制造订单状态改为返工
             if production.tool_state == '2':
                 production.state = 'rework'
-            if all(wo_state in ('done', 'rework', 'cancel') for wo_state in production.workorder_ids.mapped('state')):
+            if production.workorder_ids and all(wo_state in ('done', 'rework', 'cancel') for wo_state in production.workorder_ids.mapped('state')):
                 if production.state not in ['scrap', 'rework']:
                     production.state = 'done'
 

From 32fb6eadbc6672caa773965f697b48727122447a Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 25 Dec 2024 09:43:04 +0800
Subject: [PATCH 049/147] 1

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

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 66d0a678..a7e9398c 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -382,7 +382,7 @@ class MrpProduction(models.Model):
             if production.tool_state == '2':
                 production.state = 'rework'
             if production.workorder_ids and all(wo_state in ('done', 'rework', 'cancel') for wo_state in production.workorder_ids.mapped('state')):
-                if production.state not in ['scrap', 'rework']:
+                if production.state not in ['scrap', 'rework', 'cancel']:
                     production.state = 'done'
 
 

From 099188849449cde94d4a9f84d0ee661621727367 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 25 Dec 2024 11:02:00 +0800
Subject: [PATCH 050/147] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/__init__.py   |   3 +-
 .../__manifest__.py                           |   7 +-
 .../data/documents_data.xml                   |  11 ++
 .../models/models.py                          |  43 +++++++-
 .../security/ir.model.access.csv              |   2 +-
 .../views/views.xml                           |  28 +++--
 .../wizards/__init__.py                       |   1 +
 .../wizards/upload_file_wizard.py             | 103 ++++++++++++++++++
 .../wizards/upload_file_wizard_view.xml       |  21 ++++
 9 files changed, 197 insertions(+), 22 deletions(-)
 create mode 100644 jikimo_purchase_tier_validation/data/documents_data.xml
 create mode 100644 jikimo_purchase_tier_validation/wizards/__init__.py
 create mode 100644 jikimo_purchase_tier_validation/wizards/upload_file_wizard.py
 create mode 100644 jikimo_purchase_tier_validation/wizards/upload_file_wizard_view.xml

diff --git a/jikimo_purchase_tier_validation/__init__.py b/jikimo_purchase_tier_validation/__init__.py
index 511a0ca3..40c32597 100644
--- a/jikimo_purchase_tier_validation/__init__.py
+++ b/jikimo_purchase_tier_validation/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 
 from . import controllers
-from . import models
\ No newline at end of file
+from . import models
+from . import wizards
diff --git a/jikimo_purchase_tier_validation/__manifest__.py b/jikimo_purchase_tier_validation/__manifest__.py
index 99945b9e..2c59b177 100644
--- a/jikimo_purchase_tier_validation/__manifest__.py
+++ b/jikimo_purchase_tier_validation/__manifest__.py
@@ -20,13 +20,14 @@
     'version': '0.1',
 
     # any module necessary for this one to work correctly
-    'depends': ['purchase', 'base_tier_validation'],
+    'depends': ['purchase', 'base_tier_validation', 'documents'],
 
     # always loaded
     'data': [
-        # 'security/ir.model.access.csv',
+        'security/ir.model.access.csv',
+        'data/documents_data.xml',
+        'wizards/upload_file_wizard_view.xml',
         'views/views.xml',
-        'views/templates.xml',
     ],
     # only loaded in demonstration mode
     'demo': [
diff --git a/jikimo_purchase_tier_validation/data/documents_data.xml b/jikimo_purchase_tier_validation/data/documents_data.xml
new file mode 100644
index 00000000..990a6418
--- /dev/null
+++ b/jikimo_purchase_tier_validation/data/documents_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <!-- 创建采购合同文件夹 -->
+        <record id="documents_purchase_contracts_folder" model="documents.folder">
+            <field name="name">采购合同</field>
+            <field name="description">存放采购合同相关文件</field>
+            <field name="sequence">10</field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index bb61cd5b..f69859c1 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -1,6 +1,7 @@
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 
+
 class jikimo_purchase_tier_validation(models.Model):
     _name = 'purchase.order'
     _inherit = ['purchase.order', 'tier.validation']
@@ -12,8 +13,46 @@ class jikimo_purchase_tier_validation(models.Model):
                 missing_fields.append('合同名称')
             if not record.contract_number:
                 missing_fields.append('合同编号')
-            
+
             if missing_fields:
                 raise ValidationError(_('如下字段要求必须填写：%s') % '、'.join(missing_fields))
-                
+
         return super(jikimo_purchase_tier_validation, self).request_validation()
+
+    # 上传合同文件
+    def upload_contract_file(self):
+        print('upload_contract_file===========================')
+        # self.ensure_one()
+        # return {
+        #     'name': _('上传合同文件'),
+        #     'type': 'ir.actions.act_window',
+        #     'res_model': 'ir.attachment',
+        #     'view_mode': 'form',
+        #     'view_type': 'form',
+        #     'target': 'new',
+        #     'context': {
+        #         'default_res_model': self._name,
+        #         'default_res_id': self.id,
+        #         'default_type': 'binary',
+        #         'default_mimetype': 'application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,image/jpeg,image/png',
+        #     }
+        # }
+
+        self.ensure_one()
+        action = {
+            'type': 'ir.actions.act_window',
+            'name': _('上传合同文件'),
+            'res_model': 'ir.attachment.wizard',  # 我们需要创建一个新的向导模型
+            'view_mode': 'form',
+            'target': 'new',
+            'context': {
+                'default_res_model': self._name,
+                'default_res_id': self.id,
+            }
+        }
+        return action
+
+    # 删除合同文件
+    def delete_contract_file(self):
+        print('delete_contract_file============================')
+        pass
diff --git a/jikimo_purchase_tier_validation/security/ir.model.access.csv b/jikimo_purchase_tier_validation/security/ir.model.access.csv
index ccd753fc..09ba96bc 100644
--- a/jikimo_purchase_tier_validation/security/ir.model.access.csv
+++ b/jikimo_purchase_tier_validation/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_jikimo_purchase_tier_validation_jikimo_purchase_tier_validation,jikimo_purchase_tier_validation.jikimo_purchase_tier_validation,model_jikimo_purchase_tier_validation_jikimo_purchase_tier_validation,base.group_user,1,1,1,1
\ No newline at end of file
+access_ir_attachment_wizard,ir.attachment.wizard,model_ir_attachment_wizard,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/views/views.xml b/jikimo_purchase_tier_validation/views/views.xml
index 5c87a811..0fee7710 100644
--- a/jikimo_purchase_tier_validation/views/views.xml
+++ b/jikimo_purchase_tier_validation/views/views.xml
@@ -1,19 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-  <data>
-    <!-- explicit list view definition -->
-<!--
-    <record model="ir.ui.view" id="jikimo_purchase_tier_validation.list">
-      <field name="name">jikimo_purchase_tier_validation list</field>
-      <field name="model">jikimo_purchase_tier_validation.jikimo_purchase_tier_validation</field>
-      <field name="arch" type="xml">
-        <tree>
-          <field name="name"/>
-          <field name="value"/>
-          <field name="value2"/>
-        </tree>
-      </field>
-    </record>
--->
+    <data>
+        <record model="ir.ui.view" id="tier_validation_view_purchase_order_form_inherit">
+            <field name="name">tier_validation_view_purchase_order_form_inherit</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//header" position="inside">
+                    <button name="upload_contract_file" string="上传合同" type="object" class="oe_highlight"/>
+                    <button name="delete_contract_file" string="删除合同" type="object" class="oe_highlight"/>
+                </xpath>
+            </field>
+        </record>
 
     <!-- actions opening views on models -->
 <!--
diff --git a/jikimo_purchase_tier_validation/wizards/__init__.py b/jikimo_purchase_tier_validation/wizards/__init__.py
new file mode 100644
index 00000000..e134fb87
--- /dev/null
+++ b/jikimo_purchase_tier_validation/wizards/__init__.py
@@ -0,0 +1 @@
+from . import upload_file_wizard
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/wizards/upload_file_wizard.py b/jikimo_purchase_tier_validation/wizards/upload_file_wizard.py
new file mode 100644
index 00000000..595f0cb7
--- /dev/null
+++ b/jikimo_purchase_tier_validation/wizards/upload_file_wizard.py
@@ -0,0 +1,103 @@
+from odoo import models, fields, api, _
+
+
+class IrAttachmentWizard(models.TransientModel):
+    _name = 'ir.attachment.wizard'
+    _description = '文件上传向导'
+
+    attachment = fields.Binary(string='选择文件', required=True)
+    filename = fields.Char(string='文件名')
+    res_model = fields.Char()
+    res_id = fields.Integer()
+
+    # def action_upload_file(self):
+    #     self.ensure_one()
+    #     # 首先创建 ir.attachment
+    #     attachment = self.env['ir.attachment'].create({
+    #         'name': self.filename,
+    #         'type': 'binary',
+    #         'datas': self.attachment,
+    #         'res_model': self.res_model,
+    #         'res_id': self.res_id,
+    #     })
+    #
+    #     # 获取默认的文档文件夹
+    #     workspace = self.env['documents.folder'].search([('name', '=', '采购合同')], limit=1)
+    #
+    #     # 创建 documents.document 记录
+    #     document = self.env['documents.document'].create({
+    #         'name': self.filename,
+    #         'attachment_id': attachment.id,
+    #         'folder_id': workspace.id,
+    #         'res_model': self.res_model,
+    #         'res_id': self.res_id,
+    #     })
+    #
+    #     return {
+    #         'type': 'ir.actions.client',
+    #         'tag': 'display_notification',
+    #         'params': {
+    #             'title': _('成功'),
+    #             'message': _('文件上传成功'),
+    #             'type': 'success',
+    #         }
+    #     }
+
+    def action_upload_file(self):
+        self.ensure_one()
+        # 首先创建 ir.attachment
+        attachment = self.env['ir.attachment'].create({
+            'name': self.filename,
+            'type': 'binary',
+            'datas': self.attachment,
+            'res_model': self.res_model,
+            'res_id': self.res_id,
+        })
+
+        # 获取默认的文档文件夹
+        workspace = self.env['documents.folder'].search([('name', '=', '采购合同')], limit=1)
+
+        # 创建 documents.document 记录
+        document = self.env['documents.document'].create({
+            'name': self.filename,
+            'attachment_id': attachment.id,
+            'folder_id': workspace.id,
+            'res_model': self.res_model,
+            'res_id': self.res_id,
+        })
+
+        # 显示成功消息并关闭向导
+        message = {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': _('成功'),
+                'message': _('文件上传成功'),
+                'type': 'success',
+                'sticky': False,  # 自动消失
+                'next': {
+                    'type': 'ir.actions.act_window_close'
+                }
+            }
+        }
+        return message
+
+
+    # def action_upload_file(self):
+    #     self.ensure_one()
+    #     attachment = self.env['ir.attachment'].create({
+    #         'name': self.filename,
+    #         'type': 'binary',
+    #         'datas': self.attachment,
+    #         'res_model': self.res_model,
+    #         'res_id': self.res_id,
+    #     })
+    #     return {
+    #         'type': 'ir.actions.client',
+    #         'tag': 'display_notification',
+    #         'params': {
+    #             'title': _('成功'),
+    #             'message': _('文件上传成功'),
+    #             'type': 'success',
+    #         }
+    #     }
diff --git a/jikimo_purchase_tier_validation/wizards/upload_file_wizard_view.xml b/jikimo_purchase_tier_validation/wizards/upload_file_wizard_view.xml
new file mode 100644
index 00000000..15bc1023
--- /dev/null
+++ b/jikimo_purchase_tier_validation/wizards/upload_file_wizard_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_upload_file_wizard_form" model="ir.ui.view">
+        <field name="name">ir.attachment.wizard.form</field>
+        <field name="model">ir.attachment.wizard</field>
+        <field name="arch" type="xml">
+            <form string="上传文件">
+                <group>
+                    <field name="attachment" widget="binary" filename="filename" options="{'accepted_file_extensions': '.pdf,.doc,.docx,.jpg,.jpeg,.png'}"/>
+                    <field name="filename" invisible="1"/>
+                    <field name="res_model" invisible="1"/>
+                    <field name="res_id" invisible="1"/>
+                </group>
+                <footer>
+                    <button name="action_upload_file" string="上传" type="object" class="btn-primary"/>
+                    <button string="取消" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file

From d82cb1e64c14cc9fe662352aa2fc6ea2a2739f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Wed, 25 Dec 2024 11:31:27 +0800
Subject: [PATCH 051/147] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=8B=E5=B7=A5?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=A1=A8=E9=9D=A2=E5=B7=A5=E8=89=BA=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=8D=95=E7=94=B1=E4=BA=8E=E6=B2=A1=E6=9C=89=E6=BA=90?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 2e99de70..aa8d36b8 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -370,11 +370,12 @@ class RePurchaseOrder(models.Model):
                             move_id.put_move_line()
             for line in item.order_line:
                 if line.product_id.categ_type == '表面工艺':
-                    for production_name in item.origin.split(','):
-                        production = self.env['mrp.production'].search([('name', '=', production_name)])
-                        for workorder in production.workorder_ids.filtered(
-                                lambda wd: wd.routing_type == '表面工艺' and wd.state == 'waiting' and line.product_id.server_product_process_parameters_id == wd.surface_technics_parameters_id):
-                            workorder.state = 'ready'
+                    if item.origin:
+                        for production_name in item.origin.split(','):
+                            production = self.env['mrp.production'].search([('name', '=', production_name)])
+                            for workorder in production.workorder_ids.filtered(
+                                    lambda wd: wd.routing_type == '表面工艺' and wd.state == 'waiting' and line.product_id.server_product_process_parameters_id == wd.surface_technics_parameters_id):
+                                workorder.state = 'ready'
 
         return result
 

From 7f17ff8b783b2812e52cc44c17f52fd77bec94b7 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 25 Dec 2024 13:02:49 +0800
Subject: [PATCH 052/147] =?UTF-8?q?1=E3=80=81=E5=A4=84=E7=90=86=E5=88=B6?=
 =?UTF-8?q?=E9=80=A0=E8=AE=A2=E5=8D=95=E8=BF=94=E5=B7=A5=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=8A=B6=E6=80=81=E8=BF=98=E6=98=AF=E8=BF=94?=
 =?UTF-8?q?=E5=B7=A5=E7=9A=84bug=EF=BC=9B2=E3=80=81=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=B7=B2=E5=8F=96=E6=B6=88=E7=8A=B6=E6=80=81=E7=9A=84=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=8D=95=E3=80=90=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E3=80=91=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py | 13 ++++---------
 sf_sale/views/purchase_order_view.xml     |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index a7e9398c..211054a7 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -363,15 +363,10 @@ class MrpProduction(models.Model):
             # if production.state == 'pending_cam':
             #     if all(wo_state in 'done' for wo_state in production.workorder_ids.mapped('state')):
             #         production.state = 'done'
-            if any(
-                    (
-                            wo.test_results == '返工' and wo.state == 'done' and production.programming_state in [
-                        '已编程']) or (
-                            wo.state == 'rework' and production.programming_state == '编程中') or (
-                            wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中',
-                                                                                                             '已编程'])
-                    for wo in
-                    production.workorder_ids):
+            if any((wo.test_results == '返工' and wo.state == 'done' and production.programming_state in ['已编程'])
+                    or (wo.state == 'rework' and production.programming_state == '编程中')
+                    or (wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中', '已编程'])
+                    for wo in production.workorder_ids) and production.state not in ['progress']:
                 production.state = 'rework'
             if any(wo.test_results == '报废' and wo.state == 'done' for wo in production.workorder_ids):
                 production.state = 'scrap'
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index be35d8a2..615d1b03 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -42,7 +42,7 @@
                     <button name="button_confirm" type="object" context="{'validate_analytic': True}"
                             string="确认订单" id="draft_confirm"
                             groups="sf_base.group_purchase,sf_base.group_purchase_director"
-                            attrs="{'invisible': [('state', 'in', ['purchase'])]}"
+                            attrs="{'invisible': [('state', 'in', ['purchase', 'cancel'])]}"
                     />
                 </xpath>
                 <xpath expr="//form/header/button[@name='action_rfq_send'][1]" position="replace">

From 05f1f1a9835305c3a815fb0b3e44f5f2e6a00a72 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 25 Dec 2024 13:13:38 +0800
Subject: [PATCH 053/147] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E5=BC=80=E5=A7=8B=E6=8C=89=E9=92=AE?=
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, 2 deletions(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 7fc2e8c5..1e47b873 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -174,8 +174,6 @@
                 <!--                        attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>-->
                 <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"
                         attrs="{'invisible': [('state', '!=', 'ready')]}"/>
-                <button name="button_start" type="object" string="开始" class="btn-success"
-                        attrs="{'invisible': [('state', '!=', 'ready')]}"/>
                 <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)]}"/>
                 <button name="button_finish" type="object" string="完成" class="btn-success" confirm="是否确认完工"

From 78fff46452bbdc25dc414b2f6e7506e45a5e5cb2 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 25 Dec 2024 14:16:34 +0800
Subject: [PATCH 054/147] =?UTF-8?q?1=E3=80=81=E5=88=B6=E9=80=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 211054a7..ed117589 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -364,9 +364,8 @@ class MrpProduction(models.Model):
             #     if all(wo_state in 'done' for wo_state in production.workorder_ids.mapped('state')):
             #         production.state = 'done'
             if any((wo.test_results == '返工' and wo.state == 'done' and production.programming_state in ['已编程'])
-                    or (wo.state == 'rework' and production.programming_state == '编程中')
                     or (wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中', '已编程'])
-                    for wo in production.workorder_ids) and production.state not in ['progress']:
+                    for wo in production.workorder_ids):
                 production.state = 'rework'
             if any(wo.test_results == '报废' and wo.state == 'done' for wo in production.workorder_ids):
                 production.state = 'scrap'

From 64f35b5633cdd10a4cbd402daca9e70addf0c0f2 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Wed, 25 Dec 2024 14:49:05 +0800
Subject: [PATCH 055/147] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=B7=A5=E8=89=BA=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/sf_technology_design.py            | 73 ++++++++++++++++++-
 .../production_technology_re_adjust_wizard.py | 68 ++++++++---------
 .../wizard/production_technology_wizard.py    | 68 +++++++++--------
 3 files changed, 142 insertions(+), 67 deletions(-)

diff --git a/sf_manufacturing/models/sf_technology_design.py b/sf_manufacturing/models/sf_technology_design.py
index 392aa021..02b844be 100644
--- a/sf_manufacturing/models/sf_technology_design.py
+++ b/sf_manufacturing/models/sf_technology_design.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from collections import Counter
+
 from odoo import fields, models, api, _
 from odoo.exceptions import ValidationError
 
@@ -6,7 +8,7 @@ from odoo.exceptions import ValidationError
 class sf_technology_design(models.Model):
     _name = 'sf.technology.design'
     _description = "工艺设计"
-
+    group_uniq_id = fields.Integer('同一制造订单唯一id',default=0)
     sequence = fields.Integer('序号')
     route_id = fields.Many2one('mrp.routing.workcenter', '工序')
     process_parameters_id = fields.Many2one('sf.production.process.parameter', string='表面工艺参数')
@@ -17,6 +19,11 @@ class sf_technology_design(models.Model):
     is_auto = fields.Boolean('是否自动生成', default=False)
     active = fields.Boolean('有效', default=True)
 
+    # @api.depends('production_id')
+    # def _compute_group_uniq_id(self):
+    #     for record in self:
+
+
     def json_technology_design_str(self, k, route, i, process_parameter):
         workorders_values_str = [0, '', {
             'route_id': route.id if route.routing_type in ['表面工艺'] else route.route_workcenter_id.id,
@@ -28,6 +35,9 @@ class sf_technology_design(models.Model):
             'is_auto': True}]
         return workorders_values_str
 
+    def write(self, vals):
+        print('qwfojkqwfkio')
+        return super(sf_technology_design, self).write(vals)
     def unlink_technology_design(self):
         self.active = False
 
@@ -37,4 +47,63 @@ class sf_technology_design(models.Model):
         for vals in vals_list:
             if not vals.get('route_id'):
                 raise ValidationError(_("工序不能为空"))
-        return super(sf_technology_design, self).create(vals_list)
+        result = super(sf_technology_design, self).create(vals_list)
+        for res in result:
+            record = self.search([('production_id', '=', res.production_id.id), ('active', 'in', [True, False])], order='group_uniq_id desc', limit=1)
+            res.group_uniq_id=record.group_uniq_id + 1
+        return result
+    def get_duplicates_with_inactive(self,technology_designs):
+        # 统计每个 'sequence' 出现的次数
+        sequence_count = Counter(technology_design.sequence for technology_design in technology_designs)
+
+        # 筛选出 'sequence' 重复且 'active' 为 False 的元素
+        result = [
+            technology_design for technology_design in technology_designs
+            if sequence_count[technology_design.sequence] > 1 and technology_design.active is False
+        ]
+
+        return result
+    # def rearrange_numbering(self,self_technology_designs):
+    #     inactive_designs = self.get_duplicates_with_inactive(self_technology_designs)
+    #     if inactive_designs:
+    #         max_design = max(self_technology_designs, key=lambda x: x.sequence)
+    #         max_sequence = max_design.sequence if max_design else 0
+    #         for designs in inactive_designs:
+    #             max_sequence += 1
+    #             designs.sequence = max_sequence
+    #         self_technology_designs.sorted(key=lambda techology_design:techology_design.sequence)
+    #     return self_technology_designs
+
+    def get_technology_design(self):
+        return {
+            'sequence':self.sequence,
+            'route_id': self.route_id.id,
+            'process_parameters_id': self.process_parameters_id.id,
+            'panel': self.panel,
+            'routing_tag': self.routing_tag,
+            'time_cycle_manual': self.time_cycle_manual,
+            'is_auto': self.is_auto,
+            'active': self.active,
+            'group_uniq_id':self.group_uniq_id,
+        }
+    def sync_technology_designs(self,production_technology_designs, self_technology_designs):
+        production_id = production_technology_designs[0].production_id.id
+        self_technology_design_dict = {item.group_uniq_id:item for item in self_technology_designs}
+        production_technology_designs_dict = {item.group_uniq_id:item for item in production_technology_designs}
+        for technology_design in production_technology_designs:
+            if not self_technology_design_dict.get(technology_design.group_uniq_id):
+                technology_design.write({'production_id': False})
+            else:
+                technology_design.write(self_technology_design_dict.get(technology_design.group_uniq_id).get_technology_design())
+        for technology_design in self_technology_designs:
+            if not production_technology_designs_dict.get(technology_design.group_uniq_id):
+                technology_design = technology_design.get_technology_design()
+                technology_design.update({'production_id': production_id})
+                self.env['sf.technology.design'].create(technology_design)
+
+
+
+    def unified_procedure_multiple_work_orders(self,self_technology_designs,production_item):
+        technology_designs = self.env['sf.technology.design'].sudo().search(
+            [('production_id', '=', production_item.id), ('active', 'in', [True, False])])
+        self.sync_technology_designs(self_technology_designs=self_technology_designs,production_technology_designs=technology_designs)
\ No newline at end of file
diff --git a/sf_manufacturing/wizard/production_technology_re_adjust_wizard.py b/sf_manufacturing/wizard/production_technology_re_adjust_wizard.py
index efc0e449..5bd32b8c 100644
--- a/sf_manufacturing/wizard/production_technology_re_adjust_wizard.py
+++ b/sf_manufacturing/wizard/production_technology_re_adjust_wizard.py
@@ -10,7 +10,7 @@ class ProductionTechnologyReAdjustWizard(models.TransientModel):
 
     production_id = fields.Many2one('mrp.production', string='制造订单号')
     origin = fields.Char(string='源单据')
-    is_technology_re_adjust = fields.Boolean(default=False)
+    is_technology_re_adjust = fields.Boolean(default=True)
 
     def confirm(self):
         if self.is_technology_re_adjust is True:
@@ -24,38 +24,39 @@ class ProductionTechnologyReAdjustWizard(models.TransientModel):
         for production_item in productions:
             # 该制造订单的其他同一销售订单的制造订单的工艺设计处理
             if production_item != self.production_id:
-                for td_other in production_item.technology_design_ids:
-                    if td_other.is_auto is False:
-                        td_del = technology_designs.filtered(lambda tdo: tdo.route_id.id == td_other.route_id.id)
-                        if not td_del or td_del.active is False:
-                            td_other.write({'active': False})
-                    for td_main in technology_designs:
-                        route_other = production_item.technology_design_ids.filtered(
-                            lambda td: td.route_id.id == td_main.route_id.id)
-                        if not route_other and td_main.active is True:
-                            production_item.write({'technology_design_ids': [(0, 0, {
-                                'route_id': td_main.route_id.id,
-                                'process_parameters_id': False if td_main.process_parameters_id is False else
-                                self.env[
-                                    'sf.production.process.parameter'].search(
-                                    [('id', '=', td_main.process_parameters_id.id)]).id,
-                                'sequence': td_main.sequence,
-                                'is_auto': td_main.is_auto})]})
-                        else:
-                            for ro in route_other:
-                                domain = [('production_id', '=', self.production_id.id),
-                                          ('active', 'in', [True, False]),
-                                          ('route_id', '=', ro.route_id.id)]
-                                if ro.route_id.routing_type == '表面工艺':
-                                    domain += [('process_parameters_id', '=', ro.process_parameters_id.id)]
-                                elif ro.route_id.routing_tag == 'special' and ro.is_auto is False:
-                                    # display_name = ro.route_id.display_name
-                                    domain += [('id', '=', ro.id)]
-                                elif ro.panel is not False:
-                                    domain += [('panel', '=', ro.panel)]
-                                td_upd = self.env['sf.technology.design'].sudo().search(domain)
-                                if td_upd:
-                                    ro.write({'sequence': td_upd.sequence, 'active': td_upd.active})
+                self.env['sf.technology.design'].sudo().unified_procedure_multiple_work_orders(technology_designs, production_item)
+                # for td_other in production_item.technology_design_ids:
+                #     # if td_other.is_auto is False:
+                #     #     td_del = technology_designs.filtered(lambda tdo: tdo.route_id.id == td_other.route_id.id)
+                #     #     if not td_del or td_del.active is False:
+                #     #         td_other.write({'active': False})
+                #     for td_main in technology_designs:
+                #         route_other = production_item.technology_design_ids.filtered(
+                #             lambda td: td.route_id.id == td_main.route_id.id)
+                #         if not route_other and td_main.active is True:
+                #             production_item.write({'technology_design_ids': [(0, 0, {
+                #                 'route_id': td_main.route_id.id,
+                #                 'process_parameters_id': False if td_main.process_parameters_id is False else
+                #                 self.env[
+                #                     'sf.production.process.parameter'].search(
+                #                     [('id', '=', td_main.process_parameters_id.id)]).id,
+                #                 'sequence': td_main.sequence,
+                #                 'is_auto': td_main.is_auto})]})
+                        # else:
+                        #     for ro in route_other:
+                        #         domain = [('production_id', '=', self.production_id.id),
+                        #                   ('active', 'in', [True, False]),
+                        #                   ('route_id', '=', ro.route_id.id)]
+                        #         if ro.route_id.routing_type == '表面工艺':
+                        #             domain += [('process_parameters_id', '=', ro.process_parameters_id.id)]
+                        #         elif ro.route_id.routing_tag == 'special' and ro.is_auto is False:
+                        #             # display_name = ro.route_id.display_name
+                        #             domain += [('id', '=', ro.id)]
+                        #         elif ro.panel is not False:
+                        #             domain += [('panel', '=', ro.panel)]
+                        #         td_upd = self.env['sf.technology.design'].sudo().search(domain)
+                        #         if td_upd:
+                        #             ro.write({'sequence': td_upd.sequence, 'active': td_upd.active})
             special_design = self.env['sf.technology.design'].sudo().search(
                 [('routing_tag', '=', 'special'), ('production_id', '=', production_item.id),
                  ('is_auto', '=', False), ('active', 'in', [True, False])])
@@ -124,3 +125,4 @@ class ProductionTechnologyReAdjustWizard(models.TransientModel):
                 if workorders[
                     0].production_id.product_id.categ_id.type == '成品' and item.programming_state != '已编程':
                     workorders[0].state = 'waiting'
+
diff --git a/sf_manufacturing/wizard/production_technology_wizard.py b/sf_manufacturing/wizard/production_technology_wizard.py
index 6e91e053..e16e853c 100644
--- a/sf_manufacturing/wizard/production_technology_wizard.py
+++ b/sf_manufacturing/wizard/production_technology_wizard.py
@@ -11,7 +11,7 @@ class ProductionTechnologyWizard(models.TransientModel):
 
     production_id = fields.Many2one('mrp.production', string='制造订单号')
     origin = fields.Char(string='源单据')
-    is_technology_confirm = fields.Boolean(default=False)
+    is_technology_confirm = fields.Boolean(default=True)
 
     def confirm(self):
         if self.is_technology_confirm is True and self.production_id.product_id.categ_id.type in ['成品', '坯料']:
@@ -19,40 +19,44 @@ class ProductionTechnologyWizard(models.TransientModel):
                       ('product_id', '=', self.production_id.product_id.id)]
         else:
             domain = [('id', '=', self.production_id.id)]
-        technology_designs = self.production_id.technology_design_ids
+        technology_designs = self.env['sf.technology.design'].sudo().search(
+            [('production_id', '=', self.production_id.id), ('active', 'in', [True, False])])
+        # technology_designs = self.production_id.technology_design_ids
         productions = self.env['mrp.production'].search(domain)
         for production in productions:
             if production != self.production_id:
-                for td_other in production.technology_design_ids:
-                    if td_other.is_auto is False:
-                        td_del = technology_designs.filtered(lambda tdo: tdo.route_id.id == td_other.route_id.id)
-                        if not td_del or td_del.active is False:
-                            td_other.write({'active': False})
-                    for td_main in technology_designs:
-                        route_other = production.technology_design_ids.filtered(
-                            lambda td: td.route_id.id == td_main.route_id.id)
-                        if not route_other and td_main.active is True:
-                            production.write({'technology_design_ids': [(0, 0, {
-                                'route_id': td_main.route_id.id,
-                                'process_parameters_id': False if td_main.process_parameters_id is False else self.env[
-                                    'sf.production.process.parameter'].search(
-                                    [('id', '=', td_main.process_parameters_id.id)]).id,
-                                'sequence': td_main.sequence})]})
-                        else:
-                            for ro in route_other:
-                                domain = [('production_id', '=', self.production_id.id),
-                                          ('active', 'in', [True, False]),
-                                          ('route_id', '=', ro.route_id.id)]
-                                if ro.route_id.routing_type == '表面工艺':
-                                    domain += [('process_parameters_id', '=', ro.process_parameters_id.id)]
-                                elif ro.route_id.routing_tag == 'special' and ro.is_auto is False:
-                                    # display_name = ro.route_id.display_name
-                                    domain += [('id', '=', ro.id)]
-                                elif ro.panel is not False:
-                                    domain += [('panel', '=', ro.panel)]
-                                td_upd = self.env['sf.technology.design'].sudo().search(domain)
-                                if td_upd:
-                                    ro.write({'sequence': td_upd.sequence, 'active': td_upd.active})
+                self.env['sf.technology.design'].sudo().unified_procedure_multiple_work_orders(technology_designs,
+                                                                                               production)
+                # for td_other in production.technology_design_ids:
+                    # if td_other.is_auto is False:
+                    #     td_del = technology_designs.filtered(lambda tdo: tdo.route_id.id == td_other.route_id.id)
+                    #     if not td_del or td_del.active is False:
+                    #         td_other.write({'active': False})
+                    # for td_main in technology_designs:
+                    #     route_other = production.technology_design_ids.filtered(
+                    #         lambda td: td.route_id.id == td_main.route_id.id)
+                    #     if not route_other and td_main.active is True:
+                    #         production.write({'technology_design_ids': [(0, 0, {
+                    #             'route_id': td_main.route_id.id,
+                    #             'process_parameters_id': False if td_main.process_parameters_id is False else self.env[
+                    #                 'sf.production.process.parameter'].search(
+                    #                 [('id', '=', td_main.process_parameters_id.id)]).id,
+                    #             'sequence': td_main.sequence})]})
+                        # else:
+                        #     for ro in route_other:
+                        #         domain = [('production_id', '=', self.production_id.id),
+                        #                   ('active', 'in', [True, False]),
+                        #                   ('route_id', '=', ro.route_id.id)]
+                        #         if ro.route_id.routing_type == '表面工艺':
+                        #             domain += [('process_parameters_id', '=', ro.process_parameters_id.id)]
+                        #         elif ro.route_id.routing_tag == 'special' and ro.is_auto is False:
+                        #             # display_name = ro.route_id.display_name
+                        #             domain += [('id', '=', ro.id)]
+                        #         elif ro.panel is not False:
+                        #             domain += [('panel', '=', ro.panel)]
+                        #         td_upd = self.env['sf.technology.design'].sudo().search(domain)
+                        #         if td_upd:
+                        #             ro.write({'sequence': td_upd.sequence, 'active': td_upd.active})
             special_design = self.env['sf.technology.design'].sudo().search(
                 [('routing_tag', '=', 'special'), ('production_id', '=', production.id),
                  ('is_auto', '=', False), ('active', 'in', [True, False])])

From 7a1237ddf803197fd37ea2985c39c2a97e0e5626 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Wed, 25 Dec 2024 15:14:07 +0800
Subject: [PATCH 056/147] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 2958ce00..a68e9417 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -411,7 +411,7 @@ class RePurchaseOrder(models.Model):
         last_overdue_order = None
         last_warning_order = None
         for item in purchase_order:
-            current_time = datetime.now()
+            current_time = datetime.datetime.now()
             if item.date_planned <= current_time:  # 已逾期
                 item.delivery_warning = 'overdue'
                 last_overdue_order = item

From 14cc285ee2b0babd3f77e6268efc3f08de924139 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 25 Dec 2024 17:12:38 +0800
Subject: [PATCH 057/147] =?UTF-8?q?1=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BE=9B=E8=B4=A7=E6=96=B9=E5=BC=8F=E4=B8=BA=E5=A7=94?=
 =?UTF-8?q?=E5=A4=96=E5=8A=A0=E5=B7=A5=E6=97=B6=E7=94=9F=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_dlm/models/stock_rule_inherit.py  | 16 ++++++++--------
 sf_message/models/sf_message_sale.py |  2 +-
 sf_sale/models/sale_order.py         | 16 ++++++++--------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/sf_dlm/models/stock_rule_inherit.py b/sf_dlm/models/stock_rule_inherit.py
index 4a40ca2f..4d715196 100644
--- a/sf_dlm/models/stock_rule_inherit.py
+++ b/sf_dlm/models/stock_rule_inherit.py
@@ -9,9 +9,9 @@ class StockRuleInherit(models.Model):
     @api.model
     def _run_buy(self, procurements):
         # 判断补货组的采购类型
-        procurements_group = {'standard': [], 'consignment': []}
+        procurements_group = {'standard': [], 'outsourcing': []}
         for procurement, rule in procurements:
-            is_consignment = False
+            is_outsourcing = False
             product = procurement.product_id
             # 获取主 BOM
             bom = self.env['mrp.bom'].search([('product_tmpl_id', '=', product.product_tmpl_id.id)], limit=1)
@@ -24,17 +24,17 @@ class StockRuleInherit(models.Model):
                     for route in raw_material.route_ids:
                         # print('route.name:', route.name)
                         if route.name == '按订单补给外包商': 
-                            is_consignment = True
+                            is_outsourcing = True
   
-            if is_consignment:
-                procurements_group['consignment'].append((procurement, rule))
+            if is_outsourcing:
+                procurements_group['outsourcing'].append((procurement, rule))
             else:
                 procurements_group['standard'].append((procurement, rule))
 
         for key, value in procurements_group.items():
             super(StockRuleInherit, self)._run_buy(value)
 
-            if key == 'consignment':
+            if key == 'outsourcing':
                 for procurement, rule in value:
                     supplier = procurement.values.get('supplier')
                     if supplier:
@@ -49,7 +49,7 @@ class StockRuleInherit(models.Model):
                     ], limit=1)
                     logging.info("po=: %s", po)
                     if po:
-                        po.write({'purchase_type': 'consignment'})
+                        po.write({'purchase_type': 'outsourcing'})
 
         # # 首先调用父类的 _run_buy 方法，以保留原有逻辑
         # super(StockRuleInherit, self)._run_buy(procurements)
@@ -83,5 +83,5 @@ class StockRuleInherit(models.Model):
         #                         ], limit=1)
         #                         logging.info("po=: %s", po)
         #                         if po:
-        #                             po.write({'purchase_type': 'consignment'})
+        #                             po.write({'purchase_type': 'outsourcing'})
         #                     break
diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py
index 4200ea72..311ac725 100644
--- a/sf_message/models/sf_message_sale.py
+++ b/sf_message/models/sf_message_sale.py
@@ -30,7 +30,7 @@ class SFMessageSale(models.Model):
                             purchase_order_info.add_queue('坯料采购提醒')
                 purchase_order_ids = self.order_line.purchase_line_ids.order_id | self.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id | self.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id
                 for purchase_order_id in purchase_order_ids:
-                    if purchase_order_id.purchase_type == 'consignment':
+                    if purchase_order_id.purchase_type == 'outsourcing':
                         purchase_order_id.add_queue('委外加工采购单提醒')
                     if purchase_order_id.purchase_type == 'standard':
                         purchase_order_id.add_queue('外购订单采购单提醒')
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index a5b80acc..1be4bc31 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -170,9 +170,9 @@ class ReSaleOrder(models.Model):
     def _compute_purchase_order_count(self):
         for order in self:
             order.purchase_order_count = len(order._get_purchase_orders().filtered(
-                lambda po: po.purchase_type not in ['consignment']))
+                lambda po: po.purchase_type not in ['outsourcing']))
             order.consignment_purchase_order_count = len(order._get_purchase_orders().filtered(
-                lambda po: po.purchase_type in ['consignment']))
+                lambda po: po.purchase_type in ['outsourcing']))
 
     def action_view_purchase_orders(self):
         """
@@ -180,7 +180,7 @@ class ReSaleOrder(models.Model):
         """
         self.ensure_one()
         purchase_order_ids = self._get_purchase_orders().filtered(
-            lambda po: po.purchase_type not in ['consignment']).ids
+            lambda po: po.purchase_type not in ['outsourcing']).ids
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -203,21 +203,21 @@ class ReSaleOrder(models.Model):
         委外加工
         """
         self.ensure_one()
-        consignment_purchase_order_ids = self._get_purchase_orders().filtered(
-            lambda po: po.purchase_type in ['consignment']).ids
+        outsourcing_purchase_order_ids = self._get_purchase_orders().filtered(
+            lambda po: po.purchase_type in ['outsourcing']).ids
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
         }
-        if len(consignment_purchase_order_ids) == 1:
+        if len(outsourcing_purchase_order_ids) == 1:
             action.update({
                 'view_mode': 'form',
-                'res_id': consignment_purchase_order_ids[0],
+                'res_id': outsourcing_purchase_order_ids[0],
             })
         else:
             action.update({
                 'name': _("从 %s生成委外加工订单", self.name),
-                'domain': [('id', 'in', consignment_purchase_order_ids)],
+                'domain': [('id', 'in', outsourcing_purchase_order_ids)],
                 'view_mode': 'tree,form',
             })
         return action

From 4c8071fea2878903dfa2614f5a02807591df6d55 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Wed, 25 Dec 2024 17:16:30 +0800
Subject: [PATCH 058/147] =?UTF-8?q?=E5=A4=9A=E5=88=B6=E9=80=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=94=9F=E6=88=90=E5=B7=A5=E8=89=BA=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/sf_technology_design.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sf_manufacturing/models/sf_technology_design.py b/sf_manufacturing/models/sf_technology_design.py
index 02b844be..15d2c22d 100644
--- a/sf_manufacturing/models/sf_technology_design.py
+++ b/sf_manufacturing/models/sf_technology_design.py
@@ -99,6 +99,7 @@ class sf_technology_design(models.Model):
             if not production_technology_designs_dict.get(technology_design.group_uniq_id):
                 technology_design = technology_design.get_technology_design()
                 technology_design.update({'production_id': production_id})
+                technology_design.pop('group_uniq_id')
                 self.env['sf.technology.design'].create(technology_design)
 
 

From 6532af500f91febfbf74fa3b623791aa52add0bd Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Thu, 26 Dec 2024 08:57:31 +0800
Subject: [PATCH 059/147] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9B=B6=E4=BB=B6=E5=9B=BE=E5=8F=B7=E4=B8=8E?=
 =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quality_control/models/quality.py       | 9 ++++++++-
 quality_control/views/quality_views.xml | 2 ++
 sf_quality/models/quality_cnc_test.py   | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py
index ebe73384..f2444024 100644
--- a/quality_control/models/quality.py
+++ b/quality_control/models/quality.py
@@ -7,6 +7,7 @@ from datetime import datetime
 import random
 
 from odoo import api, models, fields, _
+from odoo.api import depends
 from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT, float_round
 from odoo.osv.expression import OR
 
@@ -122,7 +123,13 @@ class QualityPoint(models.Model):
 
 class QualityCheck(models.Model):
     _inherit = "quality.check"
-
+    part_name = fields.Char('零件名称',  compute='_compute_part_name_number', readonly=True)
+    part_number = fields.Char('零件图号', compute='_compute_part_name_number', readonly=True)
+    @depends('product_id')
+    def _compute_part_name_number(self):
+        for record in self:
+            record.part_number = record.product_id.part_number
+            record.part_name = record.product_id.part_name
     failure_message = fields.Html(related='point_id.failure_message', readonly=True)
     measure = fields.Float('Measure', default=0.0, digits='Quality Tests', tracking=True)
     measure_success = fields.Selection([
diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml
index 8e5af75a..f4f05420 100644
--- a/quality_control/views/quality_views.xml
+++ b/quality_control/views/quality_views.xml
@@ -389,6 +389,8 @@
                 <field name="name" decoration-bf="1"/>
                 <field name="measure_on" optional="show"/>
                 <field name='product_id' optional="show"/>
+                <field name="part_name" optional="hide"/>
+                <field name='part_number' optional="show"/>
                 <field name="lot_id" invisible="context.get('show_lots_text')"/>
                 <field name="lot_name" invisible="not context.get('show_lots_text')"/>
                 <field name="picking_id" optional="hide" string="Transfer"/>
diff --git a/sf_quality/models/quality_cnc_test.py b/sf_quality/models/quality_cnc_test.py
index 6f9d1c61..9c73715d 100644
--- a/sf_quality/models/quality_cnc_test.py
+++ b/sf_quality/models/quality_cnc_test.py
@@ -16,7 +16,7 @@ class SfQualityCncTest(models.Model):
     equipment_id = fields.Many2one(related='workorder_id.equipment_id', string='加工设备')
     production_line_id = fields.Many2one(related='workorder_id.production_line_id',
                                          string='生产线')
-    part_number = fields.Char(related='workorder_id.part_number', string='成品零件图号')
+    part_number = fields.Char(related='workorder_id.part_number', string='零件图号')
     detection_report = fields.Binary(related='workorder_id.detection_report', readonly=True, string='检测报告')
     state = fields.Selection([
         ('waiting', '待判定'),

From 06842c6df9f9fa320a9f01506db802629c7d7647 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 26 Dec 2024 10:01:42 +0800
Subject: [PATCH 060/147] =?UTF-8?q?1=E3=80=81=E9=87=87=E8=B4=AD=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E9=80=89=E5=8F=96=E7=9B=AE=E6=A0=87=E8=B4=A7?=
 =?UTF-8?q?=E4=BD=8D=E5=8E=BB=E9=87=8D=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=9B=AE=E6=A0=87=E8=B4=A7=E4=BD=8D=E7=9A=84=E5=80=BC?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/functional_tool.py | 7 ++++++-
 sf_warehouse/models/model.py                 | 7 +++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py
index 78a652f4..63a31b82 100644
--- a/sf_tool_management/models/functional_tool.py
+++ b/sf_tool_management/models/functional_tool.py
@@ -45,7 +45,8 @@ class FunctionalCuttingToolEntity(models.Model):
                                               string='状态', store=True, default='正常')
     current_location_id = fields.Many2one('stock.location', string='当前位置', compute='_compute_current_location_id',
                                           store=True)
-    current_shelf_location_id = fields.Many2one('sf.shelf.location', string='当前货位', readonly=True)
+    current_shelf_location_id = fields.Many2one('sf.shelf.location', string='当前货位',
+                                                compute='_compute_current_location_id', store=True)
     current_location = fields.Selection(
         [('组装后', '组装后'), ('刀具房', '刀具房'), ('线边刀库', '线边刀库'), ('机内刀库', '机内刀库')],
         string='位置', compute='_compute_current_location_id', store=True)
@@ -85,6 +86,10 @@ class FunctionalCuttingToolEntity(models.Model):
                         if quant_id.inventory_quantity_auto_apply > 0:
                             record.current_location_id = quant_id.location_id
                             if quant_id.location_id.name == '制造前':
+                                shelf_location_id = self.env['sf.shelf.location'].sudo().search([
+                                    ('product_sn_id', '=', record.barcode_id.id)])
+                                if shelf_location_id:
+                                    record.current_shelf_location_id = shelf_location_id.id
                                 if not record.current_shelf_location_id:
                                     record.current_location = '机内刀库'
                                 else:
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index 30024239..4e8e5af6 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -888,12 +888,11 @@ class SfStockMoveLine(models.Model):
     def _check_destination_location_id(self):
         for item in self:
             if item:
-                i = 0
                 barcode = item.destination_location_id.barcode
                 for line in item.picking_id.move_line_ids_without_package:
-                    if barcode and barcode == line.destination_location_id.barcode:
-                        i += 1
-                        if i > 1:
+                    if line.destination_location_id:
+                        if (barcode and barcode == line.destination_location_id.barcode
+                                and item.product_id != line.product_id):
                             raise ValidationError(
                                 '【%s】货位已经被占用，请重新选择！！！' % item.destination_location_id.barcode)
 

From c448088906b6c2a0225df64d8c78e88ad75f2ff3 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Thu, 26 Dec 2024 10:18:17 +0800
Subject: [PATCH 061/147] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/purchase_order.py      | 10 ++++++++++
 sf_manufacturing/views/purchase_order_view.xml |  1 +
 2 files changed, 11 insertions(+)

diff --git a/sf_manufacturing/models/purchase_order.py b/sf_manufacturing/models/purchase_order.py
index 1ffed728..607f64d1 100644
--- a/sf_manufacturing/models/purchase_order.py
+++ b/sf_manufacturing/models/purchase_order.py
@@ -31,3 +31,13 @@ class PurchaseOrder(models.Model):
 class PurchaseOrderLine(models.Model):
     _inherit = 'purchase.order.line'
     part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
+    related_product = fields.Many2one('product.product',compute='_compute_related_product', string='关联产品',help='经此产品工艺加工成的成品')
+    @api.depends('order_id.origin')
+    def _compute_related_product(self):
+        for record in self:
+            if record.product_id.detailed_type:
+                production_id = self.env['mrp.production'].search([('name', '=', record.order_id.origin)])
+                record.related_product = production_id.product_id if production_id else False
+            else:
+                record.related_product = False
+
diff --git a/sf_manufacturing/views/purchase_order_view.xml b/sf_manufacturing/views/purchase_order_view.xml
index 5fbd7bd1..af1efcfc 100644
--- a/sf_manufacturing/views/purchase_order_view.xml
+++ b/sf_manufacturing/views/purchase_order_view.xml
@@ -7,6 +7,7 @@
             <field name="inherit_id" ref="purchase.purchase_order_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="after">
+                    <field name="related_product" optional="show"/>
                     <field name="part_number" optional="show"/>
                 </xpath>
             </field>

From b0e993dd53c0b10a4878f7988e7304094b9ed7ba Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 26 Dec 2024 11:22:16 +0800
Subject: [PATCH 062/147] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/models.py                          | 64 ++++++++++++++++++-
 .../views/views.xml                           | 21 +++++-
 .../wizards/upload_file_wizard.py             | 11 ++++
 .../wizards/upload_file_wizard_view.xml       |  2 +-
 4 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index f69859c1..880faf09 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -1,11 +1,21 @@
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
+import logging
+
+_logger = logging.getLogger(__name__)
 
 
 class jikimo_purchase_tier_validation(models.Model):
     _name = 'purchase.order'
     _inherit = ['purchase.order', 'tier.validation']
 
+    contract_document_id = fields.Many2one('documents.document', string='合同文件')
+    contract_file = fields.Binary(related='contract_document_id.datas', string='合同文件内容')
+    contract_file_name = fields.Char(related='contract_document_id.attachment_id.name', string='文件名')
+
+    # 是否已上传合同文件
+    is_upload_contract_file = fields.Boolean(string='是否已上传合同文件', default=False)
+
     def request_validation(self):
         for record in self:
             missing_fields = []
@@ -54,5 +64,55 @@ class jikimo_purchase_tier_validation(models.Model):
 
     # 删除合同文件
     def delete_contract_file(self):
-        print('delete_contract_file============================')
-        pass
+        self.ensure_one()
+        if self.contract_document_id:
+            try:
+                document = self.contract_document_id
+
+                # 清空关联
+                self.write({
+                    'contract_document_id': False,
+                    'contract_file': False,
+                    'contract_file_name': False
+                })
+
+                # 删除文档
+                if document:
+                    document.with_context(no_attachment=True).sudo().unlink()
+
+                self.is_upload_contract_file = False
+
+                # 返回视图动作来刷新当前表单
+                return {
+                    'type': 'ir.actions.act_window',
+                    'res_model': 'purchase.order',
+                    'res_id': self.id,
+                    'view_mode': 'form',
+                    'view_type': 'form',
+                    'target': 'current',
+                    'flags': {'mode': 'readonly'},
+                }
+
+            except Exception as e:
+                _logger.error('删除合同文件时出错: %s', str(e))
+                return {
+                    'type': 'ir.actions.client',
+                    'tag': 'display_notification',
+                    'params': {
+                        'title': _('错误'),
+                        'message': _('删除文件时出现错误'),
+                        'type': 'danger',
+                        'sticky': True,
+                    }
+                }
+
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': _('提示'),
+                'message': _('没有需要删除的合同文件'),
+                'type': 'warning',
+                'sticky': False,
+            }
+        }
diff --git a/jikimo_purchase_tier_validation/views/views.xml b/jikimo_purchase_tier_validation/views/views.xml
index 0fee7710..e26a7372 100644
--- a/jikimo_purchase_tier_validation/views/views.xml
+++ b/jikimo_purchase_tier_validation/views/views.xml
@@ -7,8 +7,25 @@
             <field name="inherit_id" ref="purchase.purchase_order_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//header" position="inside">
-                    <button name="upload_contract_file" string="上传合同" type="object" class="oe_highlight"/>
-                    <button name="delete_contract_file" string="删除合同" type="object" class="oe_highlight"/>
+                    <field name="validation_status" invisible="1"/>
+                    <field name="is_upload_contract_file" invisible="1"/>
+                    <button name="upload_contract_file" string="上传合同" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('validation_status', '!=', 'no'), ('is_upload_contract_file', '=', True)]}"/>
+                    <button name="delete_contract_file" string="删除合同" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('validation_status', '!=', 'no'), ('is_upload_contract_file', '=', False)]}"/>
+                </xpath>
+                <xpath expr="//notebook/page[1]" position="before">
+                    <page string="合同" name="contract_documents"
+                          attrs="{'invisible': [('contract_document_id', '=', False)]}"
+                          autofocus="autofocus">
+                        <group>
+                            <group>
+                                <field name="contract_document_id" invisible="1"/>
+                                <field name="contract_file_name" invisible="1"/>
+                                <field name="contract_file"
+                                       widget="adaptive_viewer"
+                                       filename="contract_file_name"/>
+                            </group>
+                        </group>
+                    </page>
                 </xpath>
             </field>
         </record>
diff --git a/jikimo_purchase_tier_validation/wizards/upload_file_wizard.py b/jikimo_purchase_tier_validation/wizards/upload_file_wizard.py
index 595f0cb7..f7ead9e1 100644
--- a/jikimo_purchase_tier_validation/wizards/upload_file_wizard.py
+++ b/jikimo_purchase_tier_validation/wizards/upload_file_wizard.py
@@ -45,6 +45,8 @@ class IrAttachmentWizard(models.TransientModel):
 
     def action_upload_file(self):
         self.ensure_one()
+        # 获取当前用户的 partner_id
+        current_partner = self.env.user.partner_id
         # 首先创建 ir.attachment
         attachment = self.env['ir.attachment'].create({
             'name': self.filename,
@@ -64,6 +66,14 @@ class IrAttachmentWizard(models.TransientModel):
             'folder_id': workspace.id,
             'res_model': self.res_model,
             'res_id': self.res_id,
+            'partner_id': current_partner.id,
+        })
+
+        # 更新采购订单的合同文档字段
+        purchase_order = self.env['purchase.order'].browse(self.res_id)
+        purchase_order.write({
+            'contract_document_id': document.id,
+            'is_upload_contract_file': True
         })
 
         # 显示成功消息并关闭向导
@@ -80,6 +90,7 @@ class IrAttachmentWizard(models.TransientModel):
                 }
             }
         }
+
         return message
 
 
diff --git a/jikimo_purchase_tier_validation/wizards/upload_file_wizard_view.xml b/jikimo_purchase_tier_validation/wizards/upload_file_wizard_view.xml
index 15bc1023..d75e75cb 100644
--- a/jikimo_purchase_tier_validation/wizards/upload_file_wizard_view.xml
+++ b/jikimo_purchase_tier_validation/wizards/upload_file_wizard_view.xml
@@ -12,7 +12,7 @@
                     <field name="res_id" invisible="1"/>
                 </group>
                 <footer>
-                    <button name="action_upload_file" string="上传" type="object" class="btn-primary"/>
+                    <button name="action_upload_file" string="确认上传" type="object" class="btn-primary"/>
                     <button string="取消" class="btn-secondary" special="cancel"/>
                 </footer>
             </form>

From 394c3f9870b0c4bf4af750f5aa4f12f571610568 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 26 Dec 2024 13:16:04 +0800
Subject: [PATCH 063/147] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/models/models.py | 2 ++
 jikimo_purchase_tier_validation/views/views.xml  | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 880faf09..879d51dd 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -9,6 +9,8 @@ class jikimo_purchase_tier_validation(models.Model):
     _name = 'purchase.order'
     _inherit = ['purchase.order', 'tier.validation']
 
+    _tier_validation_buttons_xpath = "/form/header/button[@id='draft_confirm'][1]"
+
     contract_document_id = fields.Many2one('documents.document', string='合同文件')
     contract_file = fields.Binary(related='contract_document_id.datas', string='合同文件内容')
     contract_file_name = fields.Char(related='contract_document_id.attachment_id.name', string='文件名')
diff --git a/jikimo_purchase_tier_validation/views/views.xml b/jikimo_purchase_tier_validation/views/views.xml
index e26a7372..6d6995ef 100644
--- a/jikimo_purchase_tier_validation/views/views.xml
+++ b/jikimo_purchase_tier_validation/views/views.xml
@@ -6,7 +6,14 @@
             <field name="model">purchase.order</field>
             <field name="inherit_id" ref="purchase.purchase_order_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//header" position="inside">
+                <xpath expr="//header/button[@name='button_cancel']" position="replace">
+                </xpath>
+
+                <xpath expr="//header/button[last()]" position="after">
+                    <button name="button_cancel" states="draft,to approve,sent,purchase" string="取消" type="object" data-hotkey="x" />
+                </xpath>
+
+                <xpath expr="//header/button[@name='action_rfq_send'][1]" position="before">
                     <field name="validation_status" invisible="1"/>
                     <field name="is_upload_contract_file" invisible="1"/>
                     <button name="upload_contract_file" string="上传合同" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('validation_status', '!=', 'no'), ('is_upload_contract_file', '=', True)]}"/>

From 40865b7c6c5fbfb16729d5f08836768537ce0876 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 26 Dec 2024 13:24:04 +0800
Subject: [PATCH 064/147] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=BA=E6=97=A0=E6=95=88=E5=88=80=E6=97=B6=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=BF=94=E5=B7=A5=E4=BF=AE=E6=94=B9=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E7=8A=B6=E6=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index ed117589..edd2b818 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -372,14 +372,10 @@ class MrpProduction(models.Model):
             if any(dr.test_results == '报废' and dr.handle_result == '已处理' for dr in
                    production.detection_result_ids):
                 production.state = 'cancel'
-            # 如果制造订单的功能刀具为【无效刀】则制造订单状态改为返工
-            if production.tool_state == '2':
-                production.state = 'rework'
             if production.workorder_ids and all(wo_state in ('done', 'rework', 'cancel') for wo_state in production.workorder_ids.mapped('state')):
                 if production.state not in ['scrap', 'rework', 'cancel']:
                     production.state = 'done'
 
-
     # 退回调整
     def technology_back_adjust(self):
         process_parameters = []

From b03eafcf9476c0a89a9d5f0d12d30d08dd1f671d Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 26 Dec 2024 13:54:59 +0800
Subject: [PATCH 065/147] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=BF=94=E5=B7=A5=E6=97=B6=E4=BF=AE=E6=94=B9=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=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_tool_management/models/mrp_workorder.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sf_tool_management/models/mrp_workorder.py b/sf_tool_management/models/mrp_workorder.py
index 25ccc460..655d759f 100644
--- a/sf_tool_management/models/mrp_workorder.py
+++ b/sf_tool_management/models/mrp_workorder.py
@@ -198,8 +198,8 @@ class MrpProduction(models.Model):
             logging.info('cnc用刀校验到无效刀自动调用重新编程方法：update_programming_state()')
             self[0].update_programming_state()
             self[0].write({'is_rework': False})
-            # 修改制造订单 编程状态变为“编程中” 制造订单状态为‘返工’
-            self.write({'programming_state': '编程中', 'work_state': '编程中', 'state': 'rework'})
+            # 修改制造订单 编程状态变为“编程中”
+            self.write({'programming_state': '编程中', 'work_state': '编程中'})
             self[0].workorder_ids.filtered(
                 lambda a: a.name == '装夹预调' and a.state not in ['rework', 'done', 'cancel'])._compute_state()
         if missing_tool_1:

From 07356b5bb261da89fa5f50479ebef41a7cdde5a7 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 26 Dec 2024 14:46:17 +0800
Subject: [PATCH 066/147] =?UTF-8?q?sf-=E8=AF=A2=E4=BB=B7=E5=8D=95-?=
 =?UTF-8?q?=E3=80=90=E5=8F=91=E8=B5=B7=E5=AE=A1=E6=89=B9=E3=80=91=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=8F=8A=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/models/models.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 879d51dd..02648830 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -18,6 +18,19 @@ class jikimo_purchase_tier_validation(models.Model):
     # 是否已上传合同文件
     is_upload_contract_file = fields.Boolean(string='是否已上传合同文件', default=False)
 
+    def button_confirm(self):
+        self = self.with_context(skip_validation=True)
+        return super().button_confirm()
+
+    def _check_state_conditions(self, vals):
+        self.ensure_one()
+        if self._context.get('skip_validation'):
+            return False
+        return (
+                self._check_state_from_condition()
+                and vals.get(self._state_field) in self._state_to
+        )
+
     def request_validation(self):
         for record in self:
             missing_fields = []
@@ -29,6 +42,9 @@ class jikimo_purchase_tier_validation(models.Model):
             if missing_fields:
                 raise ValidationError(_('如下字段要求必须填写：%s') % '、'.join(missing_fields))
 
+            if not record.contract_document_id:
+                raise ValidationError(_('合同文件必须上传'))
+
         return super(jikimo_purchase_tier_validation, self).request_validation()
 
     # 上传合同文件

From e059d9266de654f20b7d9857db12c4d08da7cdab Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Thu, 26 Dec 2024 15:26:12 +0800
Subject: [PATCH 067/147] =?UTF-8?q?=E5=9D=AF=E6=96=99=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py
index 05bd6f3e..ed490e8a 100644
--- a/sf_message/models/sf_message_stock_picking.py
+++ b/sf_message/models/sf_message_stock_picking.py
@@ -72,14 +72,13 @@ class SFMessageStockPicking(models.Model):
                 content = message_queue_id.message_template_id.content
                 stock_picking_line = self.env['stock.picking'].sudo().search(
                     [('id', '=', int(message_queue_id.res_id))])
-                if stock_picking_line.state == 'assigned':
-                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-                    action_id = self.env.ref('stock.action_picking_tree_ready').id
-                    menu_id = self.env.ref('stock.menu_stock_root').id
-                    url_with_id = f"{url}/web#view_type=form&action={action_id}&menu_id={menu_id}&id={stock_picking_line.id}"
-                    content = content.replace('{{name}}', stock_picking_line.name).replace(
+                url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+                action_id = self.env.ref('stock.action_picking_tree_ready').id
+                menu_id = self.env.ref('stock.menu_stock_root').id
+                url_with_id = f"{url}/web#view_type=form&action={action_id}&menu_id={menu_id}&id={stock_picking_line.id}"
+                content = content.replace('{{name}}', stock_picking_line.name).replace(
                         '{{request_url}}', url_with_id)
-                    contents.append(content)
+                contents.append(content)
             elif message_queue_id.message_template_id.name == '订单发货提醒':
                 content = self.deal_stock_picking_sfp(message_queue_id)
                 if content:

From 158ca95dbbf8c26f008ffe3e4cc472f8258a0132 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 26 Dec 2024 15:42:43 +0800
Subject: [PATCH 068/147] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AF=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E7=9A=84=E8=B7=B3=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/models.py                          | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 02648830..6f07f6d6 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -18,18 +18,18 @@ class jikimo_purchase_tier_validation(models.Model):
     # 是否已上传合同文件
     is_upload_contract_file = fields.Boolean(string='是否已上传合同文件', default=False)
 
-    def button_confirm(self):
-        self = self.with_context(skip_validation=True)
-        return super().button_confirm()
-
-    def _check_state_conditions(self, vals):
-        self.ensure_one()
-        if self._context.get('skip_validation'):
-            return False
-        return (
-                self._check_state_from_condition()
-                and vals.get(self._state_field) in self._state_to
-        )
+    # def button_confirm(self):
+    #     self = self.with_context(skip_validation=True)
+    #     return super().button_confirm()
+    #
+    # def _check_state_conditions(self, vals):
+    #     self.ensure_one()
+    #     if self._context.get('skip_validation'):
+    #         return False
+    #     return (
+    #             self._check_state_from_condition()
+    #             and vals.get(self._state_field) in self._state_to
+    #     )
 
     def request_validation(self):
         for record in self:

From 1b278a1432b368fa2569b79791119f0018b2b42b Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 26 Dec 2024 16:28:39 +0800
Subject: [PATCH 069/147] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E9=87=87=E8=B4=AD=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py          |  2 +-
 sf_sale/views/purchase_order_view.xml |  9 ++++++---
 sf_sale/views/sale_order_view.xml     | 10 ++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index bb5227ba..b00299f4 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -324,7 +324,7 @@ class RePurchaseOrder(models.Model):
             purchase.origin_sale_id = False
 
     delivery_warning = fields.Selection([('normal', '正常'), ('warning', '预警'), ('overdue', '已逾期')],
-                                        string='交期状态',
+                                        string='交期状态', default='normal',
                                         tracking=True)
 
     @api.depends('partner_id')
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 76cd4c74..d58d3753 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -242,8 +242,10 @@
                     <attribute name="string">签约日期</attribute>
                     <attribute name="widget">''</attribute>
                 </xpath>
+                <xpath expr="//field[@name='date_planned']" position="replace">
+                </xpath>
                 <xpath expr="//field[@name='date_order']" position="after">
-                    <field name="date_planned"/>
+                    <field name="date_planned" string="最近交货日期"/>
                 </xpath>
                 <xpath expr="//field[@name='name']" position="after">
                     <field name="purchase_type"/>
@@ -291,7 +293,8 @@
                     <attribute name="string">采购员</attribute>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="after">
-                    <field name="date_planned" string="预计到货日期" optional="show"/>
+                    <field name="delivery_warning" optional="show"/>
+                    <field name="date_planned" string="最近交货日期" optional="show" widget="date"/>
                 </xpath>
                 <xpath expr="//field[@name='name']" position="after">
                     <field name="purchase_type"/>
@@ -343,7 +346,7 @@
                 <xpath expr="//search" position="inside">
                     <searchpanel>
                         <field name="purchase_type" icon="fa-filter" enable_counters="1"/>
-                        <field name="state" icon="fa-filter" enable_counters="1"/>
+                        <field name="delivery_warning" icon="fa-filter" enable_counters="1"/>
                     </searchpanel>
                 </xpath>
             </field>
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 0de2287b..9fcfbd9e 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -170,8 +170,14 @@
                     <field name="manual_quotation" />
                     <field name="is_incoming_material"/>
                 </xpath>
-                <xpath expr="//sheet//group//group[@name='order_details']//div[@class='o_td_label'][2]//label[@for='date_order']" position="attributes">
-                    <attribute name="string">下单日期</attribute>
+                <xpath expr="//div[@class='o_td_label'][2]" position="replace"></xpath>
+                <xpath expr="//field[@name='date_order'][1]" position="replace"></xpath>
+                <xpath expr="//field[@name='date_order']" position="replace"></xpath>
+                <xpath expr="//div[@class='o_td_label'][1]" position="replace">
+                    <div class="o_td_label" attrs="{'invisible': [('state', 'in', ['done', 'cancel'])]}">
+                        <label for="date_order" string="下单日期"/>
+                    </div>
+                    <field name="date_order" attrs="{'invisible': [('state', 'in', ['done', 'cancel'])], 'required': True}" nolabel="1"/>
                 </xpath>
 
             </field>

From 253a06ceafc0ad7db129014977d1087b217468e8 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 26 Dec 2024 16:33:43 +0800
Subject: [PATCH 070/147] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=97=B6=E7=9A=84=E5=88=A4=E5=AE=9A=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E8=B0=83=E6=95=B4=E6=8F=90=E7=A4=BA=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/models.py                          | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 6f07f6d6..6108880d 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -18,6 +18,12 @@ class jikimo_purchase_tier_validation(models.Model):
     # 是否已上传合同文件
     is_upload_contract_file = fields.Boolean(string='是否已上传合同文件', default=False)
 
+    def button_confirm(self):
+        for record in self:
+            if record.need_validation and record.validation_status != 'validated':
+                raise ValidationError(_('请先完成审批！'))
+        return super().button_confirm()
+
     # def button_confirm(self):
     #     self = self.with_context(skip_validation=True)
     #     return super().button_confirm()
@@ -33,17 +39,29 @@ class jikimo_purchase_tier_validation(models.Model):
 
     def request_validation(self):
         for record in self:
-            missing_fields = []
-            if not record.partner_ref:
-                missing_fields.append('合同名称')
-            if not record.contract_number:
-                missing_fields.append('合同编号')
+            error_messages = []
+
+            # 检查必填字段
+            required_fields = {
+                'partner_ref': '合同名称',
+                'contract_number': '合同编号'
+            }
+
+            missing_fields = [
+                name for field, name in required_fields.items()
+                if not record[field]
+            ]
 
             if missing_fields:
-                raise ValidationError(_('如下字段要求必须填写：%s') % '、'.join(missing_fields))
+                error_messages.append('1、如下字段要求必须填写：%s' % '、'.join(missing_fields))
 
+            # 检查合同文件
             if not record.contract_document_id:
-                raise ValidationError(_('合同文件必须上传'))
+                error_messages.append('2、必须点击上传合同文件')
+
+            # 如果有任何错误，一次性显示所有错误信息
+            if error_messages:
+                raise ValidationError('\n'.join(error_messages))
 
         return super(jikimo_purchase_tier_validation, self).request_validation()
 

From 6e2ee60616e974dbe373fe645032dfa10d5307a9 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Thu, 26 Dec 2024 17:15:48 +0800
Subject: [PATCH 071/147] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=B7=B2=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_message/models/sf_message_product.py   |  9 ++++++++-
 sf_message/models/sf_message_workorder.py | 19 ++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/sf_message/models/sf_message_product.py b/sf_message/models/sf_message_product.py
index 4f983e49..3b82dac7 100644
--- a/sf_message/models/sf_message_product.py
+++ b/sf_message/models/sf_message_product.py
@@ -13,8 +13,15 @@ class SFMessagePlan(models.Model):
             if message_queue_id.message_template_id.name == '工单已下发通知':
                 content = message_queue_id.message_template_id.content
                 product_product = self.env['product.product'].sudo().search([('id', '=', int(message_queue_id.res_id))])
-                production_num = self.env['mrp.production'].sudo().search_count(
+                mrp_production_list = self.env['mrp.production'].sudo().search(
                     [('product_id', '=', product_product.id)])
+                production_num = 0
+                for mrp_production_info in mrp_production_list:
+                    routing_type = '人工线下加工' if mrp_production_info.production_type == '人工线下加工' else '装夹预调'
+                    mrp_production_ready = mrp_production_info.workorder_ids.filtered(
+                        lambda w: w.routing_type == routing_type and w.state == 'ready')
+                    if mrp_production_ready:
+                        production_num += 1
                 if production_num >= 1:
                     url = self.get_request_url()
                     content = content.replace('{{product_id}}', product_product.name).replace(
diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py
index ee8f6c00..44b3a6b8 100644
--- a/sf_message/models/sf_message_workorder.py
+++ b/sf_message/models/sf_message_workorder.py
@@ -18,16 +18,21 @@ class SFMessageWork(models.Model):
     def _compute_state(self):
         super(SFMessageWork, self)._compute_state()
         for workorder in self:
+            min_sequence_wk = None
             work_ids = workorder.production_id.workorder_ids.filtered(lambda w: w.routing_type == '装夹预调')
             if work_ids:
                 min_sequence_wk = work_ids.sorted(key=lambda w: w.sequence)[0]
-                if workorder.state == 'ready' and workorder.routing_type == '装夹预调' and workorder.id == min_sequence_wk.id:
-                    message_template = self.env["jikimo.message.template"].sudo().search([("name", "=", '工单已下发通知')], limit=1)
-                    jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
-                        [('res_id', '=', workorder.production_id.product_id.id), ("message_status", "in", ("pending", "sent")),
-                         ('message_template_id', '=', message_template.id)])
-                    if not jikimo_message_queue:
-                        workorder.production_id.product_id.add_queue('工单已下发通知')
+            if (
+                    workorder.state == 'ready' and workorder.routing_type == '装夹预调' and workorder.id == min_sequence_wk.id) or (
+                    workorder.state == 'ready' and workorder.routing_type == '人工线下加工'):
+                message_template = self.env["jikimo.message.template"].sudo().search(
+                    [("name", "=", '工单已下发通知')], limit=1)
+                jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
+                    [('res_id', '=', workorder.production_id.product_id.id),
+                     ("message_status", "in", ("pending", "sent")),
+                     ('message_template_id', '=', message_template.id)])
+                if not jikimo_message_queue:
+                    workorder.production_id.product_id.add_queue('工单已下发通知')
 
     def _get_message(self, message_queue_ids):
         contents = []

From 133c1a87f2a7c53fc111bcaed70ec9d80ec577e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Fri, 27 Dec 2024 13:53:10 +0800
Subject: [PATCH 072/147] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/jikimo_workorder_exception.py                    | 4 ++--
 sf_message/models/sf_message_maintenance_logs.py            | 4 ++--
 sf_message/models/sf_message_mrp_production.py              | 2 +-
 sf_message/models/sf_message_purchase.py                    | 2 +-
 sf_message/models/sf_message_quality_cnc_test.py            | 2 +-
 sf_message/models/sf_message_sale.py                        | 6 +++---
 sf_message/models/sf_message_stock_picking.py               | 2 +-
 sf_message/models/sf_message_workorder.py                   | 2 +-
 sf_plan_management/i18n/zh_CN.po                            | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/jikimo_workorder_exception_notify/models/jikimo_workorder_exception.py b/jikimo_workorder_exception_notify/models/jikimo_workorder_exception.py
index 9849f2cd..0ab0d6ae 100644
--- a/jikimo_workorder_exception_notify/models/jikimo_workorder_exception.py
+++ b/jikimo_workorder_exception_notify/models/jikimo_workorder_exception.py
@@ -51,11 +51,11 @@ class JikimoWorkorderException(models.Model):
         return res
 
     def _get_message(self, message_queue_ids):
-        contents = super(JikimoWorkorderException, self)._get_message(message_queue_ids)
+        contents, _ = super(JikimoWorkorderException, self)._get_message(message_queue_ids)
         url = self.env['ir.config_parameter'].get_param('web.base.url')
         action_id = self.env.ref('mrp.mrp_production_action').id
         for index, content in enumerate(contents):
             exception_id = self.env['jikimo.workorder.exception'].browse(message_queue_ids[index].res_id)
             url = url + '/web#id=%s&view_type=form&action=%s' % (exception_id.workorder_id.production_id.id, action_id)
             contents[index] = content.replace('{{url}}', url)
-        return contents
+        return contents, message_queue_ids
diff --git a/sf_message/models/sf_message_maintenance_logs.py b/sf_message/models/sf_message_maintenance_logs.py
index 94a4c5c5..ab15864f 100644
--- a/sf_message/models/sf_message_maintenance_logs.py
+++ b/sf_message/models/sf_message_maintenance_logs.py
@@ -13,11 +13,11 @@ class SFMessageMaintenanceLogs(models.Model):
         return res
 
     def _get_message(self, message_queue_ids):
-        contents = super(SFMessageMaintenanceLogs, self)._get_message(message_queue_ids)
+        contents, _ = super(SFMessageMaintenanceLogs, self)._get_message(message_queue_ids)
         url = self.env['ir.config_parameter'].get_param('web.base.url')
         action_id = self.env.ref('sf_maintenance.action_maintenance_logs').id
         for index, content in enumerate(contents):
             maintenance_logs_id = self.env['sf.maintenance.logs'].browse(message_queue_ids[index].res_id)
             url = url + '/web#id=%s&view_type=form&action=%s' % (maintenance_logs_id.id, action_id)
             contents[index] = content.replace('{{url}}', url)
-        return contents
\ No newline at end of file
+        return contents, message_queue_ids
\ No newline at end of file
diff --git a/sf_message/models/sf_message_mrp_production.py b/sf_message/models/sf_message_mrp_production.py
index a60f2161..29905382 100644
--- a/sf_message/models/sf_message_mrp_production.py
+++ b/sf_message/models/sf_message_mrp_production.py
@@ -41,7 +41,7 @@ class SFMessageMrpProduction(models.Model):
                             '{{sale_order_name}}', mrp_production.origin).replace('{{request_url}}', url)
                         contents.append(content)
         logging.info('生产完工入库提醒: %s' % contents)
-        return contents
+        return contents, message_queue_ids
 
     def request_url(self, id):
         url = self.env['ir.config_parameter'].get_param('web.base.url')
diff --git a/sf_message/models/sf_message_purchase.py b/sf_message/models/sf_message_purchase.py
index e3fe269f..3cbc297e 100644
--- a/sf_message/models/sf_message_purchase.py
+++ b/sf_message/models/sf_message_purchase.py
@@ -16,7 +16,7 @@ class SFMessagePurchase(models.Model):
                 content = content.replace('{{name}}', purchase_order_line.name).replace(
                     '{{request_url}}', url)
                 contents.append(content)
-        return contents
+        return contents, message_queue_ids
 
     def request_url(self, id):
         url = self.env['ir.config_parameter'].get_param('web.base.url')
diff --git a/sf_message/models/sf_message_quality_cnc_test.py b/sf_message/models/sf_message_quality_cnc_test.py
index 0ddc1391..43969682 100644
--- a/sf_message/models/sf_message_quality_cnc_test.py
+++ b/sf_message/models/sf_message_quality_cnc_test.py
@@ -33,4 +33,4 @@ class SFMessageQualityCncTest(models.Model):
             content_template = content.replace('{{judge_num}}', str(i))
             content_template = content_template.replace('{{url}}', url_with_id)
             contents.append(content_template)
-        return contents
+        return contents, message_queue_ids
diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py
index 58d1a021..e7663c1a 100644
--- a/sf_message/models/sf_message_sale.py
+++ b/sf_message/models/sf_message_sale.py
@@ -54,13 +54,13 @@ class SFMessageSale(models.Model):
         i = 0
         for item in message_queue_ids:
             if item.message_template_id.bussiness_node_id.name == '待接单':
-                content = super(SFMessageSale, self)._get_message(item)
+                content, _ = super(SFMessageSale, self)._get_message(item)
                 action_id = self.env.ref('sale.action_quotations_with_onboarding').id
                 url_with_id = f"{url}/web#id={item.res_id}&view_type=form&action={action_id}"
                 content = content[0].replace('{{url}}', url_with_id)
                 contents.append(content)
             elif item.message_template_id.bussiness_node_id.name == '确认接单':
-                content = super(SFMessageSale, self)._get_message(item)
+                content, _ = super(SFMessageSale, self)._get_message(item)
                 sale_order_line = self.env['sale.order.line'].sudo().search([('order_id', '=', int(item.res_id))])
                 product = sale_order_line[0].product_id.name if len(sale_order_line) == 1 else '%s...' % \
                                                                                                sale_order_line[
@@ -97,7 +97,7 @@ class SFMessageSale(models.Model):
             elif bussiness_node == '销售订单已逾期':
                 content = content_template.replace('{{overdue_num}}', str(i))
             contents.append(content)
-        return contents
+        return contents, message_queue_ids
 
     # # 销售订单逾期预警和已逾期
     def _overdue_or_warning_func(self):
diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py
index 6e80c670..b2e93d38 100644
--- a/sf_message/models/sf_message_stock_picking.py
+++ b/sf_message/models/sf_message_stock_picking.py
@@ -74,7 +74,7 @@ class SFMessageStockPicking(models.Model):
                 content = self.deal_stock_picking_sfp(message_queue_id)
                 if content:
                     contents.append(content)
-            return contents
+            return contents, message_queue_ids
 
     def get_special_url(self, id, tmplate_name, special_name, model_id):
         menu_id = 0
diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py
index d5186797..fb2c5881 100644
--- a/sf_message/models/sf_message_workorder.py
+++ b/sf_message/models/sf_message_workorder.py
@@ -93,7 +93,7 @@ class SFMessageWork(models.Model):
             elif bussiness_node in template_names['已逾期']:
                 content = content_template.replace('{{overdue_num}}', str(i))
             contents.append(content)
-        return contents
+        return contents, message_queue_ids
 
     def request_url(self):
         url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
diff --git a/sf_plan_management/i18n/zh_CN.po b/sf_plan_management/i18n/zh_CN.po
index 91b32d41..b811963b 100644
--- a/sf_plan_management/i18n/zh_CN.po
+++ b/sf_plan_management/i18n/zh_CN.po
@@ -6678,7 +6678,7 @@ msgstr "账单状态"
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 #, python-format
 msgid "Bills"
-msgstr "账单"
+msgstr "发票账单"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -23023,7 +23023,7 @@ msgstr "支付：支付收据"
 #: model_terms:ir.ui.view,arch_db:account.view_account_payment_search
 #, python-format
 msgid "Payments"
-msgstr "支付"
+msgstr "付款单"
 
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.action_account_payments

From e990f246157bd3f3fcba4b3fcb7d3171e8b74f0f Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Fri, 27 Dec 2024 16:21:36 +0800
Subject: [PATCH 073/147] =?UTF-8?q?=E4=B8=A4=E5=BC=A0=E5=A4=96=E5=8D=8F?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8A=A5=E9=94=99=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_production.py | 72 +++++++++++------------
 sf_manufacturing/models/stock.py          |  5 +-
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index ed117589..b4367212 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -807,45 +807,45 @@ class MrpProduction(models.Model):
                     workorder.move_subcontract_workorder_ids.picking_id.write({'state': 'cancel'})
                 consecutive_workorders = []
                 sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.sequence)
-                for i, workorder in enumerate(sorted_workorders):
-                    # 检查当前工作订单和下一个工作订单是否连续，并且供应商相同
-                    if i == 0:
-                        consecutive_workorders.append(workorder)
-                    elif workorder.sequence == sorted_workorders[
-                        i - 1].sequence + 1 and workorder.supplier_id.id == sorted_workorders[i - 1].supplier_id.id:
-                        consecutive_workorders.append(workorder)
-                    else:
-                        # 处理连续组，如果它不为空
-                        if consecutive_workorders:
-                            proc_workorders.append(consecutive_workorders)
-                            # 创建外协出入库单和采购订单
-                            # self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production, sorted_workorders)
-                            # self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
-                            #                                               product_id_to_production_names)
-                            if i < len(sorted_workorders) - 1:
-                                # 重置连续组，并添加当前工作订单
-                                consecutive_workorders = [workorder]
-                            else:
-                                # 判断最后一笔:
-                                if workorder.sequence == sorted_workorders[
-                                    i - 1].sequence and workorder.supplier_id.id == sorted_workorders[
-                                    i - 1].supplier_id.id:
-                                    consecutive_workorders = [workorder]
-                                else:
-                                    proc_workorders.append([workorder])
-                                    # 立即创建外协出入库单和采购订单
-                                    # self.env['stock.picking'].create_outcontract_picking(workorder, production)
-                                    # self.env['purchase.order'].get_purchase_order(workorder, production,
-                                    #   product_id_to_production_names)
-                                    consecutive_workorders = []
-
-                # 处理最后一个组，即使它可能只有一个工作订单
-                if consecutive_workorders:
-                    proc_workorders.append(consecutive_workorders)
+                # for i, workorder in enumerate(sorted_workorders):
+                #     # 检查当前工作订单和下一个工作订单是否连续，并且供应商相同
+                #     if i == 0:
+                #         consecutive_workorders.append(workorder)
+                #     elif workorder.sequence == sorted_workorders[
+                #         i - 1].sequence + 1 and workorder.supplier_id.id == sorted_workorders[i - 1].supplier_id.id:
+                #         consecutive_workorders.append(workorder)
+                #     else:
+                #         # 处理连续组，如果它不为空
+                #         if consecutive_workorders:
+                #             proc_workorders.append(consecutive_workorders)
+                #             # 创建外协出入库单和采购订单
+                #             # self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production, sorted_workorders)
+                #             # self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
+                #             #                                               product_id_to_production_names)
+                #             if i < len(sorted_workorders) - 1:
+                #                 # 重置连续组，并添加当前工作订单
+                #                 consecutive_workorders = [workorder]
+                #             else:
+                #                 # 判断最后一笔:
+                #                 if workorder.sequence == sorted_workorders[
+                #                     i - 1].sequence and workorder.supplier_id.id == sorted_workorders[
+                #                     i - 1].supplier_id.id:
+                #                     consecutive_workorders = [workorder]
+                #                 else:
+                #                     proc_workorders.append([workorder])
+                #                     # 立即创建外协出入库单和采购订单
+                #                     # self.env['stock.picking'].create_outcontract_picking(workorder, production)
+                #                     # self.env['purchase.order'].get_purchase_order(workorder, production,
+                #                     #   product_id_to_production_names)
+                #                     consecutive_workorders = []
+                #
+                # # 处理最后一个组，即使它可能只有一个工作订单
+                # if consecutive_workorders:
+                #     proc_workorders.append(consecutive_workorders)
                     # self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production)
                     # self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
                     #                                               product_id_to_production_names)
-            for workorders in reversed(proc_workorders):
+            for workorders in reversed(sorted_workorders):
                 self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
                 self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
 
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 8c202e6f..4aba2693 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -677,9 +677,8 @@ class StockPicking(models.Model):
                     move_dest_id = item.move_raw_ids[0].id
                 else:
                     # 从sorted_workorders中找到上一工单的move
-                    if sorted_workorders.index(workorder) > 0:
-                        move_dest_id = \
-                        sorted_workorders[sorted_workorders.index(workorder) - 1].move_subcontract_workorder_ids[1].id
+                    if len(sorted_workorders) > 1:
+                        move_dest_id = sorted_workorders[sorted_workorders.index(workorder)+1].move_subcontract_workorder_ids[1].id
                 new_picking = True
                 outcontract_picking_type_in = self.env.ref(
                     'sf_manufacturing.outcontract_picking_in').id,

From 675fb54d375d9a81acabdbbed298c7297bd2d924 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 27 Dec 2024 17:28:24 +0800
Subject: [PATCH 074/147] =?UTF-8?q?=E5=A4=B9=E5=85=B7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=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/maintenance_equipment.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index 5da56016..af9d4931 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -126,16 +126,16 @@ class StockLot(models.Model):
     tool_material_search_id = fields.Many2one('sf.tool.material.search', string='刀具物料搜索')
     fixture_material_search_id = fields.Many2one('sf.fixture.material.search', string='夹具物料搜索')
     tool_material_status = fields.Selection(
-        [('未入库', '未入库'), ('可用', '可用'), ('在用', '空闲'), ('报废', '报废')], string='状态',
+        [('未入库', '未入库'), ('可用', '空闲'), ('在用', '占用'), ('报废', '报废')], string='状态',
         compute='_compute_tool_material_status', store=True)
 
     @api.depends('quant_ids')
     def _compute_tool_material_status(self):
         for record in self:
             if record:
-                if record.product_id.categ_id.name in ['刀具', '夹具']:
+                if record.product_id.categ_id.name in ['刀具']:
                     if record.quant_ids:
-                        if record.quant_ids[-1].location_id.name in ['刀具房', '夹具房']:
+                        if record.quant_ids[-1].location_id.name in ['刀具房']:
                             record.tool_material_status = '可用'
                         elif record.quant_ids[-1].location_id.name == '刀具组装位置':
                             record.tool_material_status = '在用'

From c0bb07efb2ad4ce3f08cbba8b67f08851f499143 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Sat, 28 Dec 2024 08:24:31 +0800
Subject: [PATCH 075/147] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/models/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 6108880d..bb90a894 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -53,11 +53,11 @@ class jikimo_purchase_tier_validation(models.Model):
             ]
 
             if missing_fields:
-                error_messages.append('1、如下字段要求必须填写：%s' % '、'.join(missing_fields))
+                error_messages.append('* 如下字段要求必须填写：%s' % '、'.join(missing_fields))
 
             # 检查合同文件
             if not record.contract_document_id:
-                error_messages.append('2、必须点击上传合同文件')
+                error_messages.append('* 必须点击上传合同文件')
 
             # 如果有任何错误，一次性显示所有错误信息
             if error_messages:

From 6780d4e758dfeeb90b0f71a74bbaf7eab6b63cbd Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Sat, 28 Dec 2024 09:07:02 +0800
Subject: [PATCH 076/147] =?UTF-8?q?sorted=5Fworkorders=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index b4367212..011c5f7e 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -794,6 +794,7 @@ class MrpProduction(models.Model):
                                groupby(production_all, key=lambda x: x.product_id.id)}
         for product_id, pd in grouped_product_ids.items():
             product_id_to_production_names[product_id] = [p.name for p in pd]
+        sorted_workorders = None
         for production in production_all:
             proc_workorders = []
             process_parameter_workorder = self.env['mrp.workorder'].search(

From abfac280940606e0fba7ee344b3653a0b048966e Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Sat, 28 Dec 2024 09:12:27 +0800
Subject: [PATCH 077/147] =?UTF-8?q?sorted=5Fworkorders=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 011c5f7e..5c304de4 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -846,6 +846,8 @@ class MrpProduction(models.Model):
                     # self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production)
                     # self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
                     #                                               product_id_to_production_names)
+            if not sorted_workorders:
+                return
             for workorders in reversed(sorted_workorders):
                 self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
                 self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)

From 889049b1074578e374aad5a7989fca6efe495694 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Sat, 28 Dec 2024 14:28:34 +0800
Subject: [PATCH 078/147] =?UTF-8?q?=E8=A1=A8=E9=9D=A2=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=9B=9E=E9=80=80=E5=86=8D=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=B0=83=E6=8B=A8=E5=8D=95=E6=8A=A5=E9=94=99?=
 =?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/stock.py | 85 +++++++++++++++++---------------
 1 file changed, 46 insertions(+), 39 deletions(-)

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 4aba2693..d43dc0b7 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -657,52 +657,59 @@ class StockPicking(models.Model):
             if move_out:
                 workorder = move_out.subcontract_workorder_id
                 workorder.button_start()
+        # if self.location_id.name == '成品存货区' and self.location_dest_id == '客户':
+        #     sale_id = self.env['sale.order'].sudo().search(
+        #         [('name', '=', self.origin)])
+        #     if sale_id:
+        #         sale_id.write({'state':'delivered'})
         return res
 
     # 创建 外协出库入单
     def create_outcontract_picking(self, workorders, item, sorted_workorders):
         for workorder in workorders:
             if workorder.move_subcontract_workorder_ids:
-                workorder.move_subcontract_workorder_ids.write({'state': 'waiting'})
-                workorder.move_subcontract_workorder_ids.picking_id.write({'state': 'waiting'})
+                workorder.move_subcontract_workorder_ids.write({'state': 'cancel'})
+                workorder.move_subcontract_workorder_ids.picking_id.write({'state': 'cancel'})
+            # 创建一个新的补货组
+            procurement_group_id = self.env['procurement.group'].create({
+                'name': workorder.name,
+                'partner_id': self.partner_id.id,
+            })
+            move_dest_id = False
+            # 如果当前工单是是制造订单的最后一个工艺外协工单
+            if workorder == next((workorder for workorder in reversed(sorted_workorders) if workorder.is_subcontract), None):
+                move_dest_id = item.move_raw_ids[0].id
             else:
-                # 创建一个新的补货组
-                procurement_group_id = self.env['procurement.group'].create({
-                    'name': workorder.name,
-                    'partner_id': self.partner_id.id,
-                })
-                move_dest_id = False
-                # 如果当前工单是是制造订单的最后一个工艺外协工单
-                if workorder == next((workorder for workorder in reversed(item.workorder_ids) if workorder.is_subcontract), None):
-                    move_dest_id = item.move_raw_ids[0].id
-                else:
-                    # 从sorted_workorders中找到上一工单的move
-                    if len(sorted_workorders) > 1:
-                        move_dest_id = sorted_workorders[sorted_workorders.index(workorder)+1].move_subcontract_workorder_ids[1].id
-                new_picking = True
-                outcontract_picking_type_in = self.env.ref(
-                    'sf_manufacturing.outcontract_picking_in').id,
-                outcontract_picking_type_out = self.env.ref(
-                    'sf_manufacturing.outcontract_picking_out').id,
-                moves_in = self.env['stock.move'].sudo().create(
-                    self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_in,
-                                                                      procurement_group_id.id, move_dest_id))
-                picking_in = self.create(
-                    moves_in._get_new_picking_values_Res(item, workorder, 'WH/OCIN/'))
-                # pick_ids.append(picking_in.id)
-                moves_in.write(
-                    {'picking_id': picking_in.id, 'state': 'waiting'})
-                moves_in._assign_picking_post_process(new=new_picking)
-                moves_out = self.env['stock.move'].sudo().create(
-                    self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_out,
-                                                                      procurement_group_id.id, moves_in.id))
-                workorder.write({'move_subcontract_workorder_ids': [(6, 0, [moves_in.id, moves_out.id])]})
-                picking_out = self.create(
-                    moves_out._get_new_picking_values_Res(item, workorder, 'WH/OCOUT/'))
-                # pick_ids.append(picking_out.id)
-                moves_out.write(
-                    {'picking_id': picking_out.id, 'state': 'waiting'})
-                moves_out._assign_picking_post_process(new=new_picking)
+                # 从sorted_workorders中找到上一工单的move
+                if len(sorted_workorders) > 1:
+                    move_dest_id = sorted_workorders[sorted_workorders.index(workorder)+1].move_subcontract_workorder_ids[1].id
+            new_picking = True
+            outcontract_picking_type_in = self.env.ref(
+                'sf_manufacturing.outcontract_picking_in').id,
+            outcontract_picking_type_out = self.env.ref(
+                'sf_manufacturing.outcontract_picking_out').id,
+            moves_in = self.env['stock.move'].sudo().create(
+                self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_in,
+                                                                  procurement_group_id.id, move_dest_id))
+            picking_in = self.create(
+                moves_in._get_new_picking_values_Res(item, workorder, 'WH/OCIN/'))
+            # pick_ids.append(picking_in.id)
+            moves_in.write(
+                {'picking_id': picking_in.id, 'state': 'waiting'})
+            moves_in._assign_picking_post_process(new=new_picking)
+            moves_out = self.env['stock.move'].sudo().create(
+                self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_out,
+                                                                  procurement_group_id.id, moves_in.id))
+            workorder.write({'move_subcontract_workorder_ids': [(6, 0, [moves_in.id, moves_out.id])]})
+            picking_out = self.create(
+                moves_out._get_new_picking_values_Res(item, workorder, 'WH/OCOUT/'))
+            # pick_ids.append(picking_out.id)
+            moves_out.write(
+                {'picking_id': picking_out.id, 'state': 'waiting'})
+            moves_out._assign_picking_post_process(new=new_picking)
+
+
+
 
     @api.depends('move_type', 'immediate_transfer', 'move_ids.state', 'move_ids.picking_id')
     def _compute_state(self):

From 8b40714daddc1f499dc7a6aa1e39e49bf20f543a Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Sat, 28 Dec 2024 14:55:17 +0800
Subject: [PATCH 079/147] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index d43dc0b7..e0e0782f 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -657,11 +657,11 @@ class StockPicking(models.Model):
             if move_out:
                 workorder = move_out.subcontract_workorder_id
                 workorder.button_start()
-        # if self.location_id.name == '成品存货区' and self.location_dest_id == '客户':
-        #     sale_id = self.env['sale.order'].sudo().search(
-        #         [('name', '=', self.origin)])
-        #     if sale_id:
-        #         sale_id.write({'state':'delivered'})
+        if self.location_id.name == '成品存货区' and self.location_dest_id.name == '客户':
+            sale_id = self.env['sale.order'].sudo().search(
+                [('name', '=', self.origin)])
+            if sale_id and all(move.product_uom_qty == move.quantity_done for move in self.move_ids):
+                sale_id.write({'state':'delivered'})
         return res
 
     # 创建 外协出库入单

From a3a2c96d00f7b8e4eeafd7c4b444859fa845772f Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 30 Dec 2024 08:57:05 +0800
Subject: [PATCH 080/147] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B4=A7=E6=80=A5?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py          | 3 +++
 sf_sale/views/purchase_order_view.xml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index b00299f4..c16a2b06 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -292,6 +292,9 @@ class RePurchaseOrder(models.Model):
     # 合同概况
     contract_summary = fields.Text(string='合同概况')
 
+    # 选择是否为紧急采购
+    urgent_purchase = fields.Selection([('no', '否'), ('yes', '是')], string='紧急采购', default='no')
+
     @api.depends('origin')
     def _compute_purchase_type(self):
         for purchase in self:
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index d58d3753..3b3353bb 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -181,6 +181,7 @@
                 <field name="partner_id" position="after">
                     <field name="purchase_type" string="采购类型" readonly="1"/>
                     <field name="picking_type_id" string="作业类型" domain="[('code','=','incoming'), '|', ('warehouse_id', '=', False), ('warehouse_id.company_id', '=', company_id)]" options="{'no_create': True}" groups="stock.group_stock_multi_locations"/>
+                    <field name="urgent_purchase"/>
                     <label for="date_planned" string="最近交货日期"/>
                     <div name="date_planned_div" class="o_row">
                         <field name="date_planned" attrs="{'readonly': [('state', 'not in', ('draft', 'sent', 'to approve', 'purchase'))]}"/>

From ab5b4c477f6f71e361154c15acc0e35fdad170cb Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 30 Dec 2024 09:33:00 +0800
Subject: [PATCH 081/147] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9B=B6=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0,=E9=9B=B6=E4=BB=B6=E5=9B=BE=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quality_control/models/quality.py       | 41 +++++++++++++++++++++++++
 quality_control/views/quality_views.xml | 10 ++++++
 2 files changed, 51 insertions(+)

diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py
index ebe73384..7356590a 100644
--- a/quality_control/models/quality.py
+++ b/quality_control/models/quality.py
@@ -152,6 +152,34 @@ class QualityCheck(models.Model):
     is_lot_tested_fractionally = fields.Boolean(related='point_id.is_lot_tested_fractionally')
     testing_percentage_within_lot = fields.Float(related="point_id.testing_percentage_within_lot")
     product_tracking = fields.Selection(related='product_id.tracking')
+    quality_check_type = fields.Selection([
+        ('采购入库检', '采购入库检'),
+        ('客供料入库检', '客供料入库检'),
+        ('退货入库检', '退货入库检'),
+        ('生产入库检', '生产入库检'),
+        ('外协入库检', '外协入库检'),
+        ('成品发货检', '成品发货检'),
+        ('工序外协发货检', '工序外协发货检'),
+        ('委外坯料发货检', '委外坯料发货检')], string='类型', compute='_compute_quality_check_type', store=True)
+
+    @api.depends('picking_id')
+    def _compute_quality_check_type(self):
+        for check in self:
+            if check.picking_id:
+                picking_type = check.picking_id.picking_type_id.sequence_code
+                type_mapping = {
+                    'IN': '采购入库检',
+                    'DL': '客供料入库检',
+                    'RET': '退货入库检',
+                    'SFP': '生产入库检',
+                    'OCIN': '外协入库检',
+                    'OUT': '成品发货检',
+                    'OCOUT': '工序外协发货检',
+                    'RES': '委外坯料发货检',
+                }
+                check.quality_check_type = type_mapping.get(picking_type, False)
+            else:
+                check.quality_check_type = False
 
     @api.depends('measure_success')
     def _compute_warning_message(self):
@@ -294,6 +322,19 @@ class QualityAlert(models.Model):
     _inherit = "quality.alert"
 
     title = fields.Char('Title')
+    part_number = fields.Char(string='零件图号', compute='_compute_part_info', store=True)
+    part_name = fields.Char(string='零件名称', compute='_compute_part_info', store=True)
+
+    @api.depends('product_id', 'picking_id')
+    def _compute_part_info(self):
+        for alert in self:
+            if alert.product_tmpl_id.categ_id.name == '成品':
+                alert.part_number = alert.product_id.part_number
+                alert.part_name = alert.product_id.part_name
+            elif alert.product_id.categ_id.name == '坯料':
+                if alert.picking_id.move_ids_without_package:
+                    alert.part_number = alert.picking_id.move_ids_without_package[0].part_number
+                    alert.part_name = alert.picking_id.move_ids_without_package[0].part_name
 
     def action_see_check(self):
         return {
diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml
index 8e5af75a..3c483a9f 100644
--- a/quality_control/views/quality_views.xml
+++ b/quality_control/views/quality_views.xml
@@ -90,6 +90,8 @@
                             <field name="lot_id" context="{'default_product_id': product_id}"
                                    groups="stock.group_production_lot"/>
                             <field name="picking_id"/>
+                            <field name="part_name"/>
+                            <field name="part_number"/>
                         </group>
                         <group>
                             <field name="team_id"/>
@@ -150,6 +152,10 @@
             <field name="date_assign" position="after">
                 <field name="company_id" groups="base.main_company"/>
             </field>
+            <field name="product_tmpl_id" position="after">
+                <field name="part_name" optional="show"/>
+                <field name="part_number" optional="show"/>
+            </field>
         </field>
     </record>
 
@@ -446,6 +452,10 @@
                     <filter string="Control Point" name="groupby_point_id" context="{'group_by': 'point_id'}"/>
                     <filter string="Team" name="groupby_team_id" context="{'group_by': 'team_id'}"/>
                 </group>
+                <searchpanel>
+                    <field name="quality_check_type" icon="fa-filter" enable_counters="1"/>
+                    <field name="quality_state" icon="fa-filter" enable_counters="1"/>
+                </searchpanel>
             </search>
         </field>
     </record>

From ee6e457bbd11c63e0a7664187a4f85736f919913 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Mon, 30 Dec 2024 09:38:51 +0800
Subject: [PATCH 082/147] =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E4=B8=8E=E5=88=B6=E9=80=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=BF=9B=E8=A1=8C=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/purchase_order.py     | 33 +++++++++++++++++++
 .../views/purchase_order_view.xml             | 12 +++++++
 2 files changed, 45 insertions(+)

diff --git a/sf_manufacturing/models/purchase_order.py b/sf_manufacturing/models/purchase_order.py
index 607f64d1..3b1a54f1 100644
--- a/sf_manufacturing/models/purchase_order.py
+++ b/sf_manufacturing/models/purchase_order.py
@@ -10,6 +10,39 @@ from odoo.tools import OrderedSet
 # _get_surface_technics_purchase_ids
 class PurchaseOrder(models.Model):
     _inherit = 'purchase.order'
+    production_count = fields.Integer(
+        "关联制造订单",
+        compute='_compute_workorder_count',
+        )
+
+    def action_view_production(self):
+        origins = [order.name for order in self.picking_ids]
+        production_id = self.env['mrp.production'].search([('origin', 'in', origins)])
+        if not production_id:
+            return
+        action = {
+            'res_model': 'mrp.production',
+            'type': 'ir.actions.act_window',
+        }
+        if len(production_id) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': production_id.id,
+            })
+        else:
+            action.update({
+                'name': _("制造订单列表"),
+                'domain': [('id', 'in', production_id.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
+
+    def _compute_workorder_count(self):
+        for purchase in self:
+            origins = [order.name for order in purchase.picking_ids]
+            production_id = self.env['mrp.production'].search([('origin', 'in', origins)])
+            purchase.production_count = len(production_id)
     def button_confirm(self):
         super().button_confirm()
         workorders = self.env['mrp.workorder'].search([('purchase_id', '=', self.id)])
diff --git a/sf_manufacturing/views/purchase_order_view.xml b/sf_manufacturing/views/purchase_order_view.xml
index af1efcfc..83562f2c 100644
--- a/sf_manufacturing/views/purchase_order_view.xml
+++ b/sf_manufacturing/views/purchase_order_view.xml
@@ -10,6 +10,18 @@
                     <field name="related_product" optional="show"/>
                     <field name="part_number" optional="show"/>
                 </xpath>
+                <xpath expr="//sheet//div[@class='oe_button_box']" position="inside">
+                    <button class="oe_stat_button" name="action_view_production" type="object" icon="fa-wrench"
+                            attrs="{'invisible': [('production_count', '=', 0)]}"
+                            >
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_value">
+                                <field name="production_count"/>
+                            </span>
+                            <span class="o_stat_text">制造订单</span>
+                        </div>
+                    </button>
+                </xpath>
             </field>
         </record>
     </data>

From f3e08f5cccec9a893310e90cd1c093e4506bb97c Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 30 Dec 2024 09:43:20 +0800
Subject: [PATCH 083/147] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9B=B6=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0,=E9=9B=B6=E4=BB=B6=E5=9B=BE=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/__manifest__.py            |  2 +-
 sf_manufacturing/models/stock.py              | 75 ++++++++++++-------
 sf_manufacturing/views/stock_picking_view.xml | 17 ++++-
 sf_warehouse/models/model.py                  |  2 +-
 4 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/sf_machine_connect/__manifest__.py b/sf_machine_connect/__manifest__.py
index 48857914..50a157d4 100644
--- a/sf_machine_connect/__manifest__.py
+++ b/sf_machine_connect/__manifest__.py
@@ -25,7 +25,7 @@
         # 只有它被屏蔽了
         # 'views/SfWorkOrderBarcodes.xml',
         'views/WorkCenterBarcodes.xml',
-        'views/Stock_picking_Barcodes.xml',
+        # 'views/Stock_picking_Barcodes.xml',
         'views/machine_monitor.xml',
         'views/machine_info_present.xml',
         'views/delivery_record.xml',
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 6506cc1a..6c70c245 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -588,40 +588,33 @@ class StockPicking(models.Model):
     address_of_delivery = fields.Char('联系地址', compute='_compute_move_ids', store=True)
 
     retrospect_ref = fields.Char('追溯参考', compute='_compute_move_ids', store=True)
-
+    sale_order_id = fields.Many2one('sale.order', '销售单号', compute='_compute_move_ids', store=True)
     picking_type_sequence_code = fields.Char(related='picking_type_id.sequence_code')
 
     @api.depends('move_ids', 'move_ids.product_id')
     def _compute_move_ids(self):
         for item in self:
             if item.move_ids:
-                if item.picking_type_id.sequence_code == 'DL':
-                    sale_name = item.move_ids[0].product_id.name.split('-')[1]
-                    if 'S' in sale_name:
-                        sale_id = self.env['sale.order'].sudo().search([('name', '=', sale_name)])
-                        item.person_of_delivery = sale_id.person_of_delivery
-                        item.telephone_of_delivery = sale_id.telephone_of_delivery
-                        item.address_of_delivery = sale_id.address_of_delivery
+                product_id = item.move_ids[0].product_id
+                if product_id:
+                    sale_info = None
+                    if product_id.categ_id.type == '坯料' and product_id.name.startswith('R-S'):
+                        parts = product_id.name.split('-')
+                        if len(parts) >= 3:
+                            sale_name = parts[1]
+                            sale_info = self.env['sale.order'].sudo().search(
+                                [('name', '=', sale_name)])
                     else:
-                        raise ValidationError('坯料名称格式错误，正确格式为[R-S???-?]！！！')
-                    move_ids = []
-                    for move_id in item.move_ids:
-                        move_ids.append(move_id.product_id.id)
-                    boms = self.env['mrp.bom'].sudo().search([('bom_line_ids.product_id', 'in', move_ids)])
-                    if boms:
-                        codes_list = []
-                        for bom in boms:
-                            if bom.product_tmpl_id.default_code:
-                                code_list = bom.product_tmpl_id.default_code.split('-')
-                                if len(code_list) >= 4:
-                                    code = '-'.join(code_list[:4])
-                                    if code not in codes_list:
-                                        codes_list.append(code)
-                                else:
-                                    raise ValidationError('坯料成品的内部参考值格式错误')
-                        item.retrospect_ref = ','.join(codes_list)
-                elif item.picking_type_id.sequence_code in ['INT', 'PC']:
-                    pass
+                        production_list = self.env['mrp.production'].sudo().search(
+                            [('product_id', '=', product_id.id)])
+                        if production_list:
+                            sale_info = production_list[0].sale_order_id
+                    if sale_info:
+                        item.sale_order_id = sale_info.id
+                        if item.picking_type_id.sequence_code == 'DL':
+                            item.person_of_delivery = sale_info.person_of_delivery
+                            item.telephone_of_delivery = sale_info.telephone_of_delivery
+                            item.address_of_delivery = sale_info.address_of_delivery
 
     # 设置外协出入单的名称
     def _get_name_Res(self, rescode):
@@ -727,6 +720,34 @@ class ReStockMove(models.Model):
     materiel_length = fields.Float(string='物料长度', digits=(16, 4))
     materiel_width = fields.Float(string='物料宽度', digits=(16, 4))
     materiel_height = fields.Float(string='物料高度', digits=(16, 4))
+    part_number = fields.Char(string='零件图号', compute='_compute_part_info', store=True)
+    part_name = fields.Char(string='零件名称', compute='_compute_part_info', store=True)
+
+    @api.depends('product_id')
+    def _compute_part_info(self):
+        for move in self:
+            if move.product_id.categ_id.type == '成品':
+                move.part_number = move.product_id.part_number
+                move.part_name = move.product_id.part_name
+            elif move.product_id.categ_id.type == '坯料':
+                if move.origin:
+                    origin = move.origin.split(',')[0] if ',' in move.origin else move.origin
+                    mrp_productio_info = self.env['mrp.production'].sudo().search(
+                        [('name', '=', origin)])
+                    if mrp_productio_info:
+                        move.part_number = mrp_productio_info.part_number
+                        move.part_name = mrp_productio_info.part_name
+                    else:
+                        purchase_order_info = self.env['purchase.order'].sudo().search(
+                            [('name', '=', origin)])
+                        if purchase_order_info:
+                            mrp_production_ids = purchase_order_info._get_mrp_productions().ids
+                            if mrp_production_ids:
+                                mrp_productio_info = self.env['mrp.production'].sudo().search(
+                                    [('id', '=', mrp_production_ids[0])])
+                                if mrp_productio_info:
+                                    move.part_number = mrp_productio_info.part_number
+                                    move.part_name = mrp_productio_info.part_name
 
     def _get_stock_move_values_Res(self, item, picking_type_id, group_id, move_dest_ids=False):
         route_id = self.env.ref('sf_manufacturing.route_surface_technology_outsourcing').id
diff --git a/sf_manufacturing/views/stock_picking_view.xml b/sf_manufacturing/views/stock_picking_view.xml
index 30264f89..8b6fc571 100644
--- a/sf_manufacturing/views/stock_picking_view.xml
+++ b/sf_manufacturing/views/stock_picking_view.xml
@@ -17,6 +17,9 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='origin']" position="after">
+                    <field name="sale_order_id"/>
+                </xpath>
                 <xpath expr="//field[@name='user_id']" position="after">
                     <field name="picking_type_sequence_code" invisible="1"/>
                     <field name="retrospect_ref"
@@ -26,6 +29,10 @@
                            attrs="{'invisible':[('picking_type_sequence_code','!=','DL')]}"/>
                     <field name="address_of_delivery" attrs="{'invisible':[('picking_type_sequence_code','!=','DL')]}"/>
                 </xpath>
+                <xpath expr="//field[@name='product_id']" position="after">
+                    <field name="part_number" optional="show"/>
+                    <field name="part_name" optional="show"/>
+                </xpath>
             </field>
         </record>
 
@@ -34,6 +41,9 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.vpicktree"/>
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='origin']" position="before">
+                    <field name="sale_order_id" string="销售单号"/>
+                </xpath>
                 <xpath expr="//field[@name='origin']" position="after">
                     <field name="retrospect_ref"/>
                 </xpath>
@@ -45,8 +55,13 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_internal_search"/>
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='name']" position="replace">
+                    <field name="name"/>
+                    <field name="retrospect_ref"/>
+                    <field name="sale_order_id" string="销售单号"/>
+                </xpath>
                 <xpath expr="//filter[@name='picking_type']" position="after">
-                    <filter string="追溯参考" name="retrospect_ref" domain="[]"
+                    <filter string="追溯参考" name="retrospect" domain="[]"
                             context="{'group_by': 'retrospect_ref'}"/>
                 </xpath>
             </field>
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index 30024239..79881920 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -1123,7 +1123,7 @@ class SfPickingType(models.Model):
         if not self.env.user.has_group('base.group_system'):
             action['context']['create'] = False
         if self.sequence_code in ['DL', 'INT', 'PC']:
-            action['context']['search_default_retrospect_ref'] = 1
+            action['context']['search_default_retrospect'] = 1
         return action
 
 

From 676f8eb7eb8a99ea2d540977c949593171496060 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 30 Dec 2024 09:52:32 +0800
Subject: [PATCH 084/147] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=9A=84=E8=A7=A3=E7=BB=91=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=97=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E6=89=98=E7=9B=98=E7=8A=B6=E6=80=81=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B2?=
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, 3 insertions(+)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 410f8d1b..ef2c654b 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1464,6 +1464,9 @@ class ResMrpWorkOrder(models.Model):
             'tray_type_id': False,
             'tray_model_id': False,
             'is_trayed': False})
+        for item in self:
+            self.env['stock.lot'].sudo().search([('rfid', '=', item.rfid_code)]).write({
+                'tool_material_status': '可用'})
 
     # 将FTP的检测报告文件下载到临时目录
     def download_reportfile_tmp(self, workorder, reportpath):

From 4e7993d035abee4113752be9b67d8138460774d3 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 30 Dec 2024 09:56:49 +0800
Subject: [PATCH 085/147] =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E5=8F=82=E8=80=83?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/stock.py              | 1 +
 sf_manufacturing/views/stock_picking_view.xml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 6c70c245..48907a82 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -611,6 +611,7 @@ class StockPicking(models.Model):
                             sale_info = production_list[0].sale_order_id
                     if sale_info:
                         item.sale_order_id = sale_info.id
+                        item.retrospect_ref = sale_info.order_code
                         if item.picking_type_id.sequence_code == 'DL':
                             item.person_of_delivery = sale_info.person_of_delivery
                             item.telephone_of_delivery = sale_info.telephone_of_delivery
diff --git a/sf_manufacturing/views/stock_picking_view.xml b/sf_manufacturing/views/stock_picking_view.xml
index 8b6fc571..6c268b82 100644
--- a/sf_manufacturing/views/stock_picking_view.xml
+++ b/sf_manufacturing/views/stock_picking_view.xml
@@ -17,6 +17,9 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='backorder_id']" position="after">
+                    <field name="retrospect_ref"/>
+                </xpath>
                 <xpath expr="//field[@name='origin']" position="after">
                     <field name="sale_order_id"/>
                 </xpath>

From b35f84291509894b02bcfa9920415b1d0d7833bb Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 30 Dec 2024 09:57:36 +0800
Subject: [PATCH 086/147] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E8=A7=A3=E7=BB=91=E4=BF=AE=E6=94=B9=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index ef2c654b..d121bae8 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1456,6 +1456,9 @@ class ResMrpWorkOrder(models.Model):
 
     # 解绑托盘
     def unbind_tray(self):
+        for item in self:
+            self.env['stock.lot'].sudo().search([('rfid', '=', item.rfid_code)]).write(
+                {'tool_material_status': '可用'})
         self.production_id.workorder_ids.write({
             'rfid_code': False,
             'tray_serial_number': False,
@@ -1464,9 +1467,6 @@ class ResMrpWorkOrder(models.Model):
             'tray_type_id': False,
             'tray_model_id': False,
             'is_trayed': False})
-        for item in self:
-            self.env['stock.lot'].sudo().search([('rfid', '=', item.rfid_code)]).write({
-                'tool_material_status': '可用'})
 
     # 将FTP的检测报告文件下载到临时目录
     def download_reportfile_tmp(self, workorder, reportpath):

From 993d720c404b0d6b6333fa7543bba4c3f355f8fc Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 30 Dec 2024 10:01:43 +0800
Subject: [PATCH 087/147] =?UTF-8?q?sf-=E9=87=87=E8=B4=AD=E8=AF=A2=E4=BB=B7?=
 =?UTF-8?q?=E5=8D=95=E3=80=90=E4=B8=8A=E4=BC=A0=E5=90=88=E5=90=8C=E3=80=91?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=B1=95=E7=A4=BA=E6=9D=A1=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jikimo_purchase_tier_validation/views/views.xml b/jikimo_purchase_tier_validation/views/views.xml
index 6d6995ef..765603c8 100644
--- a/jikimo_purchase_tier_validation/views/views.xml
+++ b/jikimo_purchase_tier_validation/views/views.xml
@@ -16,7 +16,7 @@
                 <xpath expr="//header/button[@name='action_rfq_send'][1]" position="before">
                     <field name="validation_status" invisible="1"/>
                     <field name="is_upload_contract_file" invisible="1"/>
-                    <button name="upload_contract_file" string="上传合同" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('validation_status', '!=', 'no'), ('is_upload_contract_file', '=', True)]}"/>
+                    <button name="upload_contract_file" string="上传合同" type="object" class="oe_highlight" attrs="{'invisible': ['|', '|', ('validation_status', '!=', 'no'), ('is_upload_contract_file', '=', True), ('state', 'not in', ['draft', 'sent'])]}"/>]}"/>
                     <button name="delete_contract_file" string="删除合同" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('validation_status', '!=', 'no'), ('is_upload_contract_file', '=', False)]}"/>
                 </xpath>
                 <xpath expr="//notebook/page[1]" position="before">

From ce4fc8b8ab92234fe9d6171472442d5d17b80516 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Mon, 30 Dec 2024 10:29:29 +0800
Subject: [PATCH 088/147] =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=B0=83=E6=8B=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index 4e8e5af6..3ffd3d9b 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -943,6 +943,8 @@ class SfStockPicking(models.Model):
         for record in self:
             if record.state != 'assigned':
                 continue
+            for move in record.move_ids:
+                move.action_show_details()
             record.action_set_quantities_to_reservation()
             record.button_validate()
 

From 3555be86c6a8068a3644e9bcdd838d2039e0fcbf Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 30 Dec 2024 11:35:08 +0800
Subject: [PATCH 089/147] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quality_control/__manifest__.py           |  2 +-
 sf_manufacturing/models/mrp_production.py | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/quality_control/__manifest__.py b/quality_control/__manifest__.py
index d8dc1ed2..59fbbb98 100644
--- a/quality_control/__manifest__.py
+++ b/quality_control/__manifest__.py
@@ -8,7 +8,7 @@
     'sequence': 120,
     'summary': 'Control the quality of your products',
     'website': 'https://www.odoo.com/app/quality',
-    'depends': ['quality'],
+    'depends': ['quality', 'sf_manufacturing'],
     'description': """
 Quality Control
 ===============
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 4d8f11df..b213a456 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1619,6 +1619,26 @@ class MrpProduction(models.Model):
             })
         return action
 
+    def _subcontract_sanity_check(self):
+        for production in self:
+            if production.product_tracking != 'none' and not self.lot_producing_id:
+                raise UserError(_('You must enter a serial number for %s') % production.product_id.name)
+            for sml in production.move_raw_ids.move_line_ids:
+                if sml.tracking != 'none' and not sml.lot_id:
+                    picking_ids = production.picking_ids.filtered(
+                        lambda p: p.state not in ['done', 'cancel'])
+                    picking_num = len(picking_ids)
+                    picking_info = ', '.join(
+                        ['%s:%s' % (picking.picking_type_id.name, picking.name) for picking in picking_ids]
+                    )
+                    if picking_info:
+                        raise UserError(_('您有%s补给未完成: %s') % (
+                            picking_num, picking_info))
+                    else:
+                        raise UserError(
+                            _('您必须为以下各%s行输入序列号') % sml.product_id.display_name)
+        return True
+
 
 class sf_detection_result(models.Model):
     _name = 'sf.detection.result'

From 854c3ceef285d8d9ec9b718938c76b99fba40267 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 30 Dec 2024 13:51:31 +0800
Subject: [PATCH 090/147] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index b213a456..c68a41d6 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1622,7 +1622,7 @@ class MrpProduction(models.Model):
     def _subcontract_sanity_check(self):
         for production in self:
             if production.product_tracking != 'none' and not self.lot_producing_id:
-                raise UserError(_('You must enter a serial number for %s') % production.product_id.name)
+                raise UserError(_('您必须为以下各%s行输入序列号') % production.product_id.name)
             for sml in production.move_raw_ids.move_line_ids:
                 if sml.tracking != 'none' and not sml.lot_id:
                     picking_ids = production.picking_ids.filtered(

From f084b5d7657f8352222cb3d327a10da8b9db4308 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 30 Dec 2024 14:12:54 +0800
Subject: [PATCH 091/147] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index c68a41d6..0e431347 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1622,7 +1622,7 @@ class MrpProduction(models.Model):
     def _subcontract_sanity_check(self):
         for production in self:
             if production.product_tracking != 'none' and not self.lot_producing_id:
-                raise UserError(_('您必须为以下各%s行输入序列号') % production.product_id.name)
+                raise UserError(_('您必须为%s输入一个序列号。') % production.product_id.name)
             for sml in production.move_raw_ids.move_line_ids:
                 if sml.tracking != 'none' and not sml.lot_id:
                     picking_ids = production.picking_ids.filtered(

From f1868168af54cbe12a6c5366a81df10805a82828 Mon Sep 17 00:00:00 2001
From: hy <123@qq.com>
Date: Mon, 30 Dec 2024 14:38:45 +0800
Subject: [PATCH 092/147] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=9A=E8=AE=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=A1=A8=E5=A4=B4=E5=B0=91=E4=BA=86=E5=88=97?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/js/custom_form_status_indicator.js    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
index 46e3ad70..1e39b719 100644
--- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js
+++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
@@ -139,6 +139,7 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
         owl.onMounted(() => {
             this.activeElement = this.uiService.activeElement;
             this.setRequired()
+            this.listherHeaderBodyNum()
         })
         return this._super(...arguments);
     },
@@ -165,6 +166,25 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
         } catch (e) {
             console.log(e)
         }
+    },
+    listherHeaderBodyNum() {
+        const dom = this.tableRef.el
+        try {
+            const thead = $(dom).children('thead')
+            const tbody = $(dom).children('tbody')
+            const thead_tr = thead.children().eq(0)
+            const tbody_tr = tbody.children().eq(0)
+            const thead_th_num = thead_tr.children().length
+            const tbody_tr_num = tbody_tr.children().length
+            const num = thead_th_num - tbody_tr_num
+            console.log('num', num);
+            if(num == -1) {
+                thead_tr.prepend('<td>序号</td>')
+            }
+
+        } catch (e) {
+            console.log(e)
+        }
     }
 })
 

From 9f3b351544802e3d1d886c09a9dc52ef3d684a44 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Mon, 30 Dec 2024 15:25:20 +0800
Subject: [PATCH 093/147] =?UTF-8?q?sf-=E5=B7=A5=E5=BA=8F=E5=A4=96=E5=8D=8F?=
 =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=8D=95-=E5=A4=96=E5=8D=8F=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=A4=9A=E7=94=9F=E6=88=90=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E5=BC=A0=E5=A4=96=E5=8D=8F=E5=87=BA=E5=BA=93=E8=B0=83=E6=8B=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/purchase_order.py       | 2 +-
 sf_manufacturing/models/sf_technology_design.py | 1 -
 sf_sale/models/sale_order.py                    | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sf_manufacturing/models/purchase_order.py b/sf_manufacturing/models/purchase_order.py
index 3b1a54f1..fc8a96b1 100644
--- a/sf_manufacturing/models/purchase_order.py
+++ b/sf_manufacturing/models/purchase_order.py
@@ -45,7 +45,7 @@ class PurchaseOrder(models.Model):
             purchase.production_count = len(production_id)
     def button_confirm(self):
         super().button_confirm()
-        workorders = self.env['mrp.workorder'].search([('purchase_id', '=', self.id)])
+        workorders = self.env['mrp.workorder'].search([('purchase_id', '=', self.id),('state', '!=', 'cancel')])
         for workorder in workorders:
             if workorder.routing_type == '表面工艺' and  workorder.is_subcontract is True:
                 move_out = workorder.move_subcontract_workorder_ids[1]
diff --git a/sf_manufacturing/models/sf_technology_design.py b/sf_manufacturing/models/sf_technology_design.py
index 15d2c22d..826c147d 100644
--- a/sf_manufacturing/models/sf_technology_design.py
+++ b/sf_manufacturing/models/sf_technology_design.py
@@ -36,7 +36,6 @@ class sf_technology_design(models.Model):
         return workorders_values_str
 
     def write(self, vals):
-        print('qwfojkqwfkio')
         return super(sf_technology_design, self).write(vals)
     def unlink_technology_design(self):
         self.active = False
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index c16a2b06..c9c06b9b 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -364,6 +364,7 @@ class RePurchaseOrder(models.Model):
             purchase_order = pp._get_surface_technics_purchase_ids()
             if purchase_order:
                 purchase_order.write({'state': 'draft'})
+                pp.purchase_id = [(6, 0, [purchase_order.id])]
             else:
                 server_template = self.env['product.template'].search(
                     [('server_product_process_parameters_id', '=', pp.surface_technics_parameters_id.id),

From 3060b35ab2932a5b420233862334c43637d06cc6 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Mon, 30 Dec 2024 15:38:43 +0800
Subject: [PATCH 094/147] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index c874cbc2..1d880d66 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -654,7 +654,10 @@ class StockPicking(models.Model):
         if self.location_id.name == '成品存货区' and self.location_dest_id.name == '客户':
             sale_id = self.env['sale.order'].sudo().search(
                 [('name', '=', self.origin)])
-            if sale_id and all(move.product_uom_qty == move.quantity_done for move in self.move_ids):
+            check_backorder = self._pre_action_done_hook()
+            if check_backorder is not True:
+                return res
+            if sale_id:
                 sale_id.write({'state':'delivered'})
         return res
 

From c82db7159dae394da6ce186b18c38d6f8b4b3e67 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 30 Dec 2024 15:50:25 +0800
Subject: [PATCH 095/147] =?UTF-8?q?sf-=E8=AF=A2=E4=BB=B7=E5=8D=95-?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E5=8F=8A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=A1=E6=89=B9=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/models/models.py | 3 ++-
 jikimo_purchase_tier_validation/views/views.xml  | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index bb90a894..5c20f2ba 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -21,7 +21,8 @@ class jikimo_purchase_tier_validation(models.Model):
     def button_confirm(self):
         for record in self:
             if record.need_validation and record.validation_status != 'validated':
-                raise ValidationError(_('请先完成审批！'))
+                raise ValidationError(_('此操作需要至少对一条记录进行审批。'
+                                        '请发起审批申请。'))
         return super().button_confirm()
 
     # def button_confirm(self):
diff --git a/jikimo_purchase_tier_validation/views/views.xml b/jikimo_purchase_tier_validation/views/views.xml
index 765603c8..ca82e729 100644
--- a/jikimo_purchase_tier_validation/views/views.xml
+++ b/jikimo_purchase_tier_validation/views/views.xml
@@ -8,6 +8,10 @@
             <field name="arch" type="xml">
                 <xpath expr="//header/button[@name='button_cancel']" position="replace">
                 </xpath>
+                <xpath expr="//header/field[@name='state']" position="replace">
+                    <field name="state" widget="statusbar" statusbar_visible="draft,sent,to approve, approved, purchase" readonly="1"/>
+                </xpath>
+
 
                 <xpath expr="//header/button[last()]" position="after">
                     <button name="button_cancel" states="draft,to approve,sent,purchase" string="取消" type="object" data-hotkey="x" />

From 1e1bd63acf7569541000e0b76e5da4714b9c9fa8 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 30 Dec 2024 16:03:46 +0800
Subject: [PATCH 096/147] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/models/models.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 5c20f2ba..9077ee22 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -21,8 +21,7 @@ class jikimo_purchase_tier_validation(models.Model):
     def button_confirm(self):
         for record in self:
             if record.need_validation and record.validation_status != 'validated':
-                raise ValidationError(_('此操作需要至少对一条记录进行审批。'
-                                        '请发起审批申请。'))
+                raise ValidationError(_('此操作需要至少对一条记录进行审批。\n请发起审批申请。'))
         return super().button_confirm()
 
     # def button_confirm(self):

From 5928456ffea4b545f47060f196ba56d4b3d9f34c Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 30 Dec 2024 16:19:17 +0800
Subject: [PATCH 097/147] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/i18n/zh_CN.po            | 21 +++++++++++++++++++++
 sf_manufacturing/models/mrp_production.py |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 sf_manufacturing/i18n/zh_CN.po

diff --git a/sf_manufacturing/i18n/zh_CN.po b/sf_manufacturing/i18n/zh_CN.po
new file mode 100644
index 00000000..a3e8e67e
--- /dev/null
+++ b/sf_manufacturing/i18n/zh_CN.po
@@ -0,0 +1,21 @@
+#. module: sf_manufacturing
+#. odoo-python
+#: code:addons/sf_manufacturing/models/mrp_production.py:0
+#, python-format
+msgid "You must enter a serial number for %s"
+msgstr "您必须为%s输入一个序列号。"
+
+
+#. module: sf_manufacturing
+#. odoo-python
+#: code:addons/sf_manufacturing/models/mrp_production.py:0
+#, python-format
+msgid "You must enter a serial number for each line of %s"
+msgstr "您必须为以下各%s行输入序列号"
+
+#. module: sf_manufacturing
+#. odoo-python
+#: code:addons/sf_manufacturing/models/mrp_production.py:0
+#, python-format
+msgid "You have %s incomplete supplies: %s"
+msgstr "您有%s补给未完成: %s"
\ No newline at end of file
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 0e431347..4216442c 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1622,7 +1622,7 @@ class MrpProduction(models.Model):
     def _subcontract_sanity_check(self):
         for production in self:
             if production.product_tracking != 'none' and not self.lot_producing_id:
-                raise UserError(_('您必须为%s输入一个序列号。') % production.product_id.name)
+                raise UserError(_('You must enter a serial number for %s') % production.product_id.name)
             for sml in production.move_raw_ids.move_line_ids:
                 if sml.tracking != 'none' and not sml.lot_id:
                     picking_ids = production.picking_ids.filtered(
@@ -1632,11 +1632,11 @@ class MrpProduction(models.Model):
                         ['%s:%s' % (picking.picking_type_id.name, picking.name) for picking in picking_ids]
                     )
                     if picking_info:
-                        raise UserError(_('您有%s补给未完成: %s') % (
+                        raise UserError(_('You have %s incomplete supplies: %s') % (
                             picking_num, picking_info))
                     else:
                         raise UserError(
-                            _('您必须为以下各%s行输入序列号') % sml.product_id.display_name)
+                            _('You must enter a serial number for each line of %s') % sml.product_id.display_name)
         return True
 
 

From c124e2962c53bcac540d52ce92f01171c41e29d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Mon, 30 Dec 2024 16:32:36 +0800
Subject: [PATCH 098/147] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_frontend/static/src/js/custom_form_status_indicator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
index 1e39b719..52331a1c 100644
--- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js
+++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
@@ -139,7 +139,7 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
         owl.onMounted(() => {
             this.activeElement = this.uiService.activeElement;
             this.setRequired()
-            this.listherHeaderBodyNum()
+            // this.listherHeaderBodyNum()
         })
         return this._super(...arguments);
     },

From d7ce69f474efc3d2bb5dbf0f96465840609515bd Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 30 Dec 2024 17:04:59 +0800
Subject: [PATCH 099/147] =?UTF-8?q?1=E3=80=81=E8=AF=A2=E4=BB=B7=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9B2=E3=80=81=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E5=9D=AF=E6=96=99=E9=87=87=E8=B4=AD=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E5=9D=AF=E6=96=99=E5=A4=96=E5=8D=8F=E5=8D=95=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/purchase_order_view.xml | 32 ++++---------
 sf_stock/models/stock_picking.py      | 68 +++++++++++++++++++++++++++
 sf_stock/views/stock_picking.xml      | 28 +++++++++--
 3 files changed, 103 insertions(+), 25 deletions(-)

diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 3b3353bb..bab28456 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -9,12 +9,16 @@
                 <xpath expr="//header/button[@name='action_view_picking']" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>
+                <xpath expr="//header/button[@name='button_confirm']" position="replace">
+                </xpath>
+                <xpath expr="//header/button[@name='button_confirm']" position="replace">
+                </xpath>
                 <xpath expr="//header/button[@name='action_rfq_send'][1]" position="before">
-                    <button name="button_confirm" type="object" states="sent" string="Confirm Order"
-                            context="{'validate_analytic': True}" class="oe_highlight" id="bid_confirm"
-                            data-hotkey="v"/>
-                    <button name="button_confirm" type="object" states="draft" context="{'validate_analytic': True}"
-                            string="Confirm Order" id="draft_confirm"/>
+                    <button name="button_confirm" type="object" string="确认订单"
+                            context="{'validate_analytic': True}" class="oe_highlight" id="draft_confirm"
+                            groups="sf_base.group_purchase,sf_base.group_purchase_director"
+                            attrs="{'invisible': [('state', 'in', ['purchase', 'done', 'cancel'])]}"
+                    />
                     <button name="action_view_picking"
                             string="接收产品" class="oe_highlight" type="object"
                             attrs="{'invisible': ['|', '|' , ('is_shipped', '=', True), ('state','not in', ('purchase','done')), ('incoming_picking_count', '=', 0)]}"
@@ -25,12 +29,7 @@
                 <xpath expr="//header/button[@name='button_cancel'][2]" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>
-                <xpath expr="//header/button[@name='button_confirm'][3]" position="attributes">
-                    <attribute name="invisible">1</attribute>
-                </xpath>
-                <xpath expr="//header/button[@name='button_confirm'][4]" position="attributes">
-                    <attribute name="invisible">1</attribute>
-                </xpath>
+
 
                 <field name="partner_id" position="replace">
                     <field name="partner_id" widget="res_partner_many2one" context="{'is_supplier': True }"/>
@@ -38,13 +37,6 @@
                 <field name="currency_id" position="after">
                     <field name="remark" attrs="{'readonly': [('state', 'in', ['purchase'])]}" string="订单备注"/>
                 </field>
-                <xpath expr="//form/header/button[@name='button_confirm'][2]" position="replace">
-                    <button name="button_confirm" type="object" context="{'validate_analytic': True}"
-                            string="确认订单" id="draft_confirm"
-                            groups="sf_base.group_purchase,sf_base.group_purchase_director"
-                            attrs="{'invisible': [('state', 'in', ['purchase', 'cancel'])]}"
-                    />
-                </xpath>
                 <xpath expr="//form/header/button[@name='action_rfq_send'][1]" position="replace">
                     <button name="action_rfq_send" states="draft" string="通过Email发送采购单" type="object"
                             context="{'send_rfq':True}" class="oe_highlight" data-hotkey="g"
@@ -81,10 +73,6 @@
                 <xpath expr="//form/header/button[@name='action_create_invoice'][2]" position="attributes">
                     <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
                 </xpath>
-                <xpath expr="//form/header/button[@name='button_confirm']" position="attributes">
-                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
-                    <!--                    <button name="action_create_invoice" string="创建账单" type="object" class="oe_highlight" context="{'create_bill':True}" attrs="{'invisible': ['|', ('state', 'not in', ('purchase', 'done')), ('invoice_status', 'in', ('no', 'invoiced'))]}" data-hotkey="w" groups="sf_base.group_purchase,sf_base.group_purchase_director"/> -->
-                </xpath>
                 <!--                <xpath expr="//form/header/button[@name='action_create_invoice[2]']" position="attributes">-->
                 <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>-->
                 <!--                </xpath>-->
diff --git a/sf_stock/models/stock_picking.py b/sf_stock/models/stock_picking.py
index a429db36..9b7b22b1 100644
--- a/sf_stock/models/stock_picking.py
+++ b/sf_stock/models/stock_picking.py
@@ -13,6 +13,74 @@ _logger = logging.getLogger(__name__)
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
+    pro_purchase_count = fields.Integer('坯料采购单数量', compute='_compute_pro_purchase_count', store=True)
+
+    @api.depends('name')
+    def _compute_pro_purchase_count(self):
+        for sp in self:
+            if sp:
+                po_ids = self.env['purchase.order'].sudo().search([
+                    ('origin', 'like', sp.name), ('purchase_type', '=', 'standard')])
+                if po_ids:
+                    sp.pro_purchase_count = len(po_ids)
+
+    def pro_purchase_order(self):
+        """
+        坯料采购
+        """
+        po_ids = self.env['purchase.order'].sudo().search([
+            ('origin', 'like', self.name), ('purchase_type', '=', 'standard')])
+        action = {
+            'res_model': 'purchase.order',
+            'type': 'ir.actions.act_window',
+        }
+        if len(po_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': po_ids.id,
+            })
+        else:
+            action.update({
+                'name': _("采购订单列表"),
+                'domain': [('id', 'in', po_ids.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
+    pro_out_purchase_count = fields.Integer('坯料外协单数量', compute='_compute_pro_out_purchase_count', store=True)
+
+    @api.depends('name')
+    def _compute_pro_out_purchase_count(self):
+        for sp in self:
+            if sp:
+                po_ids = self.env['purchase.order'].sudo().search([
+                    ('origin', 'like', sp.name), ('purchase_type', '=', 'consignment')])
+                if po_ids:
+                    sp.pro_out_purchase_count = len(po_ids)
+
+    def pro_out_purchase_order(self):
+        """
+        坯料外协
+        """
+        po_ids = self.env['purchase.order'].sudo().search([
+            ('origin', 'like', self.name), ('purchase_type', '=', 'consignment')])
+        action = {
+            'res_model': 'purchase.order',
+            'type': 'ir.actions.act_window',
+        }
+        if len(po_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': po_ids.id,
+            })
+        else:
+            action.update({
+                'name': _("外协订单列表"),
+                'domain': [('id', 'in', po_ids.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action
+
     # 重写验证，下发发货到bfm
     def button_validate(self):
         info = super(StockPicking, self).button_validate()
diff --git a/sf_stock/views/stock_picking.xml b/sf_stock/views/stock_picking.xml
index 5bf4d40e..1ecc0d40 100644
--- a/sf_stock/views/stock_picking.xml
+++ b/sf_stock/views/stock_picking.xml
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-  <data>
-
-  </data>
+    <data>
+        <record id="add_check_out_view_picking_form" model="ir.ui.view">
+            <field name="name">添加坯料采购单链接</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//div[@name='button_box']//button[@name='action_picking_move_tree']" position="before">
+                    <button class="oe_stat_button" name="pro_purchase_order" type="object" icon="fa-credit-card"
+                            attrs="{'invisible': [('pro_purchase_count', '=', 0)]}">
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_value"><field name="pro_purchase_count"/></span>
+                            <span class="o_stat_text">坯料采购</span>
+                        </div>
+                    </button>
+                    <button class="oe_stat_button" name="pro_out_purchase_order" type="object" icon="fa-credit-card"
+                            attrs="{'invisible': [('pro_out_purchase_count', '=', 0)]}">
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_value"><field name="pro_out_purchase_count"/></span>
+                            <span class="o_stat_text">坯料外协</span>
+                        </div>
+                    </button>
+                </xpath>
+            </field>
+        </record>
+    </data>
 </odoo>
\ No newline at end of file

From c28c00a47bca1497c217daa03750e0437f61527e Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 30 Dec 2024 17:11:08 +0800
Subject: [PATCH 100/147] =?UTF-8?q?=E8=B0=83=E6=95=B4description?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/models/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 9077ee22..b991d393 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -8,6 +8,7 @@ _logger = logging.getLogger(__name__)
 class jikimo_purchase_tier_validation(models.Model):
     _name = 'purchase.order'
     _inherit = ['purchase.order', 'tier.validation']
+    _description = "采购订单"
 
     _tier_validation_buttons_xpath = "/form/header/button[@id='draft_confirm'][1]"
 

From 4137b304f3c3c83d49289595ab7a8bacbdac94ec Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 30 Dec 2024 17:25:32 +0800
Subject: [PATCH 101/147] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quality_control/views/quality_views.xml | 2 ++
 sf_message/models/sf_message_product.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml
index ad8e861c..790f8cef 100644
--- a/quality_control/views/quality_views.xml
+++ b/quality_control/views/quality_views.xml
@@ -266,6 +266,8 @@
                             <field name="company_id" invisible="1"/>
                             <field name="product_id" attrs="{'invisible' : [('measure_on', '=', 'operation')]}"/>
                             <field name="measure_on" attrs="{'readonly': [('point_id', '!=', False)]}"/>
+                            <field name="part_name"/>
+                            <field name="part_number"/>
                             <field name="show_lot_text" invisible="1"/>
                             <field name="move_line_id" invisible="1"/>
                             <field name="product_tracking" invisible="1"/>
diff --git a/sf_message/models/sf_message_product.py b/sf_message/models/sf_message_product.py
index 3b82dac7..85ac4ce2 100644
--- a/sf_message/models/sf_message_product.py
+++ b/sf_message/models/sf_message_product.py
@@ -28,7 +28,7 @@ class SFMessagePlan(models.Model):
                         '{{number}}', str(production_num)).replace(
                         '{{request_url}}', url)
                     contents.append(content)
-        return contents
+        return contents, message_queue_ids
 
     def get_request_url(self):
         url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')

From 5e72e3d1dd61cc03e14a88064e9173f58e5dfebd Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 30 Dec 2024 17:27:00 +0800
Subject: [PATCH 102/147] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/__manifest__.py    |  6 ++++++
 .../static/src/js/ir_model_extend.js               | 14 ++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 jikimo_purchase_tier_validation/static/src/js/ir_model_extend.js

diff --git a/jikimo_purchase_tier_validation/__manifest__.py b/jikimo_purchase_tier_validation/__manifest__.py
index 2c59b177..83df5447 100644
--- a/jikimo_purchase_tier_validation/__manifest__.py
+++ b/jikimo_purchase_tier_validation/__manifest__.py
@@ -33,4 +33,10 @@
     'demo': [
         'demo/demo.xml',
     ],
+
+    'assets': {
+        'web.assets_backend': [
+            'jikimo_purchase_tier_validation/static/src/js/ir_model_extend.js',
+        ],
+    },
 }
diff --git a/jikimo_purchase_tier_validation/static/src/js/ir_model_extend.js b/jikimo_purchase_tier_validation/static/src/js/ir_model_extend.js
new file mode 100644
index 00000000..fa61232b
--- /dev/null
+++ b/jikimo_purchase_tier_validation/static/src/js/ir_model_extend.js
@@ -0,0 +1,14 @@
+/** @odoo-module **/
+
+import {registerPatch} from "@mail/model/model_core";
+
+registerPatch({
+    name: "ir.model.review",
+    fields: {
+        availableWebViews: {
+            compute() {
+                return ["list", "form"];
+            },
+        },
+    },
+});
\ No newline at end of file

From 9ab164f0fe859e5af1812d86236f08ed028dba7c Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 30 Dec 2024 17:31:22 +0800
Subject: [PATCH 103/147] 1

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

diff --git a/sf_tool_management/models/fixture_material_search.py b/sf_tool_management/models/fixture_material_search.py
index ea1212a9..0ada643a 100644
--- a/sf_tool_management/models/fixture_material_search.py
+++ b/sf_tool_management/models/fixture_material_search.py
@@ -21,7 +21,7 @@ class FixtureMaterialSearch(models.Model):
     image = fields.Binary('图片', related='product_id.image_1920')
     number = fields.Integer('总数量', compute='_compute_number')
     usable_num = fields.Integer('可用数量', compute='_compute_number')
-    have_been_used_num = fields.Integer('在用数量', compute='_compute_number')
+    have_been_used_num = fields.Integer('占用数量', compute='_compute_number')
     scrap_num = fields.Integer('报废数量', compute='_compute_number')
 
     barcode_ids = fields.One2many('stock.lot', 'fixture_material_search_id', string='序列号', readonly=True)

From 7556c09ac222fe897d66cc4fbaa881f39d6372bc Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 30 Dec 2024 17:59:11 +0800
Subject: [PATCH 104/147] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/js/ir_model_extend.js                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jikimo_purchase_tier_validation/static/src/js/ir_model_extend.js b/jikimo_purchase_tier_validation/static/src/js/ir_model_extend.js
index fa61232b..97d6f38c 100644
--- a/jikimo_purchase_tier_validation/static/src/js/ir_model_extend.js
+++ b/jikimo_purchase_tier_validation/static/src/js/ir_model_extend.js
@@ -7,7 +7,7 @@ registerPatch({
     fields: {
         availableWebViews: {
             compute() {
-                return ["list", "form"];
+                return ["list", "form", "activity"];
             },
         },
     },

From 210eea3b0b04f2f484fa1310cd04915d429e648a Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 30 Dec 2024 19:24:45 +0800
Subject: [PATCH 105/147] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/__manifest__.py  |  2 +-
 jikimo_purchase_tier_validation/models/models.py | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/jikimo_purchase_tier_validation/__manifest__.py b/jikimo_purchase_tier_validation/__manifest__.py
index 83df5447..18a63e80 100644
--- a/jikimo_purchase_tier_validation/__manifest__.py
+++ b/jikimo_purchase_tier_validation/__manifest__.py
@@ -20,7 +20,7 @@
     'version': '0.1',
 
     # any module necessary for this one to work correctly
-    'depends': ['purchase', 'base_tier_validation', 'documents'],
+    'depends': ['purchase', 'base_tier_validation', 'documents', 'purchase_request', 'account'],
 
     # always loaded
     'data': [
diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index b991d393..df2e8894 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -153,3 +153,18 @@ class jikimo_purchase_tier_validation(models.Model):
                 'sticky': False,
             }
         }
+
+
+class jikimo_purchase_request(models.Model):
+    _inherit = 'purchase.order'
+    _description = "采购申请"
+
+
+class jikimo_account_payment(models.Model):
+    _inherit = 'account.payment'
+    _description = "付款单"
+
+
+class jikimo_account_move(models.Model):
+    _inherit = 'account.move'
+    _description = "发票账单"

From 4937c3a8120caf9f99f68ac339af8916cfb92b90 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 30 Dec 2024 20:27:57 +0800
Subject: [PATCH 106/147] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index df2e8894..4602eb50 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -156,7 +156,7 @@ class jikimo_purchase_tier_validation(models.Model):
 
 
 class jikimo_purchase_request(models.Model):
-    _inherit = 'purchase.order'
+    _inherit = 'purchase.request'
     _description = "采购申请"
 
 

From a24279f6e69fe5a625baf5a667f5e207880498d2 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 30 Dec 2024 21:37:10 +0800
Subject: [PATCH 107/147] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=9A=84=E9=80=9A=E7=9F=A5=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/models/models.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 4602eb50..bcc18bb6 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -64,6 +64,15 @@ class jikimo_purchase_tier_validation(models.Model):
             if error_messages:
                 raise ValidationError('\n'.join(error_messages))
 
+            # 添加通知消息
+            if hasattr(record, 'message_post'):
+                current_user = self.env.user.name
+                record.message_post(
+                    body=f"<strong>{current_user}</strong> 提交审批",
+                    message_type='notification',
+                    subtype_xmlid='mail.mt_note'
+                )
+
         return super(jikimo_purchase_tier_validation, self).request_validation()
 
     # 上传合同文件

From acee32cc3901ca74f249f2d4a8df25a4ee00624d Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 31 Dec 2024 08:47:44 +0800
Subject: [PATCH 108/147] =?UTF-8?q?1=E3=80=81=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95form=E9=A1=B5=E4=B9=B0=E5=AE=B6=E6=94=B9=E5=90=8D?=
 =?UTF-8?q?=E4=B8=BA=E9=87=87=E8=B4=AD=E5=91=98=EF=BC=9B2=E3=80=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E7=9A=84=E5=9D=AF=E6=96=99=E5=A7=94=E5=A4=96=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E9=93=BE=E6=8E=A5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/purchase_order_view.xml |  3 +++
 sf_stock/models/stock_picking.py      | 10 +++++-----
 sf_stock/views/stock_picking.xml      |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index bab28456..dd2c452c 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -29,6 +29,9 @@
                 <xpath expr="//header/button[@name='button_cancel'][2]" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>
+                <xpath expr="//field[@name='user_id']" position="attributes">
+                    <attribute name="string">采购员</attribute>
+                </xpath>
 
 
                 <field name="partner_id" position="replace">
diff --git a/sf_stock/models/stock_picking.py b/sf_stock/models/stock_picking.py
index 9b7b22b1..f8105097 100644
--- a/sf_stock/models/stock_picking.py
+++ b/sf_stock/models/stock_picking.py
@@ -47,23 +47,23 @@ class StockPicking(models.Model):
             })
         return action
 
-    pro_out_purchase_count = fields.Integer('坯料外协单数量', compute='_compute_pro_out_purchase_count', store=True)
+    pro_out_purchase_count = fields.Integer('坯料委外单数量', compute='_compute_pro_out_purchase_count', store=True)
 
     @api.depends('name')
     def _compute_pro_out_purchase_count(self):
         for sp in self:
             if sp:
                 po_ids = self.env['purchase.order'].sudo().search([
-                    ('origin', 'like', sp.name), ('purchase_type', '=', 'consignment')])
+                    ('origin', 'like', sp.name), ('purchase_type', '=', 'outsourcing')])
                 if po_ids:
                     sp.pro_out_purchase_count = len(po_ids)
 
     def pro_out_purchase_order(self):
         """
-        坯料外协
+        坯料委外
         """
         po_ids = self.env['purchase.order'].sudo().search([
-            ('origin', 'like', self.name), ('purchase_type', '=', 'consignment')])
+            ('origin', 'like', self.name), ('purchase_type', '=', 'outsourcing')])
         action = {
             'res_model': 'purchase.order',
             'type': 'ir.actions.act_window',
@@ -75,7 +75,7 @@ class StockPicking(models.Model):
             })
         else:
             action.update({
-                'name': _("外协订单列表"),
+                'name': _("委外订单列表"),
                 'domain': [('id', 'in', po_ids.ids)],
                 'view_mode': 'tree,form',
             })
diff --git a/sf_stock/views/stock_picking.xml b/sf_stock/views/stock_picking.xml
index 1ecc0d40..043a4d87 100644
--- a/sf_stock/views/stock_picking.xml
+++ b/sf_stock/views/stock_picking.xml
@@ -18,7 +18,7 @@
                             attrs="{'invisible': [('pro_out_purchase_count', '=', 0)]}">
                         <div class="o_field_widget o_stat_info">
                             <span class="o_stat_value"><field name="pro_out_purchase_count"/></span>
-                            <span class="o_stat_text">坯料外协</span>
+                            <span class="o_stat_text">坯料委外</span>
                         </div>
                     </button>
                 </xpath>

From 78b0529809060357561bb9b1acf8efa9631d8c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Tue, 31 Dec 2024 08:54:02 +0800
Subject: [PATCH 109/147] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E6=97=B6=E4=BB=8E=E6=A8=A1=E6=9D=BF=E4=B8=8A=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jikimo_sale_multiple_supply_methods/models/product_template.py b/jikimo_sale_multiple_supply_methods/models/product_template.py
index 640571f7..cd730998 100644
--- a/jikimo_sale_multiple_supply_methods/models/product_template.py
+++ b/jikimo_sale_multiple_supply_methods/models/product_template.py
@@ -23,4 +23,4 @@ class ProductTemplate(models.Model):
         self.is_bfm = product_template_id.is_bfm
         self.is_manual_processing = product_template_id.is_manual_processing
          # 复制 seller_ids
-        self.seller_ids = [(0, 0, {'partner_id': seller.partner_id.id, 'delay': 1.0}) for seller in product_template_id.seller_ids]
+        self.seller_ids = [(0, 0, {'partner_id': seller.partner_id.id, 'delay': 1.0, 'price': seller.price}) for seller in product_template_id.seller_ids]

From 32e3c2f79fe6df18f926ad5323f6447e4af22cd0 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 31 Dec 2024 08:56:41 +0800
Subject: [PATCH 110/147] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=BA=90=E6=96=87=E6=A1=A3=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=BA=90=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/purchase_order_view.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index dd2c452c..eec616f4 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -32,7 +32,9 @@
                 <xpath expr="//field[@name='user_id']" position="attributes">
                     <attribute name="string">采购员</attribute>
                 </xpath>
-
+                <xpath expr="//field[@name='origin']" position="attributes">
+                    <attribute name="string">源单据</attribute>
+                </xpath>
 
                 <field name="partner_id" position="replace">
                     <field name="partner_id" widget="res_partner_many2one" context="{'is_supplier': True }"/>
@@ -227,6 +229,9 @@
                 <xpath expr="//field[@name='user_id']" position="attributes">
                     <attribute name="string">采购员</attribute>
                 </xpath>
+                <xpath expr="//field[@name='origin']" position="attributes">
+                    <attribute name="string">源单据</attribute>
+                </xpath>
                 <xpath expr="//field[@name='activity_ids']" position="attributes">
                     <attribute name="optional">hide</attribute>
                 </xpath>
@@ -284,6 +289,9 @@
                 <xpath expr="//field[@name='user_id']" position="attributes">
                     <attribute name="string">采购员</attribute>
                 </xpath>
+                <xpath expr="//field[@name='origin']" position="attributes">
+                    <attribute name="string">源单据</attribute>
+                </xpath>
                 <xpath expr="//field[@name='user_id']" position="after">
                     <field name="delivery_warning" optional="show"/>
                     <field name="date_planned" string="最近交货日期" optional="show" widget="date"/>

From 1816f1a4972c9a7563e975d42f9734ee12b36496 Mon Sep 17 00:00:00 2001
From: hy <123@qq.com>
Date: Tue, 31 Dec 2024 09:45:56 +0800
Subject: [PATCH 111/147] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=AF=B9=E4=B8=8D=E9=BD=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/js/custom_form_status_indicator.js            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
index 1e39b719..4992872a 100644
--- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js
+++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
@@ -177,9 +177,10 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
             const thead_th_num = thead_tr.children().length
             const tbody_tr_num = tbody_tr.children().length
             const num = thead_th_num - tbody_tr_num
-            console.log('num', num);
             if(num == -1) {
-                thead_tr.prepend('<td>序号</td>')
+                tbody.children('tr').each(function () {
+                    $(this).children('td').eq(0).remove()
+                })
             }
 
         } catch (e) {

From 78a456849c85cf5d56eab97d0afb7fb1aca34ea8 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Tue, 31 Dec 2024 09:55:16 +0800
Subject: [PATCH 112/147] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93=E8=AE=A2=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=B2=A1=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 1d880d66..2dcab4be 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -654,11 +654,8 @@ class StockPicking(models.Model):
         if self.location_id.name == '成品存货区' and self.location_dest_id.name == '客户':
             sale_id = self.env['sale.order'].sudo().search(
                 [('name', '=', self.origin)])
-            check_backorder = self._pre_action_done_hook()
-            if check_backorder is not True:
-                return res
-            if sale_id:
-                sale_id.write({'state':'delivered'})
+            if sale_id and res:
+                sale_id.write({'state': 'delivered'})
         return res
 
     # 创建 外协出库入单
@@ -674,12 +671,14 @@ class StockPicking(models.Model):
             })
             move_dest_id = False
             # 如果当前工单是是制造订单的最后一个工艺外协工单
-            if workorder == next((workorder for workorder in reversed(sorted_workorders) if workorder.is_subcontract), None):
+            if workorder == next((workorder for workorder in reversed(sorted_workorders) if workorder.is_subcontract),
+                                 None):
                 move_dest_id = item.move_raw_ids[0].id
             else:
                 # 从sorted_workorders中找到上一工单的move
                 if len(sorted_workorders) > 1:
-                    move_dest_id = sorted_workorders[sorted_workorders.index(workorder)+1].move_subcontract_workorder_ids[1].id
+                    move_dest_id = \
+                    sorted_workorders[sorted_workorders.index(workorder) + 1].move_subcontract_workorder_ids[1].id
             new_picking = True
             outcontract_picking_type_in = self.env.ref(
                 'sf_manufacturing.outcontract_picking_in').id,
@@ -705,9 +704,6 @@ class StockPicking(models.Model):
                 {'picking_id': picking_out.id, 'state': 'waiting'})
             moves_out._assign_picking_post_process(new=new_picking)
 
-
-
-
     @api.depends('move_type', 'immediate_transfer', 'move_ids.state', 'move_ids.picking_id')
     def _compute_state(self):
         super(StockPicking, self)._compute_state()

From 4902fc5d9a777d53a8641511a62d999c566ba78a Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 31 Dec 2024 10:56:07 +0800
Subject: [PATCH 113/147] =?UTF-8?q?1=E3=80=81=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=85=B3=E8=81=94=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=E4=BB=8E=E9=94=80=E5=94=AE=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=90=AC=E8=BF=81=E5=88=B0=E5=88=B6=E9=80=A0=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E5=B9=B6=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?many2many=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=B8=94?=
 =?UTF-8?q?=E5=AF=B9=E5=AD=97=E6=AE=B5=E7=9A=84=E8=87=AA=E5=8A=A8=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E6=96=B9=E6=B3=95=E8=BF=9B=E8=A1=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/purchase_order.py     | 41 ++++++++++++++++---
 .../views/purchase_order_view.xml             |  7 ++++
 sf_sale/models/sale_order.py                  | 17 --------
 sf_sale/views/purchase_order_view.xml         |  5 ---
 4 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/sf_manufacturing/models/purchase_order.py b/sf_manufacturing/models/purchase_order.py
index fc8a96b1..71e4e045 100644
--- a/sf_manufacturing/models/purchase_order.py
+++ b/sf_manufacturing/models/purchase_order.py
@@ -10,10 +10,11 @@ from odoo.tools import OrderedSet
 # _get_surface_technics_purchase_ids
 class PurchaseOrder(models.Model):
     _inherit = 'purchase.order'
+
     production_count = fields.Integer(
         "关联制造订单",
         compute='_compute_workorder_count',
-        )
+    )
 
     def action_view_production(self):
         origins = [order.name for order in self.picking_ids]
@@ -37,17 +38,17 @@ class PurchaseOrder(models.Model):
             })
         return action
 
-
     def _compute_workorder_count(self):
         for purchase in self:
             origins = [order.name for order in purchase.picking_ids]
             production_id = self.env['mrp.production'].search([('origin', 'in', origins)])
             purchase.production_count = len(production_id)
+
     def button_confirm(self):
         super().button_confirm()
-        workorders = self.env['mrp.workorder'].search([('purchase_id', '=', self.id),('state', '!=', 'cancel')])
+        workorders = self.env['mrp.workorder'].search([('purchase_id', '=', self.id), ('state', '!=', 'cancel')])
         for workorder in workorders:
-            if workorder.routing_type == '表面工艺' and  workorder.is_subcontract is True:
+            if workorder.routing_type == '表面工艺' and workorder.is_subcontract is True:
                 move_out = workorder.move_subcontract_workorder_ids[1]
                 # move_out = self.env['stock.move'].search(
                 #     [('location_id', '=', self.env['stock.location'].search(
@@ -61,10 +62,39 @@ class PurchaseOrder(models.Model):
                         if not mo.move_line_ids:
                             self.env['stock.move.line'].create(mo.get_move_line(workorder.production_id, workorder))
         return True
+
+    origin_sale_id = fields.Many2one('sale.order', string='销售订单号', store=True, compute='_compute_origin_sale_id')
+    origin_sale_ids = fields.Many2many('sale.order', string='销售订单号(多个)', store=True,
+                                       compute='_compute_origin_sale_id')
+
+    @api.depends('origin')
+    def _compute_origin_sale_id(self):
+        for purchase in self:
+            if not purchase.origin:
+                continue
+            elif 'MO' in purchase.origin:
+                mp_name_list = [name.strip() for name in purchase['origin'].split(',')]
+                os_ids = list({mp_id.sale_order_id.id for mp_id in self.env['mrp.production'].sudo().search([
+                    ('name', 'in', mp_name_list)])})
+                if len(os_ids) == 1:
+                    purchase.origin_sale_id = os_ids[0]
+                elif len(os_ids) >= 2:
+                    purchase.origin_sale_ids = os_ids
+            elif 'S' in purchase.origin:
+                os_name_list = [name.strip() for name in purchase['origin'].split(',')]
+                os_ids = self.env['sale.order'].sudo().search([('name', 'in', os_name_list)])
+                if len(os_ids) == 1:
+                    purchase.origin_sale_id = os_ids.id
+                elif len(os_ids) >= 2:
+                    purchase.origin_sale_ids = os_ids.ids
+
+
 class PurchaseOrderLine(models.Model):
     _inherit = 'purchase.order.line'
     part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
-    related_product = fields.Many2one('product.product',compute='_compute_related_product', string='关联产品',help='经此产品工艺加工成的成品')
+    related_product = fields.Many2one('product.product', compute='_compute_related_product', string='关联产品',
+                                      help='经此产品工艺加工成的成品')
+
     @api.depends('order_id.origin')
     def _compute_related_product(self):
         for record in self:
@@ -73,4 +103,3 @@ class PurchaseOrderLine(models.Model):
                 record.related_product = production_id.product_id if production_id else False
             else:
                 record.related_product = False
-
diff --git a/sf_manufacturing/views/purchase_order_view.xml b/sf_manufacturing/views/purchase_order_view.xml
index 83562f2c..3b1518fb 100644
--- a/sf_manufacturing/views/purchase_order_view.xml
+++ b/sf_manufacturing/views/purchase_order_view.xml
@@ -22,6 +22,13 @@
                         </div>
                     </button>
                 </xpath>
+                <!--                添加销售订单号字段-->
+                <xpath expr="//sheet/group/group[2]/div[@name='date_approve']" position="after">
+                    <field name="origin_sale_id" readonly="1" string="参考销售订单"
+                           attrs="{'invisible': [('origin_sale_id' , '=', False)]}"/>
+                    <field name="origin_sale_ids" readonly="1" string="参考销售订单" widget="many2many_tags"
+                           attrs="{'invisible': [('origin_sale_ids' , '=', [])]}"/>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index c9c06b9b..ac246da9 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -285,8 +285,6 @@ class RePurchaseOrder(models.Model):
         [('standard', '标准采购'), ('consignment', '工序外协'), ('outsourcing', '委外加工'), ('outside', '外购订单')],
         string='采购类型', default='standard', store=True, compute='_compute_purchase_type')
 
-    origin_sale_id = fields.Many2one('sale.order', string='销售订单号', compute='_compute_origin_sale_id')
-
     # 合同编号
     contract_number = fields.Char(string='合同编号', size=20)
     # 合同概况
@@ -311,21 +309,6 @@ class RePurchaseOrder(models.Model):
                             purchase.purchase_type = 'outsourcing'
                             break
 
-    @api.depends('order_line.move_dest_ids.group_id.mrp_production_ids',
-                 'order_line.move_ids.move_dest_ids.group_id.mrp_production_ids', 'origin')
-    def _compute_origin_sale_id(self):
-        for purchase in self:
-            productions_ids = purchase._get_mrp_productions()
-            if productions_ids:
-                if productions_ids[0].sale_order_id:
-                    purchase.origin_sale_id = productions_ids[0].sale_order_id.id
-                    continue
-            order_id = self.env['sale.order'].sudo().search([('name', '=', purchase.origin)])
-            if order_id:
-                purchase.origin_sale_id = order_id.id
-                continue
-            purchase.origin_sale_id = False
-
     delivery_warning = fields.Selection([('normal', '正常'), ('warning', '预警'), ('overdue', '已逾期')],
                                         string='交期状态', default='normal',
                                         tracking=True)
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index eec616f4..ecc061fa 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -190,11 +190,6 @@
                     <field name="partner_ref" string="合同名称"/>
                     <field name="contract_number"/>
                 </xpath>
-                <!--                添加销售订单号字段-->
-                <xpath expr="//sheet/group/group[2]/div[@name='date_approve']" position="after">
-<!--                     <field name="origin_sale_id" readonly="1" attrs="{'invisible': [('origin_sale_id', '=', False)]}" string="参考销售订单"/> -->
-                    <field name="origin_sale_id" readonly="1" string="参考销售订单"/>
-                </xpath>
                 <xpath expr="//sheet/group/group[2]/field[@name='effective_date']" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>

From 2373f333151057d25b120394d22138d27f8d96e6 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 31 Dec 2024 11:34:21 +0800
Subject: [PATCH 114/147] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E6=BA=90?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=BA=E5=85=A5=E5=BA=93=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E5=8F=82=E8=80=83=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/purchase_order.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sf_manufacturing/models/purchase_order.py b/sf_manufacturing/models/purchase_order.py
index 71e4e045..3e20a0a2 100644
--- a/sf_manufacturing/models/purchase_order.py
+++ b/sf_manufacturing/models/purchase_order.py
@@ -87,6 +87,14 @@ class PurchaseOrder(models.Model):
                     purchase.origin_sale_id = os_ids.id
                 elif len(os_ids) >= 2:
                     purchase.origin_sale_ids = os_ids.ids
+            elif 'IN' in purchase.origin:
+                sp_name_list = [name.strip() for name in purchase['origin'].split(',')]
+                os_ids = list({sp_id.sale_order_id.id for sp_id in self.env['stock.picking'].sudo().search([
+                    ('name', 'in', sp_name_list)])})
+                if len(os_ids) == 1:
+                    purchase.origin_sale_id = os_ids[0]
+                elif len(os_ids) >= 2:
+                    purchase.origin_sale_ids = os_ids
 
 
 class PurchaseOrderLine(models.Model):

From 64eb66c334674dc93bedcb8859175ec7cd211a42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Tue, 31 Dec 2024 11:39:36 +0800
Subject: [PATCH 115/147] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E5=9B=9E?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=AE=BE=E8=AE=A1=E5=90=8E=E5=86=8D=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=EF=BC=8C=E9=87=87=E8=B4=AD=E5=8D=95=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF=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     | 25 ++++++++++---------
 .../wizard/production_technology_wizard.py    |  5 +++-
 sf_sale/models/sale_order.py                  |  1 -
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index c63a00b0..b9b3dbbb 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -783,7 +783,7 @@ class MrpProduction(models.Model):
                 workorder.duration_expected = workorder._get_duration_expected()
 
     # 外协出入库单处理
-    def get_subcontract_pick_purchase(self):
+    def get_subcontract_pick_purchase(self, special_design_workorder):
         production_all = self.sorted(lambda x: x.id)
         product_id_to_production_names = {}
         grouped_product_ids = {k: list(g) for k, g in
@@ -792,18 +792,19 @@ class MrpProduction(models.Model):
             product_id_to_production_names[product_id] = [p.name for p in pd]
         sorted_workorders = None
         for production in production_all:
-            proc_workorders = []
-            process_parameter_workorder = self.env['mrp.workorder'].search(
-                [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production.id),
-                 ('is_subcontract', '=', True), ('state', '!=', 'cancel')], order='sequence asc')
-            if process_parameter_workorder:
-                # 将这些特殊表面工艺工单的采购单与调拨单置为失效
-                for workorder in process_parameter_workorder:
-                    workorder._get_surface_technics_purchase_ids().write({'state': 'cancel'})
-                    workorder.move_subcontract_workorder_ids.write({'state': 'cancel'})
-                    workorder.move_subcontract_workorder_ids.picking_id.write({'state': 'cancel'})
+            # proc_workorders = []
+            # process_parameter_workorder = self.env['mrp.workorder'].search(
+            #     [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production.id),
+            #      ('is_subcontract', '=', True), ('state', '!=', 'cancel')], order='sequence asc')
+            # need_delete_workorder = process_parameter_workorder - special_design_workorder
+            # for workorder in need_delete_workorder:
+            #         workorder._get_surface_technics_purchase_ids().write({'active': False})
+            #         workorder.move_subcontract_workorder_ids.write({'state': 'cancel'})
+            #         workorder.move_subcontract_workorder_ids.picking_id.write({'active': False})
+
+            if special_design_workorder:            
                 consecutive_workorders = []
-                sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.sequence)
+                sorted_workorders = sorted(special_design_workorder, key=lambda w: w.sequence)
                 # for i, workorder in enumerate(sorted_workorders):
                 #     # 检查当前工作订单和下一个工作订单是否连续，并且供应商相同
                 #     if i == 0:
diff --git a/sf_manufacturing/wizard/production_technology_wizard.py b/sf_manufacturing/wizard/production_technology_wizard.py
index e16e853c..65e87774 100644
--- a/sf_manufacturing/wizard/production_technology_wizard.py
+++ b/sf_manufacturing/wizard/production_technology_wizard.py
@@ -57,6 +57,7 @@ class ProductionTechnologyWizard(models.TransientModel):
                         #         td_upd = self.env['sf.technology.design'].sudo().search(domain)
                         #         if td_upd:
                         #             ro.write({'sequence': td_upd.sequence, 'active': td_upd.active})
+            # 特殊表面工艺
             special_design = self.env['sf.technology.design'].sudo().search(
                 [('routing_tag', '=', 'special'), ('production_id', '=', production.id),
                  ('is_auto', '=', False), ('active', 'in', [True, False])])
@@ -112,7 +113,9 @@ class ProductionTechnologyWizard(models.TransientModel):
                                         workorder.blocked_by_workorder_ids = blocked_by_workorder_ids[0]
         productions._create_workorder(False)
         if self.production_id.product_id.categ_id.type == '成品':
-            productions.get_subcontract_pick_purchase()
+            special_design_workorder = self.env['mrp.workorder'].search(
+                [('technology_design_id', 'in', special_design.ids), ('production_id', '=', special.production_id.id), ('state', '!=', 'cancel')])
+            productions.get_subcontract_pick_purchase(special_design_workorder)
         productions.is_adjust = False
         for item in productions:
             workorder = item.workorder_ids.filtered(lambda wo: wo.state not in ('cancel')).sorted(
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index c9c06b9b..5267725a 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -363,7 +363,6 @@ class RePurchaseOrder(models.Model):
             server_product_process = []
             purchase_order = pp._get_surface_technics_purchase_ids()
             if purchase_order:
-                purchase_order.write({'state': 'draft'})
                 pp.purchase_id = [(6, 0, [purchase_order.id])]
             else:
                 server_template = self.env['product.template'].search(

From 4b7308fdcd9aa079fcf1dfa5978924100a5711fd Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Tue, 31 Dec 2024 12:54:16 +0800
Subject: [PATCH 116/147] =?UTF-8?q?sf-=E5=88=B6=E9=80=A0-=E5=A4=96?=
 =?UTF-8?q?=E5=8D=8F=E5=B7=A5=E5=8D=95-=E8=B0=83=E6=8B=A8=E5=8D=95?=
 =?UTF-8?q?=E5=B7=B2=E5=8F=96=E6=B6=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/stock.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 1d880d66..1d1cd991 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -685,7 +685,11 @@ class StockPicking(models.Model):
                 'sf_manufacturing.outcontract_picking_in').id,
             outcontract_picking_type_out = self.env.ref(
                 'sf_manufacturing.outcontract_picking_out').id,
-            moves_in = self.env['stock.move'].sudo().create(
+            context = dict(self.env.context)
+            context.update({
+                'default_production_id': item.id,  # 添加额外信息到 context 中
+            })
+            moves_in = self.env['stock.move'].sudo().with_context(context).create(
                 self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_in,
                                                                   procurement_group_id.id, move_dest_id))
             picking_in = self.create(
@@ -694,7 +698,8 @@ class StockPicking(models.Model):
             moves_in.write(
                 {'picking_id': picking_in.id, 'state': 'waiting'})
             moves_in._assign_picking_post_process(new=new_picking)
-            moves_out = self.env['stock.move'].sudo().create(
+            # self.env.context.get('default_production_id')
+            moves_out = self.env['stock.move'].sudo().with_context(context).create(
                 self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_out,
                                                                   procurement_group_id.id, moves_in.id))
             workorder.write({'move_subcontract_workorder_ids': [(6, 0, [moves_in.id, moves_out.id])]})
@@ -774,6 +779,7 @@ class ReStockMove(models.Model):
             'origin': item.name,
             'group_id': group_id,
             'move_dest_ids': [(6, 0, [move_dest_ids])] if move_dest_ids else False,
+            # 'production_id': item.id,
             # 'route_ids': False if not route else [(4, route.id)],
             'date_deadline': datetime.now(),
             'picking_type_id': picking_type_id,

From 39ed32f3e9d04209e6cdfb97c3cdaaab0cd8115e Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Tue, 31 Dec 2024 13:08:00 +0800
Subject: [PATCH 117/147] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93=E8=AE=A2=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=B2=A1=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 2dcab4be..fa723283 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -654,7 +654,10 @@ class StockPicking(models.Model):
         if self.location_id.name == '成品存货区' and self.location_dest_id.name == '客户':
             sale_id = self.env['sale.order'].sudo().search(
                 [('name', '=', self.origin)])
-            if sale_id and res:
+            stock_picking_list = self.env['stock.picking'].sudo().search(
+                [('id', 'in', sale_id.picking_ids.ids)])
+            stock_picking = stock_picking_list.filtered(lambda p: p.state not in ("done", "cancel"))
+            if sale_id and not stock_picking:
                 sale_id.write({'state': 'delivered'})
         return res
 
@@ -678,7 +681,7 @@ class StockPicking(models.Model):
                 # 从sorted_workorders中找到上一工单的move
                 if len(sorted_workorders) > 1:
                     move_dest_id = \
-                    sorted_workorders[sorted_workorders.index(workorder) + 1].move_subcontract_workorder_ids[1].id
+                        sorted_workorders[sorted_workorders.index(workorder) + 1].move_subcontract_workorder_ids[1].id
             new_picking = True
             outcontract_picking_type_in = self.env.ref(
                 'sf_manufacturing.outcontract_picking_in').id,

From 37476bcc88f3e530d04214c1e649a3b4e3b2639f Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Tue, 31 Dec 2024 14:03:15 +0800
Subject: [PATCH 118/147] =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     | 64 ++++---------------
 .../wizard/production_technology_wizard.py    |  4 +-
 2 files changed, 13 insertions(+), 55 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index b9b3dbbb..057530d0 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -783,7 +783,7 @@ class MrpProduction(models.Model):
                 workorder.duration_expected = workorder._get_duration_expected()
 
     # 外协出入库单处理
-    def get_subcontract_pick_purchase(self, special_design_workorder):
+    def get_subcontract_pick_purchase(self):
         production_all = self.sorted(lambda x: x.id)
         product_id_to_production_names = {}
         grouped_product_ids = {k: list(g) for k, g in
@@ -792,57 +792,17 @@ class MrpProduction(models.Model):
             product_id_to_production_names[product_id] = [p.name for p in pd]
         sorted_workorders = None
         for production in production_all:
-            # proc_workorders = []
-            # process_parameter_workorder = self.env['mrp.workorder'].search(
-            #     [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production.id),
-            #      ('is_subcontract', '=', True), ('state', '!=', 'cancel')], order='sequence asc')
-            # need_delete_workorder = process_parameter_workorder - special_design_workorder
-            # for workorder in need_delete_workorder:
-            #         workorder._get_surface_technics_purchase_ids().write({'active': False})
-            #         workorder.move_subcontract_workorder_ids.write({'state': 'cancel'})
-            #         workorder.move_subcontract_workorder_ids.picking_id.write({'active': False})
-
-            if special_design_workorder:            
-                consecutive_workorders = []
-                sorted_workorders = sorted(special_design_workorder, key=lambda w: w.sequence)
-                # for i, workorder in enumerate(sorted_workorders):
-                #     # 检查当前工作订单和下一个工作订单是否连续，并且供应商相同
-                #     if i == 0:
-                #         consecutive_workorders.append(workorder)
-                #     elif workorder.sequence == sorted_workorders[
-                #         i - 1].sequence + 1 and workorder.supplier_id.id == sorted_workorders[i - 1].supplier_id.id:
-                #         consecutive_workorders.append(workorder)
-                #     else:
-                #         # 处理连续组，如果它不为空
-                #         if consecutive_workorders:
-                #             proc_workorders.append(consecutive_workorders)
-                #             # 创建外协出入库单和采购订单
-                #             # self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production, sorted_workorders)
-                #             # self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
-                #             #                                               product_id_to_production_names)
-                #             if i < len(sorted_workorders) - 1:
-                #                 # 重置连续组，并添加当前工作订单
-                #                 consecutive_workorders = [workorder]
-                #             else:
-                #                 # 判断最后一笔:
-                #                 if workorder.sequence == sorted_workorders[
-                #                     i - 1].sequence and workorder.supplier_id.id == sorted_workorders[
-                #                     i - 1].supplier_id.id:
-                #                     consecutive_workorders = [workorder]
-                #                 else:
-                #                     proc_workorders.append([workorder])
-                #                     # 立即创建外协出入库单和采购订单
-                #                     # self.env['stock.picking'].create_outcontract_picking(workorder, production)
-                #                     # self.env['purchase.order'].get_purchase_order(workorder, production,
-                #                     #   product_id_to_production_names)
-                #                     consecutive_workorders = []
-                #
-                # # 处理最后一个组，即使它可能只有一个工作订单
-                # if consecutive_workorders:
-                #     proc_workorders.append(consecutive_workorders)
-                    # self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production)
-                    # self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
-                    #                                               product_id_to_production_names)
+            proc_workorders = []
+            process_parameter_workorder = self.env['mrp.workorder'].search(
+                [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production.id),
+                 ('is_subcontract', '=', True), ('state', '!=', 'cancel')], order='sequence asc')
+            if process_parameter_workorder:
+                # 将这些特殊表面工艺工单的采购单与调拨单置为失效
+                for workorder in process_parameter_workorder:
+                    workorder._get_surface_technics_purchase_ids().write({'state': 'cancel'})
+                    workorder.move_subcontract_workorder_ids.write({'state': 'cancel'})
+                    workorder.move_subcontract_workorder_ids.picking_id.write({'state': 'cancel'})
+                sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.sequence)
             if not sorted_workorders:
                 return
             for workorders in reversed(sorted_workorders):
diff --git a/sf_manufacturing/wizard/production_technology_wizard.py b/sf_manufacturing/wizard/production_technology_wizard.py
index 65e87774..1feee749 100644
--- a/sf_manufacturing/wizard/production_technology_wizard.py
+++ b/sf_manufacturing/wizard/production_technology_wizard.py
@@ -113,9 +113,7 @@ class ProductionTechnologyWizard(models.TransientModel):
                                         workorder.blocked_by_workorder_ids = blocked_by_workorder_ids[0]
         productions._create_workorder(False)
         if self.production_id.product_id.categ_id.type == '成品':
-            special_design_workorder = self.env['mrp.workorder'].search(
-                [('technology_design_id', 'in', special_design.ids), ('production_id', '=', special.production_id.id), ('state', '!=', 'cancel')])
-            productions.get_subcontract_pick_purchase(special_design_workorder)
+            productions.get_subcontract_pick_purchase()
         productions.is_adjust = False
         for item in productions:
             workorder = item.workorder_ids.filtered(lambda wo: wo.state not in ('cancel')).sorted(

From 94b1c7d258771af92617caf281c67899885e32b6 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 31 Dec 2024 15:50:51 +0800
Subject: [PATCH 119/147] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 2 +-
 sf_quality/models/quality_cnc_test.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index d121bae8..f11de84b 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -129,7 +129,7 @@ class ResMrpWorkOrder(models.Model):
     Y10_axis = fields.Float(default=0)
     Z10_axis = fields.Float(default=0)
     X_deviation_angle = fields.Integer(string="X轴偏差度", default=0)
-    test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], default='合格',
+    test_results = fields.Selection([("合格", "合格"), ("返工", "返工")], default='合格',
                                     string="检测结果", tracking=True)
     cnc_ids = fields.One2many("sf.cnc.processing", 'workorder_id', string="CNC加工程序")
     cmm_ids = fields.One2many("sf.cmm.program", 'workorder_id', string="CMM程序")
diff --git a/sf_quality/models/quality_cnc_test.py b/sf_quality/models/quality_cnc_test.py
index 9c73715d..9810b0e0 100644
--- a/sf_quality/models/quality_cnc_test.py
+++ b/sf_quality/models/quality_cnc_test.py
@@ -25,7 +25,7 @@ class SfQualityCncTest(models.Model):
         ('pass', '合格'),
         ('fail', '不合格')], string='判定结果')
     number = fields.Integer('数量', default=1)
-    test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], string="检测结果")
+    test_results = fields.Selection([("合格", "合格"), ("返工", "返工")], string="检测结果")
     reason = fields.Selection(
         [("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"), ("operate computer", "操机"),
          ("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因")

From 281f3c67c34895d99c3e116bf3738a90f3f619cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Tue, 31 Dec 2024 16:00:24 +0800
Subject: [PATCH 120/147] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E8=A1=A8=E9=9D=A2?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=A4=96=E5=8D=8F=E9=87=87=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E7=9A=84=E9=87=87=E8=B4=AD=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 5267725a..be5098b8 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -373,12 +373,16 @@ class RePurchaseOrder(models.Model):
                     'product_qty': 1,
                     'product_uom': server_template.uom_id.id
                 }))
+                # 获取服务商品最后一个供应商的采购员
+                purchase_user_id = server_template.seller_ids[-1].partner_id.purchase_user_id
                 purchase_order = self.env['purchase.order'].sudo().create({
                     'partner_id': server_template.seller_ids[0].partner_id.id,
                     'origin': production.name,
                     'state': 'draft',
                     'purchase_type': 'consignment',
-                    'order_line': server_product_process})
+                    'order_line': server_product_process,
+                    'user_id': purchase_user_id.id
+                })
                 pp.purchase_id = [(6, 0, [purchase_order.id])]
         # self.env.cr.commit()
 

From 247bebbd75467ff6006111cef1989fdc089af795 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Tue, 31 Dec 2024 16:39:09 +0800
Subject: [PATCH 121/147] =?UTF-8?q?=E8=AF=A2=E4=BB=B7=E5=8D=95=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index bcc18bb6..e5a80f7b 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -72,8 +72,30 @@ class jikimo_purchase_tier_validation(models.Model):
                     message_type='notification',
                     subtype_xmlid='mail.mt_note'
                 )
+        res = super(jikimo_purchase_tier_validation, self).request_validation()
+        self.state = 'to approve'
+        return res
 
-        return super(jikimo_purchase_tier_validation, self).request_validation()
+    def restart_validation(self):
+        res = super(jikimo_purchase_tier_validation, self).restart_validation()
+        self.state = 'draft'
+        return res
+
+    def _validate_tier(self, tiers=False):
+        res = super(jikimo_purchase_tier_validation, self)._validate_tier(tiers)
+        self.state = 'approved'
+        return res
+
+    def _rejected_tier(self, tiers=False):
+        res = super(jikimo_purchase_tier_validation, self)._rejected_tier(tiers)
+        self.state = 'draft'
+        return res
+
+    @api.model
+    def _get_under_validation_exceptions(self):
+        res = super(jikimo_purchase_tier_validation, self)._get_under_validation_exceptions()
+        res.append("state")
+        return res
 
     # 上传合同文件
     def upload_contract_file(self):

From 701decb38f3872ac9b3f3660b12ee0a9b045b206 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Tue, 31 Dec 2024 17:08:38 +0800
Subject: [PATCH 122/147] =?UTF-8?q?=E8=A1=A8=E9=9D=A2=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py  | 118 +---------------------
 sf_manufacturing/models/purchase_order.py |   6 --
 sf_sale/models/sale_order.py              |  18 ++++
 3 files changed, 19 insertions(+), 123 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index d121bae8..d6de3408 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1035,49 +1035,6 @@ class ResMrpWorkOrder(models.Model):
                  'production_id.tool_state', 'production_id.schedule_state', 'sequence',
                  'production_id.programming_state')
     def _compute_state(self):
-        # super()._compute_state()
-        # for workorder in self:
-        #     if workorder.sequence != 1:
-        #         previous_workorder = self.env['mrp.workorder'].search(
-        #             [('production_id', '=', workorder.production_id.id),
-        #              ('sequence', '=', workorder.sequence - 1)])
-        #     if workorder.state == 'pending':
-        #         if all([wo.state in ('done', 'cancel') for wo in workorder.blocked_by_workorder_ids]):
-        #             if workorder.production_id.reservation_state == 'assigned' and workorder.production_id.schedule_state == '已排':
-        #                 if ((workorder.sequence == 1 and not workorder.blocked_by_workorder_ids)
-        #                         or (workorder.blocked_by_workorder_ids.state in ('done', 'cancel')
-        #                             and workorder.blocked_by_workorder_ids.test_results not in ['报废', '返工'])
-        #                         or (previous_workorder.state in ('done', 'cancel')
-        #                             and not workorder.blocked_by_workorder_ids
-        #                             and previous_workorder.test_results not in ['报废', '返工'])
-        #                 ):
-        #                     workorder.state = 'ready'
-        #         continue
-        #     if workorder.production_id.schedule_state == '未排' and workorder.state in ('waiting', 'ready'):
-        #         if workorder.sequence != 1:
-        #             workorder.state = 'pending'
-        #         continue
-        #     if workorder.state not in ('waiting', 'ready'):
-        #         continue
-        #     if workorder.state in (
-        #             'waiting') and workorder.sequence == 1 and workorder.production_id.schedule_state == '已排':
-        #         workorder.state = 'ready'
-        #         continue
-        #     if not all([wo.state in ('done', 'cancel') for wo in workorder.blocked_by_workorder_ids]):
-        #         workorder.state = 'pending'
-        #         if workorder.state in ['waiting']:
-        #             if previous_workorder.state == 'waiting':
-        #                 workorder.state = 'pending'
-        #         if workorder.sequence == 1 and workorder.state == 'pending':
-        #             workorder.state = 'waiting'
-        #         continue
-        #     if workorder.production_id.reservation_state not in ('waiting', 'confirmed', 'assigned'):
-        #         continue
-        #     if workorder.production_id.reservation_state == 'assigned' and workorder.state == 'waiting' and workorder.production_id.schedule_state == '已排':
-        #         workorder.state = 'ready'
-        #     elif workorder.production_id.reservation_state != 'assigned' and workorder.state == 'ready':
-        #         workorder.state = 'waiting'
-
         for workorder in self:
             # 如果工单的工序没有进行排序则跳出循环
             if workorder.production_id.workorder_ids.filtered(lambda wk: wk.sequence == 0):
@@ -1119,7 +1076,7 @@ class ResMrpWorkOrder(models.Model):
                 if workorder.state != 'waiting':
                     workorder.state = 'waiting'
                 continue
-            if workorder.production_id.programming_state == '已编程':
+            if workorder.production_id.programming_state == '已编程' and workorder.technology_design_id.routing_tag != 'special':
                 workorder.state = 'ready'
             elif workorder.state != 'waiting':
                 workorder.state = 'waiting'
@@ -1134,85 +1091,12 @@ class ResMrpWorkOrder(models.Model):
                 if workorder.is_subcontract is False:
                     workorder.state = 'ready'
                 else:
-                    # production_programming = self.env['mrp.production'].search(
-                    #     [('origin', '=', self.production_id.origin)], order='name asc')
-                    # production_no_remanufacture = production_programming.filtered(
-                    #     lambda a: a.is_remanufacture is False)
-                    # production_list = [production.name for production in production_programming]
-                    # purchase_orders = self.env['purchase.order'].search(
-                    #     [('origin', 'ilike', ','.join(production_list))])
-                    # for line in purchase_orders.order_line:
-                    #     if (
-                    #             line.product_id.server_product_process_parameters_id == workorder.surface_technics_parameters_id
-                    #             and line.product_qty == len(production_no_remanufacture)):
-                    #         if all(pur_order.state == 'purchase' for pur_order in purchase_orders):
-                    #             workorder.state = 'ready'
-                    #         else:
-                    #             workorder.state = 'waiting'
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id:
                         workorder.state = 'ready' if purchase_orders_id.state == 'purchase' else 'waiting'
                     else:
                         workorder.state = 'waiting'
 
-            # re_work = self.env['mrp.workorder'].search([('production_id', '=', workorder.production_id.id),
-            #                                             ('processing_panel', '=', workorder.processing_panel),
-            #                                             ('is_rework', '=', True), ('state', 'in', ['done', 'rework'])])
-            # cnc_workorder = self.env['mrp.workorder'].search(
-            #     [('production_id', '=', workorder.production_id.id),
-            #      ('processing_panel', '=', workorder.processing_panel),
-            #      ('routing_type', '=', 'CNC加工'), ('state', 'in', ['done', 'rework']),
-            #      ('test_results', '=', '返工')])
-            # cnc_workorder_pending = self.env['mrp.workorder'].search(
-            #     [('production_id', '=', workorder.production_id.id),
-            #      ('processing_panel', '=', workorder.processing_panel),
-            #      ('routing_type', '=', 'CNC加工'), ('state', 'in', ['pending'])])
-            # unclamp_workorder = self.env['mrp.workorder'].search(
-            #     [('production_id', '=', workorder.production_id.id),
-            #      ('sequence', '=', workorder.sequence - 1),
-            #      ('state', 'in', ['done'])])
-            # if workorder.state not in ['cancel', 'progress', 'rework']:
-            #     if workorder.production_id.state == 'rework':
-            #         if workorder.routing_type == '装夹预调':
-            #             # # 有返工工单
-            #             # if re_work:
-            #             # 新工单
-            #             if workorder.is_rework is False:
-            #                 if (workorder.production_id.programming_state == '已编程'
-            #                         and workorder.production_id.is_rework is False):
-            #                     if re_work or cnc_workorder:
-            #                         workorder.state = 'ready'
-            #                 else:
-            #                     if workorder.production_id.is_rework is True:
-            #                         if re_work or cnc_workorder:
-            #                             workorder.state = 'waiting'
-            #
-            #         elif workorder.routing_type == 'CNC加工':
-            #             pre_workorder = self.env['mrp.workorder'].search(
-            #                 [('production_id', '=', workorder.production_id.id),
-            #                  ('processing_panel', '=', workorder.processing_panel),
-            #                  ('routing_type', '=', '装夹预调'), ('state', '=', 'done')])
-            #             if pre_workorder:
-            #                 if re_work:
-            #                     workorder.state = 'waiting'
-            #         elif workorder.routing_type == '解除装夹':
-            #             if cnc_workorder:
-            #                 if not cnc_workorder_pending or unclamp_workorder.test_results == '报废':
-            #                     workorder.state = 'waiting'
-            #         # else:
-            #         #     if workorder.production_id.is_rework is True:
-            #         #         workorder.state = 'waiting'
-            #     elif workorder.production_id.state == 'progress':
-            #         if (workorder.routing_type == '装夹预调' and workorder.production_id.programming_state == '已编程'
-            #                 and workorder.is_rework is False and workorder.state not in ['done', 'rework', 'cancel']):
-            #             if workorder.production_id.is_rework is False:
-            #                 if re_work or cnc_workorder or unclamp_workorder:
-            #                     workorder.state = 'ready'
-            #             # if (re_work or cnc_workorder) and workorder.production_id.is_rework is False:
-            #             #     workorder.state = 'ready'
-            #     elif workorder.production_id.state == 'scrap':
-            #         if workorder.routing_type == '解除装夹' and unclamp_workorder.test_results == '报废':
-            #             workorder.state = 'waiting'
 
     # 重写工单开始按钮方法
     def button_start(self):
diff --git a/sf_manufacturing/models/purchase_order.py b/sf_manufacturing/models/purchase_order.py
index 3e20a0a2..2813883e 100644
--- a/sf_manufacturing/models/purchase_order.py
+++ b/sf_manufacturing/models/purchase_order.py
@@ -50,12 +50,6 @@ class PurchaseOrder(models.Model):
         for workorder in workorders:
             if workorder.routing_type == '表面工艺' and workorder.is_subcontract is True:
                 move_out = workorder.move_subcontract_workorder_ids[1]
-                # move_out = self.env['stock.move'].search(
-                #     [('location_id', '=', self.env['stock.location'].search(
-                #         [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
-                #      ('location_dest_id', '=', self.env['stock.location'].search(
-                #          [('barcode', 'ilike', 'VL-SPOC')]).id),
-                #      ('origin', '=', self.production_id.name), ('state', 'not in', ['cancel', 'done'])])
                 for mo in move_out:
                     if mo.state != 'done':
                         mo.write({'state': 'assigned', 'production_id': False})
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 44899d05..24f689d4 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -391,6 +391,23 @@ class RePurchaseOrder(models.Model):
                             production = self.env['mrp.production'].search([('name', '=', production_name)])
                             for workorder in production.workorder_ids.filtered(
                                     lambda wd: wd.routing_type == '表面工艺' and wd.state == 'waiting' and line.product_id.server_product_process_parameters_id == wd.surface_technics_parameters_id):
+                                work_ids = workorder.production_id.workorder_ids.filtered(
+                                    lambda wk: wk.state not in ['done', 'rework', 'cancel'])
+                                min_sequence_wk = min(work_ids, key=lambda wk: wk.sequence)
+                                artificial_offline = (
+                                            workorder.production_id.production_type == '人工线下加工' and workorder.production_id.schedule_state != '已排')
+                                auto_production = (
+                                            workorder.production_id.production_type == '自动化产线加工' and workorder.production_id.schedule_state != '已编程')
+                                if workorder.sequence == min_sequence_wk.sequence:
+                                    if artificial_offline or auto_production:
+                                        raise UserError('等待组件')
+                                else:
+                                    sorted_work_ids = work_ids.sorted(key=lambda w: w.sequence)
+                                    previous_workorder = self.env['mrp.workorder'].search([('sequence', '<', workorder.sequence),
+                                    ('production_id', '=', workorder.production_id.id),
+                                    ('state', '=', 'done')], order='sequence desc', limit=1)
+                                    if not previous_workorder:
+                                        raise UserError('等待组件')
                                 workorder.state = 'ready'
 
         return result
@@ -423,6 +440,7 @@ class PurchaseOrderLine(models.Model):
     part_name = fields.Char('零件名称', related='product_id.part_name', readonly=True)
     # part_number = fields.Char('零件图号',related='product_id.part_number', readonly=True)
 
+
 class ResPartnerToSale(models.Model):
     _inherit = 'res.partner'
 

From 614447d56e1e7de1b7e55f8e17bc8031b9bffc03 Mon Sep 17 00:00:00 2001
From: hy <123@qq.com>
Date: Thu, 2 Jan 2025 10:28:40 +0800
Subject: [PATCH 123/147] =?UTF-8?q?=E8=A7=A3=E5=BC=80=E5=B1=8F=E8=94=BD?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_frontend/static/src/js/custom_form_status_indicator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
index 79702f84..4992872a 100644
--- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js
+++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
@@ -139,7 +139,7 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
         owl.onMounted(() => {
             this.activeElement = this.uiService.activeElement;
             this.setRequired()
-            // this.listherHeaderBodyNum()
+            this.listherHeaderBodyNum()
         })
         return this._super(...arguments);
     },

From 81bebf836d725fe49650431bd85c2850f6209988 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 2 Jan 2025 10:59:03 +0800
Subject: [PATCH 124/147] =?UTF-8?q?sf-=E9=87=87=E8=B4=AD-=E8=AF=A2?=
 =?UTF-8?q?=E4=BB=B7=E5=8D=95=E7=8A=B6=E6=80=81=E6=B5=81=E8=BD=AC=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E6=8C=89=E9=92=AE=E5=BD=B1=E5=93=8D=E7=8E=B0=E6=9C=89?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/__manifest__.py  |  2 +-
 jikimo_purchase_tier_validation/models/models.py |  4 ++++
 jikimo_purchase_tier_validation/views/views.xml  | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/jikimo_purchase_tier_validation/__manifest__.py b/jikimo_purchase_tier_validation/__manifest__.py
index 18a63e80..91dcbb49 100644
--- a/jikimo_purchase_tier_validation/__manifest__.py
+++ b/jikimo_purchase_tier_validation/__manifest__.py
@@ -20,7 +20,7 @@
     'version': '0.1',
 
     # any module necessary for this one to work correctly
-    'depends': ['purchase', 'base_tier_validation', 'documents', 'purchase_request', 'account'],
+    'depends': ['purchase', 'base_tier_validation', 'documents', 'purchase_request', 'account', 'purchase_order_approved'],
 
     # always loaded
     'data': [
diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index e5a80f7b..5a581980 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -23,6 +23,10 @@ class jikimo_purchase_tier_validation(models.Model):
         for record in self:
             if record.need_validation and record.validation_status != 'validated':
                 raise ValidationError(_('此操作需要至少对一条记录进行审批。\n请发起审批申请。'))
+            if record.state in ['to approve']:
+                raise ValidationError(_('请先完成审批。'))
+            if record.state == 'approved':
+                record.state = 'purchase'
         return super().button_confirm()
 
     # def button_confirm(self):
diff --git a/jikimo_purchase_tier_validation/views/views.xml b/jikimo_purchase_tier_validation/views/views.xml
index ca82e729..b651e914 100644
--- a/jikimo_purchase_tier_validation/views/views.xml
+++ b/jikimo_purchase_tier_validation/views/views.xml
@@ -1,11 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
+        <record model="ir.ui.view" id="tier_validation_view_approved_purchase_order_form_inherit">
+            <field name="name">tier_validation_view_approved_purchase_order_form_inherit</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase_order_approved.purchase_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@name='button_release']" position="replace">
+                </xpath>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="tier_validation_view_purchase_order_form_inherit">
             <field name="name">tier_validation_view_purchase_order_form_inherit</field>
             <field name="model">purchase.order</field>
             <field name="inherit_id" ref="purchase.purchase_order_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//header/button[@name='button_approve']" position="replace">
+                </xpath>
                 <xpath expr="//header/button[@name='button_cancel']" position="replace">
                 </xpath>
                 <xpath expr="//header/field[@name='state']" position="replace">

From a1bf997d516b88e12e30d350310aca9e4669e932 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Thu, 2 Jan 2025 12:49:05 +0800
Subject: [PATCH 125/147] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=B2=97=E4=B8=8E?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=80=BB=E7=9B=91=E5=B2=97=E4=BD=8D=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=8D=95=E6=93=8D=E4=BD=9C=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/security/ir.model.access.csv | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index f096b449..b8862b8d 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -183,4 +183,7 @@ access_sf_manual_product_model_type_routing_sort_manager,sf_manual_product_model
 access_sf_manual_product_model_type_routing_sort_group_plan_dispatch,sf_manual_product_model_type_routing_sort_group_plan_dispatch,model_sf_manual_product_model_type_routing_sort,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_detection_result_manager,sf_detection_result_manager,model_sf_detection_result,,1,1,1,1
 
-access_mrp_workorder_batch_replan_wizard_group_plan_dispatch,mrp_workorder_batch_replan_wizard_group_plan_dispatch,model_mrp_workorder_batch_replan_wizard,sf_base.group_plan_dispatch,1,1,1,0
\ No newline at end of file
+access_mrp_workorder_batch_replan_wizard_group_plan_dispatch,mrp_workorder_batch_replan_wizard_group_plan_dispatch,model_mrp_workorder_batch_replan_wizard,sf_base.group_plan_dispatch,1,1,1,0
+
+access_mrp_workorder_group_purchase_director,mrp_workorder,model_mrp_workorder,sf_base.group_purchase_director,1,1,0,0
+access_mrp_workorder_group_purchase,mrp_workorder,model_mrp_workorder,sf_base.group_purchase,1,1,0,0
\ No newline at end of file

From 0ce51a4a66a320191c1ed81e3e7082dc52231d5a Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Thu, 2 Jan 2025 12:49:46 +0800
Subject: [PATCH 126/147] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=B7=A5?=
 =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E5=8A=A0=E5=B7=A5=E5=B7=A5=E5=8D=95=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py     |  2 +
 .../production_technology_re_adjust_wizard.py | 49 -------------------
 .../wizard/production_technology_wizard.py    | 30 ------------
 3 files changed, 2 insertions(+), 79 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 057530d0..af0f0aa9 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -941,6 +941,8 @@ class MrpProduction(models.Model):
                                       and item.process_parameters_id == work.surface_technics_parameters_id) or
                                      (item.route_id.name == work.name and item.panel
                                       and item.panel == work.processing_panel))
+                    if work.name == '人工线下加工':
+                        td_ids = technology_design_ids.filtered(lambda item: (item.route_id.name in work.name))
                     if td_ids:
                         work.sequence = td_ids[0].sequence
                 cancel_work_ids = workorder_ids.filtered(lambda item: item.state in ('已取消', 'cancel'))
diff --git a/sf_manufacturing/wizard/production_technology_re_adjust_wizard.py b/sf_manufacturing/wizard/production_technology_re_adjust_wizard.py
index 5bd32b8c..fe90f66a 100644
--- a/sf_manufacturing/wizard/production_technology_re_adjust_wizard.py
+++ b/sf_manufacturing/wizard/production_technology_re_adjust_wizard.py
@@ -25,38 +25,6 @@ class ProductionTechnologyReAdjustWizard(models.TransientModel):
             # 该制造订单的其他同一销售订单的制造订单的工艺设计处理
             if production_item != self.production_id:
                 self.env['sf.technology.design'].sudo().unified_procedure_multiple_work_orders(technology_designs, production_item)
-                # for td_other in production_item.technology_design_ids:
-                #     # if td_other.is_auto is False:
-                #     #     td_del = technology_designs.filtered(lambda tdo: tdo.route_id.id == td_other.route_id.id)
-                #     #     if not td_del or td_del.active is False:
-                #     #         td_other.write({'active': False})
-                #     for td_main in technology_designs:
-                #         route_other = production_item.technology_design_ids.filtered(
-                #             lambda td: td.route_id.id == td_main.route_id.id)
-                #         if not route_other and td_main.active is True:
-                #             production_item.write({'technology_design_ids': [(0, 0, {
-                #                 'route_id': td_main.route_id.id,
-                #                 'process_parameters_id': False if td_main.process_parameters_id is False else
-                #                 self.env[
-                #                     'sf.production.process.parameter'].search(
-                #                     [('id', '=', td_main.process_parameters_id.id)]).id,
-                #                 'sequence': td_main.sequence,
-                #                 'is_auto': td_main.is_auto})]})
-                        # else:
-                        #     for ro in route_other:
-                        #         domain = [('production_id', '=', self.production_id.id),
-                        #                   ('active', 'in', [True, False]),
-                        #                   ('route_id', '=', ro.route_id.id)]
-                        #         if ro.route_id.routing_type == '表面工艺':
-                        #             domain += [('process_parameters_id', '=', ro.process_parameters_id.id)]
-                        #         elif ro.route_id.routing_tag == 'special' and ro.is_auto is False:
-                        #             # display_name = ro.route_id.display_name
-                        #             domain += [('id', '=', ro.id)]
-                        #         elif ro.panel is not False:
-                        #             domain += [('panel', '=', ro.panel)]
-                        #         td_upd = self.env['sf.technology.design'].sudo().search(domain)
-                        #         if td_upd:
-                        #             ro.write({'sequence': td_upd.sequence, 'active': td_upd.active})
             special_design = self.env['sf.technology.design'].sudo().search(
                 [('routing_tag', '=', 'special'), ('production_id', '=', production_item.id),
                  ('is_auto', '=', False), ('active', 'in', [True, False])])
@@ -71,23 +39,6 @@ class ProductionTechnologyReAdjustWizard(models.TransientModel):
                     else:
                         domain += [('technology_design_id', '=', special.id), ('state', '!=', 'cancel')]
                     workorder = self.env['mrp.workorder'].search(domain)
-                    # previous_workorder = self.env['mrp.workorder'].search(
-                    #     [('sequence', '=', workorder.sequence - 1), ('routing_type', '=', '表面工艺'),
-                    #      ('production_id', '=', workorder.production_id.id)])
-                    # if previous_workorder:
-                    #     if previous_workorder.supplier_id != workorder.supplier_id:
-                    #         is_cancel = True
-                    # else:
-                    #     is_cancel = True
-                    # if workorder.state != 'cancel' and is_cancel is True:
-                    #     workorder.write({'state': 'cancel'})
-                    #     workorder.picking_ids.write({'state': 'cancel'})
-                    #     workorder.picking_ids.move_ids.write({'state': 'cancel'})
-                    #     purchase_order = self.env['purchase.order'].search(
-                    #         [('origin', '=', workorder.production_id.name)])
-                    #     for line in purchase_order.order_line:
-                    #         if line.product_id.server_product_process_parameters_id == workorder.surface_technics_parameters_id:
-                    #             purchase_order.write({'state': 'cancel'})
                 else:
                     workorder = self.env['mrp.workorder'].search(
                         [('technology_design_id', '=', special.id), ('production_id', '=', special.production_id.id), ('state', '!=', 'cancel')])
diff --git a/sf_manufacturing/wizard/production_technology_wizard.py b/sf_manufacturing/wizard/production_technology_wizard.py
index 1feee749..0415d1fd 100644
--- a/sf_manufacturing/wizard/production_technology_wizard.py
+++ b/sf_manufacturing/wizard/production_technology_wizard.py
@@ -27,36 +27,6 @@ class ProductionTechnologyWizard(models.TransientModel):
             if production != self.production_id:
                 self.env['sf.technology.design'].sudo().unified_procedure_multiple_work_orders(technology_designs,
                                                                                                production)
-                # for td_other in production.technology_design_ids:
-                    # if td_other.is_auto is False:
-                    #     td_del = technology_designs.filtered(lambda tdo: tdo.route_id.id == td_other.route_id.id)
-                    #     if not td_del or td_del.active is False:
-                    #         td_other.write({'active': False})
-                    # for td_main in technology_designs:
-                    #     route_other = production.technology_design_ids.filtered(
-                    #         lambda td: td.route_id.id == td_main.route_id.id)
-                    #     if not route_other and td_main.active is True:
-                    #         production.write({'technology_design_ids': [(0, 0, {
-                    #             'route_id': td_main.route_id.id,
-                    #             'process_parameters_id': False if td_main.process_parameters_id is False else self.env[
-                    #                 'sf.production.process.parameter'].search(
-                    #                 [('id', '=', td_main.process_parameters_id.id)]).id,
-                    #             'sequence': td_main.sequence})]})
-                        # else:
-                        #     for ro in route_other:
-                        #         domain = [('production_id', '=', self.production_id.id),
-                        #                   ('active', 'in', [True, False]),
-                        #                   ('route_id', '=', ro.route_id.id)]
-                        #         if ro.route_id.routing_type == '表面工艺':
-                        #             domain += [('process_parameters_id', '=', ro.process_parameters_id.id)]
-                        #         elif ro.route_id.routing_tag == 'special' and ro.is_auto is False:
-                        #             # display_name = ro.route_id.display_name
-                        #             domain += [('id', '=', ro.id)]
-                        #         elif ro.panel is not False:
-                        #             domain += [('panel', '=', ro.panel)]
-                        #         td_upd = self.env['sf.technology.design'].sudo().search(domain)
-                        #         if td_upd:
-                        #             ro.write({'sequence': td_upd.sequence, 'active': td_upd.active})
             # 特殊表面工艺
             special_design = self.env['sf.technology.design'].sudo().search(
                 [('routing_tag', '=', 'special'), ('production_id', '=', production.id),

From 2f3e12e3af4bd9b123bc73b537b65e2e8bec30fb Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Thu, 2 Jan 2025 12:50:39 +0800
Subject: [PATCH 127/147] =?UTF-8?q?=E8=A1=A8=E9=9D=A2=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BA=A7?=
 =?UTF-8?q?=E7=BA=BF=E5=8A=A0=E5=B7=A5=E8=B7=AF=E7=BA=BF=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E7=9F=AB=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 95999611..b03d761a 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -401,7 +401,7 @@ class RePurchaseOrder(models.Model):
                                 artificial_offline = (
                                             workorder.production_id.production_type == '人工线下加工' and workorder.production_id.schedule_state != '已排')
                                 auto_production = (
-                                            workorder.production_id.production_type == '自动化产线加工' and workorder.production_id.schedule_state != '已编程')
+                                            workorder.production_id.production_type == '自动化产线加工' and workorder.production_id.programming_state != '已编程')
                                 if workorder.sequence == min_sequence_wk.sequence:
                                     if artificial_offline or auto_production:
                                         raise UserError('等待组件')

From f884963abc8c4748c61cd1d29bd98d42bddfa443 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Thu, 2 Jan 2025 13:34:09 +0800
Subject: [PATCH 128/147] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E8=A1=A8=E9=9D=A2=E5=B7=A5=E8=89=BA=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=85=B3=E8=81=94=E9=87=87=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E4=B8=BA=E8=8D=89=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index b03d761a..1b282c8e 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -346,6 +346,7 @@ class RePurchaseOrder(models.Model):
             server_product_process = []
             purchase_order = pp._get_surface_technics_purchase_ids()
             if purchase_order:
+                purchase_order.write({'state': 'draft'})
                 pp.purchase_id = [(6, 0, [purchase_order.id])]
             else:
                 server_template = self.env['product.template'].search(

From f92bd8263ca03b1eb1e2bc529c2fd369fae33fa7 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Thu, 2 Jan 2025 14:20:31 +0800
Subject: [PATCH 129/147] =?UTF-8?q?=E5=BE=85=E8=B4=A8=E6=A3=80=E6=8F=90?=
 =?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quality_control/views/quality_views.xml       |  1 +
 sf_message/__manifest__.py                    |  2 +-
 sf_message/data/bussiness_node.xml            |  5 +++
 sf_message/data/template_data.xml             | 12 +++++++
 sf_message/models/__init__.py                 |  1 +
 sf_message/models/sf_message_product.py       | 14 +++++++-
 sf_message/models/sf_message_quality_check.py | 34 +++++++++++++++++++
 7 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 sf_message/models/sf_message_quality_check.py

diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml
index 790f8cef..c40d42b2 100644
--- a/quality_control/views/quality_views.xml
+++ b/quality_control/views/quality_views.xml
@@ -519,6 +519,7 @@
         <field name="name">Quality Checks</field>
         <field name="res_model">quality.check</field>
         <field name="view_mode">tree,kanban,form,pivot,graph</field>
+         <field name="context">{'is_web_request': True}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 No quality check found
diff --git a/sf_message/__manifest__.py b/sf_message/__manifest__.py
index 6796a50b..8c769d60 100644
--- a/sf_message/__manifest__.py
+++ b/sf_message/__manifest__.py
@@ -12,7 +12,7 @@
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
     'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock', 'sf_quality', 'mrp',
-                'sf_manufacturing','product'],
+                'sf_manufacturing','product','quality'],
     'data': [
         'data/bussiness_node.xml',
         'data/cron_data.xml',
diff --git a/sf_message/data/bussiness_node.xml b/sf_message/data/bussiness_node.xml
index e7c3b0ba..b429d766 100644
--- a/sf_message/data/bussiness_node.xml
+++ b/sf_message/data/bussiness_node.xml
@@ -150,5 +150,10 @@
             <field name="name">采购单已逾期提醒</field>
             <field name="model">purchase.order</field>
         </record>
+
+        <record id="bussiness_quality_check" model="jikimo.message.bussiness.node">
+            <field name="name">待质检提醒</field>
+            <field name="model">product.product</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml
index 52b226e3..11f05a3c 100644
--- a/sf_message/data/template_data.xml
+++ b/sf_message/data/template_data.xml
@@ -389,5 +389,17 @@
 事项：[共有{{num}}个采购订单已逾期]({{url}})
             </field>
         </record>
+
+        <record id="template_quality_check" model="jikimo.message.template">
+            <field name="name">待质检提醒</field>
+            <field name="model_id" ref="product.model_product_product"/>
+            <field name="model">product.product</field>
+            <field name="bussiness_node_id" ref="bussiness_quality_check"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 待质检提醒：
+单号：产品[{{name}}]({{url}})
+事项：有{{num}}个质检单需要处理。</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_message/models/__init__.py b/sf_message/models/__init__.py
index 8c215042..f8f6fcf1 100644
--- a/sf_message/models/__init__.py
+++ b/sf_message/models/__init__.py
@@ -13,3 +13,4 @@ from . import sf_message_maintenance_logs
 from . import sf_message_mrp_production_wizard
 from . import sf_message_mrp_production_adjust_wizard
 from . import sf_message_product
+from . import sf_message_quality_check
\ No newline at end of file
diff --git a/sf_message/models/sf_message_product.py b/sf_message/models/sf_message_product.py
index 85ac4ce2..0f2cfd7e 100644
--- a/sf_message/models/sf_message_product.py
+++ b/sf_message/models/sf_message_product.py
@@ -3,7 +3,7 @@ from odoo import models, fields, api, _
 from urllib.parse import urlencode
 
 
-class SFMessagePlan(models.Model):
+class SFMessageProduct(models.Model):
     _name = 'product.product'
     _inherit = ['product.product', 'jikimo.message.dispatch']
 
@@ -28,6 +28,18 @@ class SFMessagePlan(models.Model):
                         '{{number}}', str(production_num)).replace(
                         '{{request_url}}', url)
                     contents.append(content)
+            if message_queue_id.message_template_id.name == '待质检提醒':
+                content = message_queue_id.message_template_id.content
+                product_product = self.env['product.product'].sudo().search([('id', '=', int(message_queue_id.res_id))])
+                quality_check_num = self.env['quality.check'].sudo().search_count(
+                    [('product_id', '=', product_product.id), ('quality_state', '=', 'none')])
+                if quality_check_num >= 1:
+                    url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+                    action_id = self.env.ref('quality_control.quality_check_action_report').id
+                    url_with_id = f"{url}/web#view_type=list&action={action_id}"
+                    content = content.replace('{{name}}', product_product.name).replace('{{url}}', url_with_id).replace(
+                        '{{num}}', str(quality_check_num))
+                    contents.append(content)
         return contents, message_queue_ids
 
     def get_request_url(self):
diff --git a/sf_message/models/sf_message_quality_check.py b/sf_message/models/sf_message_quality_check.py
new file mode 100644
index 00000000..c53adda9
--- /dev/null
+++ b/sf_message/models/sf_message_quality_check.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+import logging
+from odoo import models, fields, api, _
+
+
+class SFMessageQualityCheck(models.Model):
+    _name = 'quality.check'
+    _inherit = ['quality.check', 'jikimo.message.dispatch']
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        result = super().create(vals_list)
+        try:
+            # 判断是否为web页面创建请求
+            is_web_request = self.env.context.get('is_web_request', False)
+            if not is_web_request:
+                for obj in result:
+                    jikimo_message_queue = self.get_message_queue(obj.product_id.id)
+                    if not jikimo_message_queue:
+                        obj.product_id.add_queue('待质检提醒')
+        except Exception as e:
+            logging.info('add_queue待质检提醒 error:%s' % e)
+        return result
+
+    def get_message_queue(self, res_id):
+        business_node_id = self.env.ref('sf_message.bussiness_quality_check').id
+        message_template = self.env["jikimo.message.template"].sudo().search([
+            ("model", "=", self._name),
+            ("bussiness_node_id", "=", business_node_id)
+        ], limit=1)
+        jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
+            [('res_id', '=', res_id), ("message_status", "in", ("pending", "sent")),
+             ('message_template_id', '=', message_template.id)])
+        return jikimo_message_queue

From eaaa13fb9aa2db1be8ec4fc126815b35d7d5e5a7 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Thu, 2 Jan 2025 14:21:18 +0800
Subject: [PATCH 130/147] =?UTF-8?q?=E5=BE=85=E8=B4=A8=E6=A3=80=E6=8F=90?=
 =?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_message/models/__init__.py b/sf_message/models/__init__.py
index f8f6fcf1..18c6b873 100644
--- a/sf_message/models/__init__.py
+++ b/sf_message/models/__init__.py
@@ -13,4 +13,4 @@ from . import sf_message_maintenance_logs
 from . import sf_message_mrp_production_wizard
 from . import sf_message_mrp_production_adjust_wizard
 from . import sf_message_product
-from . import sf_message_quality_check
\ No newline at end of file
+from . import sf_message_quality_check

From 170309b3c006329e07a5bb1cf070ba05cc909034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Fri, 3 Jan 2025 10:01:52 +0800
Subject: [PATCH 131/147] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jikimo_purchase_tier_validation/__manifest__.py b/jikimo_purchase_tier_validation/__manifest__.py
index 91dcbb49..a7bdbddf 100644
--- a/jikimo_purchase_tier_validation/__manifest__.py
+++ b/jikimo_purchase_tier_validation/__manifest__.py
@@ -20,7 +20,7 @@
     'version': '0.1',
 
     # any module necessary for this one to work correctly
-    'depends': ['purchase', 'base_tier_validation', 'documents', 'purchase_request', 'account', 'purchase_order_approved'],
+    'depends': ['purchase', 'purchase_tier_validation', 'documents', 'purchase_request', 'account', 'purchase_order_approved'],
 
     # always loaded
     'data': [

From c6aeff2006cccfa21c82d53c139fe617ce77d131 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Fri, 3 Jan 2025 10:17:33 +0800
Subject: [PATCH 132/147] =?UTF-8?q?=E5=BE=85=E8=B4=A8=E6=A3=80=E6=8F=90?=
 =?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_message/models/sf_message_quality_check.py b/sf_message/models/sf_message_quality_check.py
index c53adda9..15713791 100644
--- a/sf_message/models/sf_message_quality_check.py
+++ b/sf_message/models/sf_message_quality_check.py
@@ -25,7 +25,7 @@ class SFMessageQualityCheck(models.Model):
     def get_message_queue(self, res_id):
         business_node_id = self.env.ref('sf_message.bussiness_quality_check').id
         message_template = self.env["jikimo.message.template"].sudo().search([
-            ("model", "=", self._name),
+            ("name", "=", '待质检提醒'),
             ("bussiness_node_id", "=", business_node_id)
         ], limit=1)
         jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(

From 1936b512c237b6a75818573d9e75671397d906e4 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 3 Jan 2025 11:32:24 +0800
Subject: [PATCH 133/147] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=9A=E5=B1=82?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/models/models.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 5a581980..32eca4f0 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -87,7 +87,17 @@ class jikimo_purchase_tier_validation(models.Model):
 
     def _validate_tier(self, tiers=False):
         res = super(jikimo_purchase_tier_validation, self)._validate_tier(tiers)
-        self.state = 'approved'
+        tier_reviews = tiers or self.review_ids
+
+        # 检查是否所有审批都已通过
+        all_approved = all(
+            tier_review.review_status == 'approved'
+            for tier_review in tier_reviews
+        )
+
+        if all_approved and tier_reviews:  # 确保有审批记录
+            self.state = 'approved'
+
         return res
 
     def _rejected_tier(self, tiers=False):

From aa4b73e406d3ff29d5a70e8827a85b895932b20d Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 3 Jan 2025 11:43:27 +0800
Subject: [PATCH 134/147] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 32eca4f0..d90ed257 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -91,7 +91,7 @@ class jikimo_purchase_tier_validation(models.Model):
 
         # 检查是否所有审批都已通过
         all_approved = all(
-            tier_review.review_status == 'approved'
+            tier_review.status == 'approved'
             for tier_review in tier_reviews
         )
 

From d182641d8193c1ce3f231edbf2e71f15e40d895c Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Fri, 3 Jan 2025 12:52:24 +0800
Subject: [PATCH 135/147] =?UTF-8?q?=E5=A4=96=E8=B4=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py
index 4e8679f8..f4712f67 100644
--- a/sf_message/models/sf_message_sale.py
+++ b/sf_message/models/sf_message_sale.py
@@ -32,7 +32,7 @@ class SFMessageSale(models.Model):
                 for purchase_order_id in purchase_order_ids:
                     if purchase_order_id.purchase_type == 'outsourcing':
                         purchase_order_id.add_queue('委外加工采购单提醒')
-                    if purchase_order_id.purchase_type == 'standard':
+                    if purchase_order_id.purchase_type == 'outside':
                         purchase_order_id.add_queue('外购订单采购单提醒')
             except Exception as e:
                 logging.info('add_queue error:%s' % e)

From 0d28df04151e9cc80d4981b7099461090e18c42e Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 3 Jan 2025 12:52:27 +0800
Subject: [PATCH 136/147] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=A4=9A=E5=B1=82?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/models/models.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 5a581980..d90ed257 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -87,7 +87,17 @@ class jikimo_purchase_tier_validation(models.Model):
 
     def _validate_tier(self, tiers=False):
         res = super(jikimo_purchase_tier_validation, self)._validate_tier(tiers)
-        self.state = 'approved'
+        tier_reviews = tiers or self.review_ids
+
+        # 检查是否所有审批都已通过
+        all_approved = all(
+            tier_review.status == 'approved'
+            for tier_review in tier_reviews
+        )
+
+        if all_approved and tier_reviews:  # 确保有审批记录
+            self.state = 'approved'
+
         return res
 
     def _rejected_tier(self, tiers=False):

From 6b61df9d507d3c6915ca50d3119ee5286f5a749c Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Fri, 3 Jan 2025 15:04:22 +0800
Subject: [PATCH 137/147] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=A4=96=E5=8D=8F?=
 =?UTF-8?q?=E5=8F=91=E6=96=99=E9=80=9A=E7=9F=A5=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_message/__manifest__.py                    |  3 +-
 .../models/sf_message_mrp_production.py       |  5 ++-
 sf_message/views/stock_picking_view.xml       | 37 +++++++++++++++++++
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 sf_message/views/stock_picking_view.xml

diff --git a/sf_message/__manifest__.py b/sf_message/__manifest__.py
index 8c769d60..42f1ad13 100644
--- a/sf_message/__manifest__.py
+++ b/sf_message/__manifest__.py
@@ -12,7 +12,7 @@
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
     'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock', 'sf_quality', 'mrp',
-                'sf_manufacturing','product','quality'],
+                'sf_manufacturing', 'product', 'quality'],
     'data': [
         'data/bussiness_node.xml',
         'data/cron_data.xml',
@@ -20,6 +20,7 @@
         'security/ir.model.access.csv',
         'views/mrp_workorder_views.xml',
         'views/purchase_order_view.xml',
+        'views/stock_picking_view.xml',
     ],
     'test': [
     ],
diff --git a/sf_message/models/sf_message_mrp_production.py b/sf_message/models/sf_message_mrp_production.py
index b0689b81..9fd21e9e 100644
--- a/sf_message/models/sf_message_mrp_production.py
+++ b/sf_message/models/sf_message_mrp_production.py
@@ -63,8 +63,9 @@ class SFMessageMrpProduction(models.Model):
                     [('origin', 'in', mrp_production_names), ('state', '=', 'assigned')])
                 if stock_picking_num >= 1:
                     url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-                    action_id = self.env.ref('stock.action_picking_tree_ready').id
-                    url_with_id = f"{url}/web#view_type=list&action={action_id}"
+                    action_id = self.env.ref('sf_message.action_picking_outsourced_tree_ready').id
+                    menu_id = self.env.ref('stock.menu_stock_root').id
+                    url_with_id = f"{url}/web#view_type=list&action={action_id}&menu_id={menu_id}"
                     content = content.replace('{{name}}', mrp_production.product_id.name).replace('{{url}}',
                                                                                                   url_with_id).replace(
                         '{{num}}', str(stock_picking_num))
diff --git a/sf_message/views/stock_picking_view.xml b/sf_message/views/stock_picking_view.xml
new file mode 100644
index 00000000..9087aa18
--- /dev/null
+++ b/sf_message/views/stock_picking_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_picking_internal_search_sf" model="ir.ui.view">
+        <field name="name">stock.picking.search</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_internal_search"/>
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='activities_exception']" position="before">
+                <filter name="outsourced" string="外协出库" domain="[('picking_type_id.name', '=', '外协出库')]"
+                        invisible="1"/>
+                <separator/>
+            </xpath>
+        </field>
+    </record>
+
+
+    <record id="action_picking_outsourced_tree_ready" model="ir.actions.act_window">
+        <field name="name">待办</field>
+        <field name="res_model">stock.picking</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_mode">tree,kanban,form,calendar</field>
+        <field name="domain"></field>
+        <field name="context">{'search_default_outsourced': 1,'contact_display': 'partner_address',
+            'search_default_available': 1}
+        </field>
+        <field name="search_view_id" ref="stock.view_picking_internal_search"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                没有仓库调拨。 让我们创建一个！
+            </p>
+            <p>
+                移动允许您将产品从一个位置移动到另外一个位置。
+            </p>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file

From b3f56754cdae93627b3c162c53368fe7fbebb9d7 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 3 Jan 2025 15:09:03 +0800
Subject: [PATCH 138/147] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_plan_management/i18n/zh_CN.po | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sf_plan_management/i18n/zh_CN.po b/sf_plan_management/i18n/zh_CN.po
index b811963b..dde8ccfd 100644
--- a/sf_plan_management/i18n/zh_CN.po
+++ b/sf_plan_management/i18n/zh_CN.po
@@ -2023,6 +2023,11 @@ msgstr "<span class=\"o_stat_text\">损失</span>"
 msgid "<span class=\"o_stat_text\">Maintenance</span>"
 msgstr ""
 
+#. module: sf_manufacturing
+#: model:ir.model.fields.selection,name:sf_manufacturing.selection__mrp_production__state__confirmed
+msgid "待排程"
+msgstr "待排程"
+
 #. module: mrp
 #: model_terms:ir.ui.view,arch_db:mrp.product_product_form_view_bom_button
 #: model_terms:ir.ui.view,arch_db:mrp.product_template_form_view_bom_button

From 5cff411aafa74adde0b2b4b3d4c7a61721d318a4 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 3 Jan 2025 15:25:47 +0800
Subject: [PATCH 139/147] =?UTF-8?q?r=E7=8E=AF=E5=A2=83=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wizards/__init__.py                           |  3 ++-
 .../wizards/comment_wizard.py                     | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 jikimo_purchase_tier_validation/wizards/comment_wizard.py

diff --git a/jikimo_purchase_tier_validation/wizards/__init__.py b/jikimo_purchase_tier_validation/wizards/__init__.py
index e134fb87..43edb50d 100644
--- a/jikimo_purchase_tier_validation/wizards/__init__.py
+++ b/jikimo_purchase_tier_validation/wizards/__init__.py
@@ -1 +1,2 @@
-from . import upload_file_wizard
\ No newline at end of file
+from . import upload_file_wizard
+from . import comment_wizard
\ No newline at end of file
diff --git a/jikimo_purchase_tier_validation/wizards/comment_wizard.py b/jikimo_purchase_tier_validation/wizards/comment_wizard.py
new file mode 100644
index 00000000..f45ecde6
--- /dev/null
+++ b/jikimo_purchase_tier_validation/wizards/comment_wizard.py
@@ -0,0 +1,15 @@
+from odoo import models, fields
+
+
+class CommentWizard(models.TransientModel):
+    _inherit = "comment.wizard"
+
+    def add_comment(self):
+
+        rec = self.env[self.res_model].browse(self.res_id)
+
+        self.review_ids = rec.review_ids
+
+        result = super(CommentWizard, self).add_comment()
+
+        return result

From aaded331cdd8ca23ec1eb329f55579b9bb7080f9 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 6 Jan 2025 10:11:44 +0800
Subject: [PATCH 140/147] =?UTF-8?q?=E8=A7=A3=E9=99=A4=E8=A3=85=E5=A4=B9?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=A2=9E=E5=8A=A0=E5=89=8D=E7=BD=AE=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/wizard/workpiece_delivery_wizard.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sf_manufacturing/wizard/workpiece_delivery_wizard.py b/sf_manufacturing/wizard/workpiece_delivery_wizard.py
index 10171806..6a13fc08 100644
--- a/sf_manufacturing/wizard/workpiece_delivery_wizard.py
+++ b/sf_manufacturing/wizard/workpiece_delivery_wizard.py
@@ -207,8 +207,9 @@ class WorkpieceDeliveryWizard(models.TransientModel):
                     workorder.production_line_id.id != self.production_ids[0].production_line_id.id):
                 raise UserError(f'该rfid对应的制造订单号为{workorder.production_id.name}的目的生产线不一致')
 
-            # 调用打印成品条码方法
-            workorder.print_method()
+            if workorder.routing_type == '解除装夹':
+                # 调用打印成品条码方法
+                workorder.print_method()
 
             # 将对象添加到对应的同模型且是多对多类型里
             self.production_ids |= workorder.production_id

From 403e64a9570ecb4d2b9f73b2e1336ce730e789e0 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Mon, 6 Jan 2025 11:09:22 +0800
Subject: [PATCH 141/147] =?UTF-8?q?=E8=A1=A8=E9=9D=A2=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=85=B3=E8=81=94=E9=87=87=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 31 +++++++++++++++---------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 8b34feb8..447c6da1 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -330,7 +330,7 @@ class ResMrpWorkOrder(models.Model):
         return result
 
     def _get_surface_technics_purchase_ids(self):
-        domain = [('origin', '=', self.production_id.name), ('purchase_type', '=', 'consignment')]
+        domain = [('origin', 'like', '%' + self.production_id.name + '%'), ('purchase_type', '=', 'consignment')]
         purchase_orders = self.env['purchase.order'].search(domain)
         purchase_orders_id = self.env['purchase.order']
         for po in purchase_orders:
@@ -1058,16 +1058,18 @@ class ResMrpWorkOrder(models.Model):
                     and workorder.production_id.schedule_state == '已排'
                     and len(workorder.production_id.picking_ids.filtered(
                         lambda w: w.state not in ['done', 'cancel'])) == 0):
+                workorder.state = 'ready'
                 if workorder.is_subcontract is True:
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id.state == 'purchase':
-                        workorder.state = 'ready'
+                        move_out = workorder.move_subcontract_workorder_ids[1]
+                        for mo in move_out:
+                            if mo.state != 'done':
+                                mo.write({'state': 'assigned', 'production_id': False})
                         continue
-                    else:
-                        workorder.state = 'waiting'
-                        continue
-                else:
-                    workorder.state = 'ready'
+                continue
+            else:
+                workorder.state = 'waiting'
                 continue
             # ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
             if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
@@ -1076,7 +1078,7 @@ class ResMrpWorkOrder(models.Model):
                 if workorder.state != 'waiting':
                     workorder.state = 'waiting'
                 continue
-            if workorder.production_id.programming_state == '已编程' and workorder.technology_design_id.routing_tag != 'special':
+            if workorder.production_id.programming_state == '已编程':
                 workorder.state = 'ready'
             elif workorder.state != 'waiting':
                 workorder.state = 'waiting'
@@ -1091,12 +1093,17 @@ class ResMrpWorkOrder(models.Model):
                 if workorder.is_subcontract is False:
                     workorder.state = 'ready'
                 else:
+                    if len(workorder.production_id.picking_ids.filtered(
+                            lambda w: w.state not in ['done',
+                                                      'cancel'])) == 0 and workorder.production_id.programming_state == '已编程':
+                        workorder.state = 'ready'
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id:
-                        workorder.state = 'ready' if purchase_orders_id.state == 'purchase' else 'waiting'
-                    else:
-                        workorder.state = 'waiting'
-
+                        if purchase_orders_id.state == 'purchase':
+                            move_out = workorder.move_subcontract_workorder_ids[1]
+                            for mo in move_out:
+                                if mo.state != 'done':
+                                    mo.write({'state': 'assigned', 'production_id': False})
 
     # 重写工单开始按钮方法
     def button_start(self):

From 9f1514bd1475a938af8979d240ccaa323c1fef19 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Mon, 6 Jan 2025 11:44:33 +0800
Subject: [PATCH 142/147] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=92=8C=E8=BF=BD=E6=BA=AF=E5=8F=82=E8=80=83?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index fa723283..72581d8c 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -605,10 +605,10 @@ class StockPicking(models.Model):
                             sale_info = self.env['sale.order'].sudo().search(
                                 [('name', '=', sale_name)])
                     else:
-                        production_list = self.env['mrp.production'].sudo().search(
+                        sale_order_line = self.env['sale.order.line'].sudo().search(
                             [('product_id', '=', product_id.id)])
-                        if production_list:
-                            sale_info = production_list[0].sale_order_id
+                        if sale_order_line:
+                            sale_info = sale_order_line[0].order_id
                     if sale_info:
                         item.sale_order_id = sale_info.id
                         item.retrospect_ref = sale_info.order_code

From 0bd65b5da8fd3a860fad21f76bfe7c71a49baf05 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Mon, 6 Jan 2025 13:03:15 +0800
Subject: [PATCH 143/147] =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 26 ++++++++----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 447c6da1..6cb177dc 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1058,18 +1058,16 @@ class ResMrpWorkOrder(models.Model):
                     and workorder.production_id.schedule_state == '已排'
                     and len(workorder.production_id.picking_ids.filtered(
                         lambda w: w.state not in ['done', 'cancel'])) == 0):
-                workorder.state = 'ready'
                 if workorder.is_subcontract is True:
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id.state == 'purchase':
-                        move_out = workorder.move_subcontract_workorder_ids[1]
-                        for mo in move_out:
-                            if mo.state != 'done':
-                                mo.write({'state': 'assigned', 'production_id': False})
+                        workorder.state = 'ready'
                         continue
-                continue
-            else:
-                workorder.state = 'waiting'
+                    else:
+                        workorder.state = 'waiting'
+                        continue
+                else:
+                    workorder.state = 'ready'
                 continue
             # ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
             if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
@@ -1093,17 +1091,11 @@ class ResMrpWorkOrder(models.Model):
                 if workorder.is_subcontract is False:
                     workorder.state = 'ready'
                 else:
-                    if len(workorder.production_id.picking_ids.filtered(
-                            lambda w: w.state not in ['done',
-                                                      'cancel'])) == 0 and workorder.production_id.programming_state == '已编程':
-                        workorder.state = 'ready'
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id:
-                        if purchase_orders_id.state == 'purchase':
-                            move_out = workorder.move_subcontract_workorder_ids[1]
-                            for mo in move_out:
-                                if mo.state != 'done':
-                                    mo.write({'state': 'assigned', 'production_id': False})
+                        workorder.state = 'ready' if purchase_orders_id.state == 'purchase' else 'waiting'
+                    else:
+                        workorder.state = 'waiting'
 
     # 重写工单开始按钮方法
     def button_start(self):

From bc475441a2e572cef85b4e1103dd33b696a8729c Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 6 Jan 2025 13:11:22 +0800
Subject: [PATCH 144/147] =?UTF-8?q?1=E3=80=81=E5=8E=BB=E9=99=A4=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=BC=80=E5=A7=8B=E6=8C=89=E9=92=AE=E7=9A=84=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E7=A1=AE=E8=AE=A4=EF=BC=9B2=E3=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=89=98=E7=9B=98=E5=85=A5=E5=BA=93=E5=90=8E=E5=A4=B9?=
 =?UTF-8?q?=E5=85=B7=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=BF=98=E6=98=AF=E6=9C=AA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E7=9A=84=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      | 26 ++++++++++++-------
 sf_manufacturing/views/mrp_workorder_view.xml |  2 +-
 .../models/maintenance_equipment.py           |  4 +++
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 6cb177dc..447c6da1 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1058,16 +1058,18 @@ class ResMrpWorkOrder(models.Model):
                     and workorder.production_id.schedule_state == '已排'
                     and len(workorder.production_id.picking_ids.filtered(
                         lambda w: w.state not in ['done', 'cancel'])) == 0):
+                workorder.state = 'ready'
                 if workorder.is_subcontract is True:
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id.state == 'purchase':
-                        workorder.state = 'ready'
+                        move_out = workorder.move_subcontract_workorder_ids[1]
+                        for mo in move_out:
+                            if mo.state != 'done':
+                                mo.write({'state': 'assigned', 'production_id': False})
                         continue
-                    else:
-                        workorder.state = 'waiting'
-                        continue
-                else:
-                    workorder.state = 'ready'
+                continue
+            else:
+                workorder.state = 'waiting'
                 continue
             # ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
             if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
@@ -1091,11 +1093,17 @@ class ResMrpWorkOrder(models.Model):
                 if workorder.is_subcontract is False:
                     workorder.state = 'ready'
                 else:
+                    if len(workorder.production_id.picking_ids.filtered(
+                            lambda w: w.state not in ['done',
+                                                      'cancel'])) == 0 and workorder.production_id.programming_state == '已编程':
+                        workorder.state = 'ready'
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id:
-                        workorder.state = 'ready' if purchase_orders_id.state == 'purchase' else 'waiting'
-                    else:
-                        workorder.state = 'waiting'
+                        if purchase_orders_id.state == 'purchase':
+                            move_out = workorder.move_subcontract_workorder_ids[1]
+                            for mo in move_out:
+                                if mo.state != 'done':
+                                    mo.write({'state': 'assigned', 'production_id': False})
 
     # 重写工单开始按钮方法
     def button_start(self):
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 1e47b873..d5cba300 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -172,7 +172,7 @@
 
                 <!--                <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','to be detected')), ('is_user_working', '!=', False)]}"/>-->
-                <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"
+                <button name="button_start" type="object" string="开始" class="btn-success"
                         attrs="{'invisible': [('state', '!=', 'ready')]}"/>
                 <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)]}"/>
diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index af9d4931..bb0701d4 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -143,6 +143,10 @@ class StockLot(models.Model):
                             record.tool_material_status = '报废'
                         else:
                             record.tool_material_status = '未入库'
+                elif record.product_id.categ_id.name in ['夹具']:
+                    if (record.quant_ids and record.quant_ids[-1].location_id.name in ['夹具房']
+                            and record.tool_material_status == '未入库'):
+                        record.tool_material_status = '可用'
 
     @api.model
     def name_search(self, name='', args=None, operator='ilike', limit=100):

From 081880b4bba2a832226707c990c47ad85dcc7508 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Mon, 6 Jan 2025 13:20:10 +0800
Subject: [PATCH 145/147] =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 31 +++++++++++++++++-------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 6cb177dc..bb215b16 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1058,16 +1058,20 @@ class ResMrpWorkOrder(models.Model):
                     and workorder.production_id.schedule_state == '已排'
                     and len(workorder.production_id.picking_ids.filtered(
                         lambda w: w.state not in ['done', 'cancel'])) == 0):
+                workorder.state = 'ready'
                 if workorder.is_subcontract is True:
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id.state == 'purchase':
-                        workorder.state = 'ready'
+                        move_out = workorder.move_subcontract_workorder_ids[1]
+                        for mo in move_out:
+                            if mo.state != 'done':
+                                mo.write({'state': 'assigned', 'production_id': False})
+                            if not mo.move_line_ids:
+                                self.env['stock.move.line'].create(mo.get_move_line(workorder.production_id, workorder))
                         continue
-                    else:
-                        workorder.state = 'waiting'
-                        continue
-                else:
-                    workorder.state = 'ready'
+                continue
+            else:
+                workorder.state = 'waiting'
                 continue
             # ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
             if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
@@ -1091,11 +1095,20 @@ class ResMrpWorkOrder(models.Model):
                 if workorder.is_subcontract is False:
                     workorder.state = 'ready'
                 else:
+                    if len(workorder.production_id.picking_ids.filtered(
+                            lambda w: w.state not in ['done',
+                                                      'cancel'])) == 0 and workorder.production_id.programming_state == '已编程':
+                        workorder.state = 'ready'
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id:
-                        workorder.state = 'ready' if purchase_orders_id.state == 'purchase' else 'waiting'
-                    else:
-                        workorder.state = 'waiting'
+                        if purchase_orders_id.state == 'purchase':
+                            move_out = workorder.move_subcontract_workorder_ids[1]
+                            for mo in move_out:
+                                if mo.state != 'done':
+                                    mo.write({'state': 'assigned', 'production_id': False})
+                                    if not mo.move_line_ids:
+                                        self.env['stock.move.line'].create(
+                                            mo.get_move_line(workorder.production_id, workorder))
 
     # 重写工单开始按钮方法
     def button_start(self):

From b6f3382e5da313186ec5fd83e9cceb41506eb3c8 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Mon, 6 Jan 2025 13:34:57 +0800
Subject: [PATCH 146/147] =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 32 +++++++-----------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index d3bb41ec..0a56a8aa 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1059,21 +1059,16 @@ class ResMrpWorkOrder(models.Model):
                     and workorder.production_id.schedule_state == '已排'
                     and len(workorder.production_id.picking_ids.filtered(
                         lambda w: w.state not in ['done', 'cancel'])) == 0):
-                workorder.state = 'ready'
                 if workorder.is_subcontract is True:
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id.state == 'purchase':
-                        move_out = workorder.move_subcontract_workorder_ids[1]
-                        for mo in move_out:
-                            if mo.state != 'done':
-                                mo.write({'state': 'assigned', 'production_id': False})
-                            if not mo.move_line_ids:
-                                self.env['stock.move.line'].create(mo.get_move_line(workorder.production_id, workorder))
+                        workorder.state = 'ready'
                         continue
-                continue
-            else:
-                workorder.state = 'waiting'
-                continue
+                    else:
+                        workorder.state = 'waiting'
+                        continue
+                else:
+                    workorder.state = 'ready'
             # ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
             if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
                     or workorder.production_id.schedule_state != '已排'
@@ -1096,20 +1091,11 @@ class ResMrpWorkOrder(models.Model):
                 if workorder.is_subcontract is False:
                     workorder.state = 'ready'
                 else:
-                    if len(workorder.production_id.picking_ids.filtered(
-                            lambda w: w.state not in ['done',
-                                                      'cancel'])) == 0 and workorder.production_id.programming_state == '已编程':
-                        workorder.state = 'ready'
                     purchase_orders_id = self._get_surface_technics_purchase_ids()
                     if purchase_orders_id:
-                        if purchase_orders_id.state == 'purchase':
-                            move_out = workorder.move_subcontract_workorder_ids[1]
-                            for mo in move_out:
-                                if mo.state != 'done':
-                                    mo.write({'state': 'assigned', 'production_id': False})
-                                    if not mo.move_line_ids:
-                                        self.env['stock.move.line'].create(
-                                            mo.get_move_line(workorder.production_id, workorder))
+                        workorder.state = 'ready' if purchase_orders_id.state == 'purchase' else 'waiting'
+                    else:
+                        workorder.state = 'waiting'
 
     # 重写工单开始按钮方法
     def button_start(self):

From 196b427867c58e62d7e910f82881d7a153f57211 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Mon, 6 Jan 2025 13:39:21 +0800
Subject: [PATCH 147/147] =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 0a56a8aa..b1f56ca7 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1069,6 +1069,7 @@ class ResMrpWorkOrder(models.Model):
                         continue
                 else:
                     workorder.state = 'ready'
+                    continue
             # ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
             if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
                     or workorder.production_id.schedule_state != '已排'