From a783f9c271c150f0f47fca78243f8d733528d27f Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 29 Nov 2024 14:32:58 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E8=BD=AC=E8=B4=A6=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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_plan_management/i18n/zh_CN.po b/sf_plan_management/i18n/zh_CN.po
index 20b7f9f3..8863c213 100644
--- a/sf_plan_management/i18n/zh_CN.po
+++ b/sf_plan_management/i18n/zh_CN.po
@@ -15907,7 +15907,7 @@ msgstr "内部参考"
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 #, python-format
 msgid "Internal Transfer"
-msgstr "内部转账"
+msgstr "厂内出入库"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__transfer_account_id

From 8d461e61b378510d360926fff0da3147aacc16ee Mon Sep 17 00:00:00 2001
From: hy <123@qq.com>
Date: Fri, 29 Nov 2024 14:37:48 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/web_gantt/static/src/js/gantt_row.js b/web_gantt/static/src/js/gantt_row.js
index fb7ffab7..cae52879 100644
--- a/web_gantt/static/src/js/gantt_row.js
+++ b/web_gantt/static/src/js/gantt_row.js
@@ -602,7 +602,7 @@ var GanttRow = Widget.extend({
                 // pill._color = self._getColor(pill[self.colorField]);
                 // 设置pill背景颜色2  修改时间2024年6月25日17:09:43
                 let isDelay = false
-                if(pill.state != 'processing' && pill.state != 'finished') { // 判断待加工
+                if(pill.state != 'processing' && pill.state != 'finished' && pill.order_deadline) { // 判断待加工
                     isDelay = pill.order_deadline.isBefore(new Date())
                 }
                 if(isDelay) {

From 1f1bdd08ed8fad993c8b2c7f82a05d20bf062b1e Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 29 Nov 2024 15:59:04 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=A6=82=E8=A7=88=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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_plan_management/i18n/zh_CN.po b/sf_plan_management/i18n/zh_CN.po
index 8863c213..91b32d41 100644
--- a/sf_plan_management/i18n/zh_CN.po
+++ b/sf_plan_management/i18n/zh_CN.po
@@ -16133,7 +16133,7 @@ msgstr "库存概览"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.stock_picking_type_action
 msgid "Internal Transfers"
-msgstr "厂内出入库"
+msgstr "库存概览"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_quant__inventory_quantity_set

From dc68ecb58439cd47f8bd27a19678f18fa36bfc2d Mon Sep 17 00:00:00 2001
From: hy <123@qq.com>
Date: Fri, 29 Nov 2024 16:26:32 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=8E=92=E7=A8=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E5=B7=A5=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B9=E5=92=8C=E6=95=B0=E9=87=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=87=8D=E5=8F=A0=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index 8eb76259..6904dbac 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -536,3 +536,7 @@ div:has(.o_required_modifier) > label::before {
   position: unset;
 }
 
+// 修复搜索面板checkbox样式
+.o_search_panel .form-check .form-check-label span {
+  position: relative;
+}
\ No newline at end of file

From 7025bde56e2bf7461b2bcdcea2ff072d99df342c Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 2 Dec 2024 13:46:20 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E8=BF=94=E5=B7=A5=E6=8A=A5=E5=BA=9F=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 7bd9d1c8..4ea08f94 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -126,7 +126,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 13fff868..be1a6523 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="异常反馈"
+                <button name="button_rework_pre" type="object" string="异常反馈" invisible="1"
                         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 6f9d1c61..56d924e9 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 d6afd556d3e62b08f99010a225e3b714d1331a24 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Tue, 3 Dec 2024 15:59:10 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E8=AF=A2=E4=BB=B7=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
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, 4 insertions(+), 2 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 4ea08f94..2f36ad79 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -283,7 +283,8 @@ class ResMrpWorkOrder(models.Model):
                 # if technology_design.is_auto is False:
                 #     domain = [('origin', '=', order.production_id.name)]
                 # else:
-                domain = [('purchase_type', '=', 'consignment'), ('origin', '=', order.production_id.name)]
+                domain = [('purchase_type', '=', 'consignment'), ('origin', '=', order.production_id.name),
+                          ('state', '!=', 'cancel')]
                 purchase = self.env['purchase.order'].search(domain)
                 purchase_num = 0
                 if not purchase:
@@ -313,7 +314,8 @@ class ResMrpWorkOrder(models.Model):
         # if technology_design.is_auto is False:
         #     domain = [('origin', '=', self.production_id.name)]
         # else:
-        domain = [('origin', '=', self.production_id.name), ('purchase_type', '=', 'consignment')]
+        domain = [('origin', '=', self.production_id.name), ('purchase_type', '=', 'consignment'),
+                  ('state', '!=', 'cancel')]
         purchase_orders = self.env['purchase.order'].search(domain)
         purchase_orders_id = None
         for po in purchase_orders:

From 9a1cde6abcef47f36cfe2c795faa3dd63c796e88 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Wed, 4 Dec 2024 10:45:46 +0800
Subject: [PATCH 07/13] =?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=E4=B8=8E=E8=B0=83=E6=8B=A8=E5=8D=95?=
 =?UTF-8?q?=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py | 38 ++++-------------------
 sf_manufacturing/models/mrp_workorder.py  | 14 ++++-----
 sf_sale/models/sale_order.py              |  3 +-
 3 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 9156dc38..f24eb6b9 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -729,40 +729,14 @@ class MrpProduction(models.Model):
                 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:
-                            # 创建外协出入库单和采购订单
-                            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 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:
-                                    # 立即创建外协出入库单和采购订单
-                                    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,
+                    if not workorder.picking_ids:
+                        self.env['stock.picking'].create_outcontract_picking(workorder, production)
+                    # if not workorder.
+                    if not workorder.purchase_id:
+                        self.env['purchase.order'].get_purchase_order(workorder, production,
                                                                   product_id_to_production_names)
 
+
     # 工单排序
     def _reset_work_order_sequence1(self, k):
         for rec in self:
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 4ea08f94..a55523a0 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -135,7 +135,7 @@ 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='外协出入库单')
-    # purchase_id = fields.Many2one('purchase.order', string='外协采购单')
+    purchase_id = fields.Many2many('purchase.order', string='外协采购单')
     surface_technics_picking_count = fields.Integer("外协出入库", compute='_compute_surface_technics_picking_ids')
     surface_technics_purchase_count = fields.Integer("外协采购", compute='_compute_surface_technics_purchase_ids')
 
@@ -239,13 +239,11 @@ class ResMrpWorkOrder(models.Model):
                 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:
-                        # process_product = self.env['product.template']._get_process_parameters_product(
-                        #     previous_workorder.surface_technics_parameters_id)
-                        domain += [('surface_technics_parameters_id', '=', workorder.surface_technics_parameters_id.id)]
-                else:
-                    domain += [('surface_technics_parameters_id', '=', workorder.surface_technics_parameters_id.id)]
+                # if previous_workorder:
+                #     if previous_workorder.supplier_id != workorder.supplier_id:
+                #         domain += [('surface_technics_parameters_id', '=', workorder.surface_technics_parameters_id.id)]
+                # else:
+                domain += [('surface_technics_parameters_id', '=', workorder.surface_technics_parameters_id.id)]
                 picking_ids = self.env['stock.picking'].search(domain, order='id asc')
                 workorder.surface_technics_picking_count = len(picking_ids)
                 workorder.picking_ids = picking_ids.ids
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index e225c274..3879860e 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -280,12 +280,13 @@ class RePurchaseOrder(models.Model):
                             }))
 
         if server_product_process:
-            self.env['purchase.order'].sudo().create({
+            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})
+            consecutive_process_parameters.purchase_id = [(6, 0, [purchase_order.id])]
         # self.env.cr.commit()
 
     @api.onchange('order_line')

From e260ef01f0788374b24eb82c8dd81ade7089112f Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 4 Dec 2024 11:43:02 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=20=E5=BF=AB=E9=80=9F=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=20=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/quick_easy_order_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sf_sale/views/quick_easy_order_view.xml b/sf_sale/views/quick_easy_order_view.xml
index 3b386062..89792a49 100644
--- a/sf_sale/views/quick_easy_order_view.xml
+++ b/sf_sale/views/quick_easy_order_view.xml
@@ -128,9 +128,9 @@
         <!--                action="account.res_partner_action_customer"-->
         <!--                groups="sales_team.group_sale_salesman"-->
         <!--                sequence="40"/>-->
-        <menuitem sequence="21" name="快速订单" id="menu_quick_easy_order"
-                  action="action_quick_easy_order"
-                  parent="sale.sale_order_menu"
-                  groups="sales_team.group_sale_salesman,sf_base.group_sale_salemanager,sf_base.group_sale_director"/>
+<!--        <menuitem sequence="21" name="快速订单" id="menu_quick_easy_order"-->
+<!--                  action="action_quick_easy_order"-->
+<!--                  parent="sale.sale_order_menu"-->
+<!--                  groups="sales_team.group_sale_salesman,sf_base.group_sale_salemanager,sf_base.group_sale_director"/>-->
     </data>
 </odoo>
\ No newline at end of file

From d933416b2d14ff4436a3812eb2d0b32b320886e4 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 4 Dec 2024 11:52:52 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=A4=84=E7=90=86=E2=80=9C=E5=88=B6?=
 =?UTF-8?q?=E9=80=A0=E8=AE=A2=E5=8D=95=E9=80=80=E5=9B=9E=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=89=B9=E6=AE=8A=E8=A1=A8=E9=9D=A2=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA=E5=90=8E=E5=AF=B9=E5=BA=94=E5=9D=AF=E6=96=99=E7=9A=84?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E4=B9=9F=E5=8F=98=E6=88=90=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E7=8A=B6=E6=80=81=E4=BA=86=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/wizard/production_technology_wizard.py b/sf_manufacturing/wizard/production_technology_wizard.py
index a02bb8f6..5fbdb7d7 100644
--- a/sf_manufacturing/wizard/production_technology_wizard.py
+++ b/sf_manufacturing/wizard/production_technology_wizard.py
@@ -80,7 +80,7 @@ class ProductionTechnologyWizard(models.TransientModel):
                         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)])
+                            [('origin', '=', workorder.production_id.name), ('purchase_type', '=', 'consignment')])
                         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'})

From 5b43cceb94d8bd1669cc956760a7fd70b50f9620 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 4 Dec 2024 11:56:38 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E7=9A=84=E3=80=90=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92=E3=80=91=E9=A1=B5=E9=9D=A2=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E3=80=90CNC?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E8=AE=A1=E5=88=92=E6=8E=92=E7=A8=8B=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index fad3d779..47e1dd54 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -257,7 +257,7 @@
 
 
         <record id="sf_production_plan_action" model="ir.actions.act_window">
-            <field name="name">制造订单生产计划</field>
+            <field name="name">CNC产线计划排程</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.production.plan</field>
             <field name="view_mode">gantt,tree,form</field>

From 6366904c91e0312844553ae1332e4744c304dfac Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 4 Dec 2024 15:37:58 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E4=BE=9B?=
 =?UTF-8?q?=E6=96=99=E5=85=A5=E5=BA=93=E5=8D=95=E7=9A=84=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 0c01a57c..898bec06 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -957,7 +957,7 @@ class ReStockMove(models.Model):
         合并制造订单的完成move单据
         """
         res = super(ReStockMove, self)._merge_moves_fields()
-        if self[0].origin and self.picking_type_id.name in ['生产发料', '内部调拨', '生产入库']:
+        if self[0].origin and self.picking_type_id.name in ['生产发料', '内部调拨', '生产入库', '客供料入库']:
             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)])

From 27ec5b1b74f02a3f6d803dee8930afd76ed48f95 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Wed, 4 Dec 2024 16:13:55 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=8F=9C=E5=8D=95=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 5f9a7ef3..fd0a5ead 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -738,7 +738,7 @@
         <!--                  parent="mrp.menu_mrp_manufacturing"-->
         <!--                  sequence="1"/>-->
 
-        <menuitem id="menu_mrp_production_action"
+        <menuitem id="mrp.menu_mrp_production_action"
                   name="制造订单"
                   parent="mrp.menu_mrp_manufacturing"
                   action="mrp.mrp_production_action"

From aa32fdcd0754ae362719b2f902481a65cdd7a71c Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Wed, 4 Dec 2024 16:41:42 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E5=9D=AF=E6=96=99=E9=95=BF=E5=AE=BD?=
 =?UTF-8?q?=E9=AB=98=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 | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 0750313b..cb8d37ee 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -23,12 +23,15 @@ class ResMrpWorkOrder(models.Model):
 
     product_tmpl_name = fields.Char('坯料产品名称', related='production_bom_id.bom_line_ids.product_id.name')
 
-    product_tmpl_id_length = fields.Float(related='production_id.product_tmpl_id.length', readonly=True, store=True,
-                                          string="坯料长度(mm)")
-    product_tmpl_id_width = fields.Float(related='production_id.product_tmpl_id.width', readonly=True, store=True,
-                                         string="坯料宽度(mm)")
-    product_tmpl_id_height = fields.Float(related='production_id.product_tmpl_id.height', readonly=True, store=True,
-                                          string="坯料高度(mm)")
+    product_tmpl_id_length = fields.Float(string='坯料长度(mm)', related='material_length', readonly=True, store=False)
+    product_tmpl_id_width = fields.Float(string='坯料宽度(mm)', related='material_width', readonly=True, store=False)
+    product_tmpl_id_height = fields.Float(string='坯料高度(mm)', related='material_height', readonly=True, store=False)
+    # product_tmpl_id_length = fields.Float(related='production_id.product_tmpl_id.length', readonly=True, store=True,
+    #                                       string="坯料长度(mm)")
+    # product_tmpl_id_width = fields.Float(related='production_id.product_tmpl_id.width', readonly=True, store=True,
+    #                                      string="坯料宽度(mm)")
+    # product_tmpl_id_height = fields.Float(related='production_id.product_tmpl_id.height', readonly=True, store=True,
+    #                                       string="坯料高度(mm)")
     product_tmpl_id_materials_id = fields.Many2one(related='production_id.product_tmpl_id.materials_id', readonly=True,
                                                    store=True, check_company=True, string="材料")
     product_tmpl_id_materials_type_id = fields.Many2one(related='production_id.product_tmpl_id.materials_type_id',