From 931b78ee03bdff65848443ca21e0bba4930fd566 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 8 Jan 2024 23:24:42 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=8E=92=E7=A8=8B=E7=BC=BA=E5=B0=91=E5=B7=A5=E5=85=B7=E5=8C=85?=
 =?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_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 f6e58855..ed9375d7 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -6,6 +6,7 @@ import requests
 from odoo import api, fields, models, _
 from odoo.exceptions import UserError
 from odoo.addons.sf_base.commons.common import Common
+from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
 
 
 class MrpProduction(models.Model):

From f5805ce6ae45d25a4893d195841ff740598d11f2 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 9 Jan 2024 10:11:13 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=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 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sf_plan_management/i18n/zh_CN.po b/sf_plan_management/i18n/zh_CN.po
index ac175e4e..086067ab 100644
--- a/sf_plan_management/i18n/zh_CN.po
+++ b/sf_plan_management/i18n/zh_CN.po
@@ -39704,7 +39704,7 @@ msgstr "付款中"
 #: model_terms:ir.ui.view,arch_db:quality.quality_alert_view_search
 #: model_terms:ir.ui.view,arch_db:quality_control.quality_check_view_search
 msgid "In Progress"
-msgstr "待排程"
+msgstr "进行中"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_warehouse__in_type_id
@@ -55392,7 +55392,7 @@ msgstr "覆盖作者EMail"
 #: model_terms:ir.ui.view,arch_db:mrp.mrp_bom_form_view
 #: model_terms:ir.ui.view,arch_db:stock.view_stock_rules_report
 msgid "Overview"
-msgstr "概述"
+msgstr "驾驶舱"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_base_language_import__overwrite
@@ -114487,6 +114487,11 @@ msgstr ""
 msgid "径跳精度(mm)"
 msgstr ""
 
+#. module: sf_manufacturing
+#: model:ir.model.fields.selection,name:sf_manufacturing.selection__mrp_production__state__progress
+msgid "待排程"
+msgstr "待排程"
+
 #. module: sf_base
 #: model:ir.model.fields,field_description:sf_base.field_sf_cutting_tool_model__jump_accuracy
 msgid "径跳精度(um)"
@@ -116186,7 +116191,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:sf_manufacturing.mrp_workcenter_kanban_action1
 #: model:ir.ui.menu,name:sf_manufacturing.menu_mrp_dashboard
 msgid "生产线驾驶舱"
-msgstr ""
+msgstr "生产线驾驶舱"
 
 #. module: sf_warehouse
 #: model_terms:ir.ui.view,arch_db:sf_warehouse.view_location_form_sf_inherit

From 3f2a13448d242f1d6bfdc61f873d85727b3badb2 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 9 Jan 2024 16:02:41 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_maintenance/security/ir.model.access.csv   | 2 +-
 sf_manufacturing/security/ir.model.access.csv | 6 ++++--
 sf_warehouse/security/ir.model.access.csv     | 4 +---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv
index 8870c0ec..877d9b76 100644
--- a/sf_maintenance/security/ir.model.access.csv
+++ b/sf_maintenance/security/ir.model.access.csv
@@ -8,7 +8,7 @@ access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equi
 
 
 access_maintenance_request_group_plan_dispatch,maintenance.request,maintenance.model_maintenance_request,sf_base.group_plan_dispatch,1,0,0,0
-access_maintenance_equipment_group_plan_dispatch,maintenance.equipment,maintenance.model_maintenance_equipment,sf_base.group_plan_dispatch,1,1,1,1
+access_maintenance_equipment_group_plan_dispatch,maintenance.equipment,maintenance.model_maintenance_equipment,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_maintenance_logs_group_plan_dispatch,sf_maintenance_logs,model_sf_maintenance_logs,sf_base.group_plan_dispatch,1,0,0,0
 access_maintenance_standard_image_group_plan_dispatch,maintenance_standard_image,model_maintenance_standard_image,sf_base.group_plan_dispatch,1,0,0,0
 access_equipment_maintenance_standards_group_plan_dispatch,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_base.group_plan_dispatch,1,0,0,0
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index 933a2c45..05064e79 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -89,12 +89,14 @@ access_mrp_workcenter_capacity_manager,mrp.workcenter.capacity.manager,mrp.model
 
 access_mrp_production,mrp_production,model_mrp_production,sf_base.group_plan_dispatch,1,1,1,0
 access_mrp_workorder,mrp_workorder,model_mrp_workorder,sf_base.group_plan_dispatch,1,1,1,0
-access_sf_production_line,sf.production.line,model_sf_production_line,sf_base.group_plan_dispatch,1,1,1,0
+access_sf_production_line_group_plan_dispatch,sf.production.line,model_sf_production_line,sf_base.group_plan_dispatch,1,0,0,0
+access_sf_production_line_group_plan_director,sf.production.line,model_sf_production_line,sf_base.group_plan_director,1,1,1,0
 access_mrp_workcenter,mrp_workcenter,model_mrp_workcenter,sf_base.group_plan_dispatch,1,1,1,0
 access_mrp_bom,mrp.bom,mrp.model_mrp_bom,sf_base.group_plan_dispatch,1,1,1,0
 access_mrp_bom_line,mrp.bom.line,mrp.model_mrp_bom_line,sf_base.group_plan_dispatch,1,0,0,0
 access_mrp_unbuild,mrp.unbuild,mrp.model_mrp_unbuild,sf_base.group_plan_dispatch,1,1,1,0
-access_stock_scrap,stock.scrap,stock.model_stock_scrap,sf_base.group_plan_dispatch,1,1,1,0
+access_stock_scrap_group_plan_dispatch,stock.scrap,stock.model_stock_scrap,sf_base.group_plan_dispatch,1,0,0,0
+
 access_sf_model_type,sf.model.type,model_sf_model_type,sf_base.group_plan_dispatch,1,1,1,0
 access_mrp_routing_workcenter,mrp.routing.workcenter,mrp.model_mrp_routing_workcenter,sf_base.group_plan_dispatch,1,1,1,0
 access_mrp_document,mrp.document,mrp.model_mrp_document,sf_base.group_plan_dispatch,1,0,0,0
diff --git a/sf_warehouse/security/ir.model.access.csv b/sf_warehouse/security/ir.model.access.csv
index b5954085..10c4e172 100644
--- a/sf_warehouse/security/ir.model.access.csv
+++ b/sf_warehouse/security/ir.model.access.csv
@@ -98,13 +98,11 @@ access_mrp_production,mrp.production,mrp.model_mrp_production,sf_warehouse.group
 
 access_sf_shelf_location_group_plan_dispatch,sf.shelf.location,model_sf_shelf_location,sf_base.group_plan_dispatch,1,1,0,0
 access_stock_move,stock.move,stock.model_stock_move,sf_base.group_plan_dispatch,1,1,1,0
-access_stock_scrap_user,stock.scrap.user,stock.model_stock_scrap,sf_base.group_plan_dispatch,1,0,0,0
-access_stock_scrap_manager,stock.scrap.manager,stock.model_stock_scrap,sf_base.group_plan_dispatch,1,0,0,0
 access_stock_picking,stock.picking,stock.model_stock_picking,sf_base.group_plan_dispatch,1,0,0,0
 access_stock_lot_group_plan_dispatch,stock.lot,stock.model_stock_lot,sf_base.group_plan_dispatch,1,0,0,0
 access_stock_lot_group_plan_director,stock.lot,stock.model_stock_lot,sf_base.group_plan_director,1,1,1,0
 access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,sf_base.group_plan_dispatch,1,1,0,0
-access_stock_quant,stock.quant,stock.model_stock_quant,sf_base.group_plan_dispatch,1,1,1,0
+
 
 access_product_product,product.product,product.model_product_product,sf_base.group_plan_dispatch,1,0,0,0
 access_product_template,product.template,product.model_product_template,sf_base.group_plan_dispatch,1,0,0,0

From f82cb462cf6b004510b0532111e1580893364cba Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 9 Jan 2024 16:54:16 +0800
Subject: [PATCH 04/14] =?UTF-8?q?1.=E5=8E=BB=E6=8E=89=E8=AD=A6=E5=91=8A2.?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=BF=9B=E5=BA=A6=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?3.=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=BB=84=E6=B2=A1=E6=9C=89=E5=AD=98=E5=BA=93=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=8C=85=E6=8B=AC=E4=BB=A5=E5=86=85=E7=9A=84=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_base_new.py             |  4 ++--
 sf_base/models/tool_other_features.py       |  2 +-
 sf_manufacturing/models/product_template.py |  2 +-
 sf_quality/security/ir.model.access.csv     |  6 ++++++
 sf_sale/security/ir.model.access.csv        | 12 ++++++++----
 sf_sale/views/sale_order_view.xml           |  3 +--
 sf_tool_management/__manifest__.py          |  2 --
 sf_warehouse/security/ir.model.access.csv   | 20 +++++++++++++++++++-
 8 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index 65f2438b..ccadf575 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -106,8 +106,8 @@ class CuttingToolModel(models.Model):
     chuck_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
                                                  'standard_library_id', string='夹头基本参数')
     cutting_speed_ids = fields.One2many('sf.cutting.speed', 'standard_library_id', string='切削速度Vc')
-    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz')
-    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz')
+    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz(整体式刀具)')
+    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz(刀片)')
 
     material_model_id = fields.Many2one('sf.materials.model', '材料型号')
     # 适用夹头型号可以多选
diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index 154bf275..7ad32bc2 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -122,7 +122,7 @@ class ToolMaterialsBasicParameters(models.Model):
     inner_diameter = fields.Float('内径(mm)')
     run_out_accuracy = fields.Char('跳动精度(mm)', size=20)
     top_diameter = fields.Float('顶部直径(mm)')
-    weight = fields.Float('重量(kg)', size=20)
+    weight = fields.Float('重量(kg)')
     clamping_length = fields.Float('夹持长度(mm)')
     clamping_tolerance = fields.Char('夹持公差(mm)', size=20)
     cooling_jacket = fields.Char('适用冷却套型号', size=50)
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index ef635f78..42a392e2 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -437,7 +437,7 @@ class ResProductMo(models.Model):
     cutting_tool_blade_diameter = fields.Float('刃径/刃部直径(mm)')
     cutting_tool_cutter_arbor_diameter = fields.Float('刀杆直径(mm)')
     cutting_tool_min_machining_aperture = fields.Integer('最小加工孔径(mm)')
-    cutting_tool_install_blade_tip_num = fields.Integer('可装刀片数/齿数(个)', size=20)
+    cutting_tool_install_blade_tip_num = fields.Integer('可装刀片数/齿数(个)')
     cutting_tool_installing_structure = fields.Char('安装结构', size=20)
     cutting_tool_blade_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
diff --git a/sf_quality/security/ir.model.access.csv b/sf_quality/security/ir.model.access.csv
index 8e91f577..4374715d 100644
--- a/sf_quality/security/ir.model.access.csv
+++ b/sf_quality/security/ir.model.access.csv
@@ -12,6 +12,8 @@ access_quality_check_group_quality,quality_check_group_quality,quality.model_qua
 access_quality_check_group_quality_director,quality_check_group_quality_director,quality.model_quality_check,sf_base.group_quality_director,1,1,1,0
 access_quality_check_group_plan_dispatch,quality_check_group_plan_dispatch,quality.model_quality_check,sf_base.group_plan_dispatch,1,0,0,0
 access_quality_check_group_plan_director,quality_check_group_plan_director,quality.model_quality_check,sf_base.group_plan_director,1,0,0,0
+access_quality_check_group_purchase,quality_check_group_purchase,quality.model_quality_check,sf_base.group_purchase,1,0,0,0
+access_quality_check_group_purchase_director,quality_check_group_purchase_director,quality.model_quality_check,sf_base.group_purchase_director,1,0,0,0
 access_quality_check_group_sf_equipment_user,quality_check_group_sf_equipment_user,quality.model_quality_check,sf_base.group_sf_equipment_user,1,0,0,0
 access_quality_check_group_sf_tool_user,quality_check_group_sf_tool_user,quality.model_quality_check,sf_base.group_sf_tool_user,1,0,0,0
 access_quality_check_group_sf_order_user,quality_check_group_sf_order_user,quality.model_quality_check,sf_base.group_sf_order_user,1,0,0,0
@@ -64,4 +66,8 @@ access_quality_reason_type_group_quality_director,quality_reason_group_quality_d
 
 access_quality_alert_stage,quality.alert.stage,quality.model_quality_alert_stage,sf_base.group_plan_dispatch,1,0,0,0
 
+access_stock_move_group_quality,stock_move_group_quality,stock.model_stock_move,sf_base.group_quality,1,1,0,0
+access_stock_move_group_quality_director,stock_move_group_quality_director,stock.model_stock_move,sf_base.group_quality_director,1,1,0,0
+
+
 
diff --git a/sf_sale/security/ir.model.access.csv b/sf_sale/security/ir.model.access.csv
index 3f9eee1f..9f2223d0 100644
--- a/sf_sale/security/ir.model.access.csv
+++ b/sf_sale/security/ir.model.access.csv
@@ -37,16 +37,16 @@ access_stock_move_group_purchase,stock_move_group_purchase,stock.model_stock_mov
 access_stock_move_group_purchase_director,stock_move_group_purchase_director,stock.model_stock_move,sf_base.group_purchase_director,1,0,0,0
 access_stock_warehouse_orderpoint_group_sale_salemanager,stock_warehouse_orderpoint_group_sale_salemanager,stock.model_stock_warehouse_orderpoint,sf_base.group_sale_salemanager,1,0,0,0
 access_stock_warehouse_orderpoint_group_sale_director,stock_warehouse_orderpoint_group_sale_director,stock.model_stock_warehouse_orderpoint,sf_base.group_sale_director,1,0,0,0
-access_stock_warehouse_orderpoint_group_purchase,stock_warehouse_orderpoint_group_purchase,stock.model_stock_warehouse_orderpoint,sf_base.group_purchase,1,0,0,0
-access_stock_warehouse_orderpoint_group_purchase_director,stock_warehouse_orderpoint_group_purchase_director,stock.model_stock_warehouse_orderpoint,sf_base.group_purchase_director,1,0,0,0
+access_stock_warehouse_orderpoint_group_purchase,stock_warehouse_orderpoint_group_purchase,stock.model_stock_warehouse_orderpoint,sf_base.group_purchase,1,1,0,0
+access_stock_warehouse_orderpoint_group_purchase_director,stock_warehouse_orderpoint_group_purchase_director,stock.model_stock_warehouse_orderpoint,sf_base.group_purchase_director,1,1,0,0
 access_uom_uom_group_sale_salemanager,uom_uom_group_sale_salemanager,uom.model_uom_uom,sf_base.group_sale_salemanager,1,0,0,0
 access_uom_uom_group_sale_director,uom_uom_group_sale_director,uom.model_uom_uom,sf_base.group_sale_director,1,1,1,0
 access_uom_uom_group_purchase,uom_uom_group_purchase,uom.model_uom_uom,sf_base.group_purchase,1,0,0,0
-access_uom_uom_group_purchase_director,uom_uom_group_purchase_director,uom.model_uom_uom,sf_base.group_purchase_director,1,0,0,0
+access_uom_uom_group_purchase_director,uom_uom_group_purchase_director,uom.model_uom_uom,sf_base.group_purchase_director,1,1,1,0
 access_uom_category_group_sale_salemanager,uom_category_group_sale_salemanager,uom.model_uom_category,sf_base.group_sale_salemanager,1,0,0,0
 access_uom_category_group_sale_director,uom_category_group_sale_director,uom.model_uom_category,sf_base.group_sale_director,1,1,1,0
 access_uom_category_group_purchase,uom_category_group_purchase,uom.model_uom_category,sf_base.group_purchase,1,0,0,0
-access_uom_category_group_purchase_director,uom_category_group_purchase_director,uom.model_uom_category,sf_base.group_purchase_director,1,0,0,0
+access_uom_category_group_purchase_director,uom_category_group_purchase_director,uom.model_uom_category,sf_base.group_purchase_director,1,1,1,0
 access_sale_order_check_wizard_group_sale_salemanager,sale_order_check_wizard_group_sale_salemanager,model_sale_order_check_wizard,sf_base.group_sale_salemanager,1,1,1,0
 access_sale_order_check_wizard_group_sale_director,sale_order_check_wizard_group_sale_director,model_sale_order_check_wizard,sf_base.group_sale_director,1,1,1,0
 access_account_move_line_group_sale_salemanager,account_move_line_group_sale_salemanager,account.model_account_move_line,sf_base.group_sale_salemanager,1,1,1,0
@@ -81,5 +81,9 @@ access_sale_advance_payment_inv_group_sale_salemanager,sale_advance_payment_inv_
 access_sale_advance_payment_inv_group_sale_director,sale_advance_payment_inv_group_sale_director,sale.model_sale_advance_payment_inv,sf_base.group_sale_director,1,1,1,0
 access_sale_report_group_sale_salemanager,sale_report_group_sale_salemanager,sale.model_sale_report,sf_base.group_sale_salemanager,1,0,1,0
 access_sale_report_group_sale_director,sale_report_group_sale_director,sale.model_sale_report,sf_base.group_sale_director,1,0,1,0
+access_product_supplierinfo_group_purchase_director,product.supplierinfo group_purchase_director,product.model_product_supplierinfo,sf_base.group_purchase_director,1,1,1,0
+access_product_category_group_purchase_director,product.category group_purchase_director,product.model_product_category,sf_base.group_purchase_director,1,1,1,0
+
+
 
 
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index bfbf5520..5c349c01 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -106,8 +106,7 @@
                     <field name="deadline_of_delivery" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
                     <field name="payments_way" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
                     <field name="pay_way" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
-                    <field name="schedule_status" readonly="1"
-                           attrs="{'invisible': [('state', 'in', ('sale','cancel'))]}"/>
+                    <field name="schedule_status" readonly="1"/>
                 </field>
                 <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="before">
                     <field name="model_glb_file" widget="Viewer3D" optional="show"
diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py
index c56f9463..e334c32a 100644
--- a/sf_tool_management/__manifest__.py
+++ b/sf_tool_management/__manifest__.py
@@ -27,8 +27,6 @@
         'web.assets_qweb': [
         ],
         'web.assets_backend': [
-            'sf_tool_management/static/src/change.scss'
-
         ]
 
     },
diff --git a/sf_warehouse/security/ir.model.access.csv b/sf_warehouse/security/ir.model.access.csv
index b5954085..fca9385c 100644
--- a/sf_warehouse/security/ir.model.access.csv
+++ b/sf_warehouse/security/ir.model.access.csv
@@ -113,4 +113,22 @@ access_product_template,product.template,product.model_product_template,sf_base.
 
 access_stock_inventory_conflict,stock.inventory.conflict,stock.model_stock_inventory_conflict,sf_base.group_plan_dispatch,1,0,0,0
 access_stock_inventory_warning,stock.inventory.warning,stock.model_stock_inventory_warning,sf_base.group_plan_dispatch,1,0,0,0
-access_stock_inventory_adjustment_name,stock.inventory.adjustment.name,stock.model_stock_inventory_adjustment_name,sf_base.group_plan_dispatch,1,0,0,0
\ No newline at end of file
+access_stock_inventory_adjustment_name,stock.inventory.adjustment.name,stock.model_stock_inventory_adjustment_name,sf_base.group_plan_dispatch,1,0,0,0
+
+access_mrp_production_group_purchase,mrp_production_group_purchase,mrp.model_mrp_production,sf_base.group_purchase,1,0,0,0
+access_mrp_production_group_purchase_director,mrp_production_group_purchase_director,mrp.model_mrp_production,sf_base.group_purchase_director,1,0,0,0
+access_mrp_workorder_group_purchase,mrp_workorder_group_purchase,mrp.model_mrp_workorder,sf_base.group_purchase,1,0,0,0
+access_mrp_workorder_group_purchase_director,mrp_workorder_group_purchase_director,mrp.model_mrp_workorder,sf_base.group_purchase_director,1,0,0,0
+access_mrp_unbuild_group_purchase,mrp_unbuild_group_purchase,mrp.model_mrp_unbuild,sf_base.group_purchase,1,0,0,0
+access_mrp_unbuild_group_purchase_director,mrp_unbuild_group_purchase_director,mrp.model_mrp_unbuild,sf_base.group_purchase_director,1,0,0,0
+access_stock_scrap_group_purchase,stock_scrap_group_purchase,stock.model_stock_scrap,sf_base.group_purchase,1,0,0,0
+access_stock_scrap_group_purchase_director,stock_scrap_group_purchase_director,stock.model_stock_scrap,sf_base.group_purchase_director,1,0,0,0
+access_stock_lot_group_purchase,stock_lot_group_purchase,stock.model_stock_lot,sf_base.group_purchase,1,0,0,0
+access_stock_lot_group_purchase_director,stock_lot_group_purchase_director,stock.model_stock_lot,sf_base.group_purchase_director,1,0,0,0
+access_mrp_workcenter_productivity_group_purchase,mrp_workcenter_productivity_group_purchase,mrp.model_mrp_workcenter_productivity,sf_base.group_purchase,1,0,0,0
+access_mrp_workcenter_productivity_group_purchase_director,mrp_workcenter_productivity_group_purchase_director,mrp.model_mrp_workcenter_productivity,sf_base.group_purchase_director,1,0,0,0
+
+
+
+
+

From 8a15ce12d9b70036f6365e871ccc2c7afe50ef4f Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 9 Jan 2024 17:05:35 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E6=80=BB=E7=9B=91=E5=88=9B=E5=BB=BA=E6=8A=A5=E4=BB=B7=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E5=9C=A8=E5=85=B6=E4=BB=96=E4=BF=A1=E6=81=AF=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9=E5=85=B6=E4=BB=96=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/sale_order_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 5c349c01..247bbc75 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -54,6 +54,9 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='user_id']" position="replace">
+                    <field name="user_id" widget="many2one_avatar_user" context="{'is_sale': True }"/>
+                </xpath>
                 <xpath expr="//form/header/button[@name='action_quotation_send'][1]" position="replace">
                     <button name="action_quotation_send" string="通过EMAIL发送" type="object"
                             class="btn-primary" data-hotkey="g" context="{'validate_analytic': True}"

From b5147678b125702e084efca817a5e425775f10cd Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 10 Jan 2024 12:20:03 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=92=E7=A8=8B?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=B7=A5=E5=8D=95=E6=97=B6=E9=97=B4=E6=9C=AA?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=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_plan/models/custom_plan.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index 03117a3a..96e98773 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -220,7 +220,7 @@ class sf_production_plan(models.Model):
         """
         sequence = workorder_id_list.index(item.id) - 1
         # 计算CNC加工之前工单的开始结束时间
-        for i in range(sequence):
+        for i in range(1 if sequence == 0 else sequence):
             current_workorder_id = (item.id - (i + 1))
             current_workorder_obj = self.env['mrp.workorder'].sudo().search(
                 [('id', '=', current_workorder_id)])

From 82c026976143bc927bb427c85b62f758d1d8ffa9 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 10 Jan 2024 15:24:31 +0800
Subject: [PATCH 07/14] =?UTF-8?q?1.=E6=9D=90=E6=96=99=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F=E5=92=8C?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=9A=84=E8=BE=93=E5=85=A5=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=812.=E6=AF=8F=E9=BD=BF=E8=B5=B0=E5=88=80=E9=87=8F?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=87=E5=89=8A=E9=80=9F=E5=BA=A6=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/common.py              | 12 +++++++++++-
 sf_base/models/tool_other_features.py |  1 -
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/sf_base/models/common.py b/sf_base/models/common.py
index f6e6771a..7450fff9 100644
--- a/sf_base/models/common.py
+++ b/sf_base/models/common.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 import logging
 from urllib.parse import urlencode
-from odoo import fields, models
+from odoo import fields, models, api
+from odoo.exceptions import UserError
+
 _logger = logging.getLogger(__name__)
 
 
@@ -59,6 +61,14 @@ class MrsMaterialModel(models.Model):
     supplier_ids = fields.One2many('sf.supplier.sort', 'materials_model_id', string='供应商')
     active = fields.Boolean('有效', default=True)
 
+    @api.constrains('gain_way', 'supplier_ids')
+    def _check_gain_way(self):
+        if not self.gain_way:
+            raise UserError("请输入获取方式")
+        if self.gain_way in ['外协', '采购']:
+            if not self.supplier_ids:
+                raise UserError("请添加供应商")
+
 
 class MrsProductionProcessCategory(models.Model):
     _name = 'sf.production.process.category'
diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index d1cf0404..7ad32bc2 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -162,7 +162,6 @@ class FeedPerTooth(models.Model):
     _order = 'blade_diameter,cutting_width_depth_id,materials_type_id'
 
     name = fields.Char('名称')
-    cutting_speed = fields.Char('切削速度', required=True)
     product_template_id = fields.Many2one('product.template')
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
     blade_diameter = fields.Integer('刃部直径(mm)', readonly=True)

From 95d29bb20dcffd7682afd3ffecf44176a34113ef Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 10 Jan 2024 16:43:28 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E5=90=8D=E7=A7=B0=EF=BC=8C=E7=A8=8E=EF=BC=8C=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=E9=87=8D=E5=A4=8D=E9=AA=8C=E8=AF=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 29a9be13..745b2039 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -166,20 +166,20 @@ class ResPartnerToSale(models.Model):
 
     @api.constrains('name')
     def _check_name(self):
-        obj = self.sudo().search([('name', '=', self.name), ('id', '!=', self.id)])
+        obj = self.sudo().search([('name', '=', self.name), ('id', '!=', self.id), ('active', '=', True)])
         if obj:
             raise UserError('该名称已存在,请重新输入')
 
     @api.constrains('vat')
     def _check_vat(self):
-        obj = self.sudo().search([('vat', '=', self.vat), ('id', '!=', self.id)])
+        obj = self.sudo().search([('vat', '=', self.vat), ('id', '!=', self.id), ('active', '=', True)])
         if obj:
             raise UserError('该税ID已存在,请重新输入')
 
     @api.constrains('email')
     def _check_email(self):
         if self.customer_rank > 0:
-            obj = self.sudo().search([('email', '=', self.email), ('id', '!=', self.id)])
+            obj = self.sudo().search([('email', '=', self.email), ('id', '!=', self.id), ('active', '=', True)])
             if obj:
                 raise UserError('该邮箱已存在,请重新输入')
 
@@ -240,7 +240,7 @@ class ResUserToSale(models.Model):
             return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
         elif self._context.get('supplier_rank'):
             if self.env.user.has_group('sf_base.group_purchase_director'):
-                domain = [('supplier_rank', '>', 0)]
+                domain = []
             elif self.env.user.has_group('sf_base.group_purchase'):
                 if self.id != self.env.user.id:
                     domain = [('id', '=', self.id)]

From 077ce6d37f5fd8b4447936271b63add2fb8716d8 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 10 Jan 2024 17:42:59 +0800
Subject: [PATCH 09/14] =?UTF-8?q?1=E3=80=81=E5=88=A0=E9=99=A4=E5=A4=B9?=
 =?UTF-8?q?=E5=85=B7=E5=9E=8B=E5=8F=B7=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?code=E5=80=BC=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=9B2=E3=80=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E5=BA=93=E5=AD=98=E5=88=9B=E5=BB=BA=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E5=8D=95=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=9B3=E3=80=81=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9B=E6=95=B0=E6=8D=AE=E7=9A=84=E5=9B=BE=E6=96=87=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/base.py                       |  8 +-
 sf_base/models/basic_parameters_fixture.py   | 33 ++++++---
 sf_base/models/fixture.py                    | 77 ++++++++++----------
 sf_base/views/tool_views.xml                 |  2 +-
 sf_mrs_connect/models/sync_common.py         |  2 +-
 sf_tool_management/models/base.py            | 25 ++++---
 sf_tool_management/views/tool_base_views.xml |  8 +-
 sf_tool_management/wizard/wizard.py          |  9 ++-
 8 files changed, 89 insertions(+), 75 deletions(-)

diff --git a/sf_base/models/base.py b/sf_base/models/base.py
index a2565d6d..6fc86e94 100644
--- a/sf_base/models/base.py
+++ b/sf_base/models/base.py
@@ -48,7 +48,7 @@ class MachineBrand(models.Model):
     active = fields.Boolean('有效', default=True)
 
 
-#机床
+# 机床
 class MachineTool(models.Model):
     _name = 'sf.machine_tool'
     _description = '机床'
@@ -92,7 +92,8 @@ class MachineTool(models.Model):
     type_id = fields.Many2one('sf.machine_tool.type', '型号')
     brand_id = fields.Many2one('sf.machine.brand', string='品牌')
     state = fields.Selection(
-        [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"),("空闲", "空闲"),("封存(报废)", "封存(报废)")],
+        [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"), ("空闲", "空闲"),
+         ("封存(报废)", "封存(报废)")],
         default='正常', string="机床状态")
     # 0606新增字段
     machine_tool_picture = fields.Binary('图片')
@@ -357,8 +358,7 @@ class MachineToolType(models.Model):
     lq_image_id = fields.Many2many('maintenance.equipment.image', 'lq_equipment_id', string='冷却方式',
                                    domain="[('type', '=', '冷却方式')]")
 
-
-    #待删除字段
+    # 待删除字段
     precision_min = fields.Float('X轴定位精度min(mm)', digits=(12, 3))
     precision_max = fields.Float('X轴定位精度max(mm)', digits=(12, 3))
     lead_screw = fields.Char('丝杆')
diff --git a/sf_base/models/basic_parameters_fixture.py b/sf_base/models/basic_parameters_fixture.py
index a1b1a9a6..7bd69a35 100644
--- a/sf_base/models/basic_parameters_fixture.py
+++ b/sf_base/models/basic_parameters_fixture.py
@@ -85,8 +85,10 @@ class BasicParametersFixture(models.Model):
             'boolean_chip_blowing_function': obj['boolean_chip_blowing_function'],
             'carrying_capacity_max': obj['carrying_capacity_max'],
             'rigidity': obj['rigidity'],
-            'materials_model_id': obj['materials_model_id'],
-            'machine_tool_type_id': obj['machine_tool_type_id'],
+            'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
+            'machine_tool_type_id': self.env['sf.machine_tool.type'].sudo().search(
+                [('code', '=', obj['machine_tool_type_id']), ('active', '=', True)]).id,
         })
         return zero_chuck_param_str
 
@@ -106,7 +108,8 @@ class BasicParametersFixture(models.Model):
             'way_to_install': obj['way_to_install'],
             'type_of_drive': obj['type_of_drive'],
             'carrying_capacity_max': obj['carrying_capacity_max'],
-            'materials_model_id': obj['materials_model_id'],
+            'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
             'rigidity': obj['rigidity'],
         })
         return zero_tray_param_str
@@ -129,9 +132,11 @@ class BasicParametersFixture(models.Model):
             'chucking_power_max': obj['chucking_power_max'],
             'carrying_capacity_max': obj['carrying_capacity_max'],
             'rated_air_pressure': obj['rated_air_pressure'],
-            'materials_model_id': obj['materials_model_id'],
+            'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
             'rigidity': obj['rigidity'],
-            'interface_materials_model_id': obj['interface_materials_model_id'],
+            'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
             'type_of_drive': obj['type_of_drive'],
         })
         return pneumatic_fixture_param_str
@@ -155,9 +160,11 @@ class BasicParametersFixture(models.Model):
             'carrying_capacity_max': obj['carrying_capacity_max'],
             'transverse_groove': obj['transverse_groove'],
             'longitudinal_fitting_groove': obj['longitudinal_fitting_groove'],
-            'materials_model_id': obj['materials_model_id'],
+            'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
             'rigidity': obj['rigidity'],
-            'interface_materials_model_id': obj['interface_materials_model_id'],
+            'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
             'type_of_drive': obj['type_of_drive'],
         })
         return jaw_vice_fixture_param_str
@@ -182,9 +189,11 @@ class BasicParametersFixture(models.Model):
             'magnetic_field_height': obj['magnetic_field_height'],
             'magnetic_pole_plate_grinding_allowance': obj['magnetic_pole_plate_grinding_allowance'],
             'carrying_capacity_max': obj['carrying_capacity_max'],
-            'materials_model_id': obj['materials_model_id'],
+            'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
             'rigidity': obj['rigidity'],
-            'interface_materials_model_id': obj['interface_materials_model_id'],
+            'interface_materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
             'type_of_drive': obj['type_of_drive'],
         })
         return magnet_fixture_param_str
@@ -206,7 +215,8 @@ class BasicParametersFixture(models.Model):
             'gripper_diameter_max': obj['gripper_diameter_max'],
             'chucking_power_max': obj['chucking_power_max'],
             'carrying_capacity_max': obj['carrying_capacity_max'],
-            'materials_model_id': obj['materials_model_id'],
+            'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
             'rigidity': obj['rigidity'],
             'screw_size': obj['screw_size'],
             'via_hole_diameter': obj['via_hole_diameter'],
@@ -232,7 +242,8 @@ class BasicParametersFixture(models.Model):
             'gripper_diameter_max': obj['gripper_diameter_max'],
             'chucking_power_max': obj['chucking_power_max'],
             'carrying_capacity_max': obj['carrying_capacity_max'],
-            'materials_model_id': obj['materials_model_id'],
+            'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]).id,
             'rigidity': obj['rigidity'],
             'mounting_hole_depth': obj['mounting_hole_depth'],
             'centering_diameter': obj['centering_diameter'],
diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py
index c1591745..52e2baf7 100644
--- a/sf_base/models/fixture.py
+++ b/sf_base/models/fixture.py
@@ -31,7 +31,7 @@ class FixtureModel(models.Model):
     fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
     multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型", required=True)
     brand_id = fields.Many2one('sf.machine.brand', string="品牌")
-    model_file = fields.Binary(string="3D模型图")
+    model_file = fields.Binary(string="图片")
     status = fields.Boolean('状态')
     active = fields.Boolean('有效', default=False)
 
@@ -49,43 +49,42 @@ class FixtureModel(models.Model):
                                                 string='转接板(锁板)夹具基本参数')
     scroll_chuck_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                        string='三爪卡盘基本参数')
-
-    def _get_code(self, fixture_model_type_code):
-        fixture_model = self.env['sf.fixture.model'].sudo().search(
-            [('code', 'ilike', fixture_model_type_code)],
-            limit=1,
-            order="id desc")
-        if not fixture_model:
-            num = "%03d" % 1
-        else:
-            m = int(fixture_model.code[-3:]) + 1
-            num = "%03d" % m
-        return "%s%s" % (fixture_model_type_code, num)
-
     code = fields.Char(string='编码', readonly=True)
 
-    def _onchange_fixture_material_id(self, fixture_material_id):
-        if fixture_material_id:
-            if self.fixture_material_id.name == "气动夹具":
-                code = self._get_code("JKM-C-JJWL-QDJJ-")
-            elif self.fixture_material_id.name == "转接板(锁板)夹具":
-                code = self._get_code("JKM-C-JJWL-ZJJJ-")
-            elif self.fixture_material_id.name == "磁吸夹具":
-                code = self._get_code("JKM-C-JJWL-CXJJ-")
-            elif self.fixture_material_id.name == "虎钳夹具":
-                code = self._get_code("JKM-C-JJWL-HQJJ-")
-            elif self.fixture_material_id.name == "零点托盘":
-                code = self._get_code("JKM-C-JJWL-LDTP-")
-            elif self.fixture_material_id.name == "三爪卡盘":
-                code = self._get_code("JKM-C-JJWL-SZKP-")
-            else:
-                code = self._get_code("JKM-C-JJWL-LDKP-")
-        return code
-
-    @api.model_create_multi
-    def create(self, vals):
-        obj = super(FixtureModel, self).create(vals)
-        if obj.fixture_material_id:
-            code = self._onchange_fixture_material_id(obj.fixture_material_id)
-            obj.code = code
-        return obj
+    # def _get_code(self, fixture_model_type_code):
+    #     fixture_model = self.env['sf.fixture.model'].sudo().search(
+    #         [('code', 'ilike', fixture_model_type_code)],
+    #         limit=1,
+    #         order="id desc")
+    #     if not fixture_model:
+    #         num = "%03d" % 1
+    #     else:
+    #         m = int(fixture_model.code[-3:]) + 1
+    #         num = "%03d" % m
+    #     return "%s%s" % (fixture_model_type_code, num)
+    #
+    # def _onchange_fixture_material_id(self, fixture_material_id):
+    #     if fixture_material_id:
+    #         if self.fixture_material_id.name == "气动夹具":
+    #             code = self._get_code("JKM-C-JJWL-QDJJ-")
+    #         elif self.fixture_material_id.name == "转接板(锁板)夹具":
+    #             code = self._get_code("JKM-C-JJWL-ZJJJ-")
+    #         elif self.fixture_material_id.name == "磁吸夹具":
+    #             code = self._get_code("JKM-C-JJWL-CXJJ-")
+    #         elif self.fixture_material_id.name == "虎钳夹具":
+    #             code = self._get_code("JKM-C-JJWL-HQJJ-")
+    #         elif self.fixture_material_id.name == "零点托盘":
+    #             code = self._get_code("JKM-C-JJWL-LDTP-")
+    #         elif self.fixture_material_id.name == "三爪卡盘":
+    #             code = self._get_code("JKM-C-JJWL-SZKP-")
+    #         else:
+    #             code = self._get_code("JKM-C-JJWL-LDKP-")
+    #     return code
+    #
+    # @api.model_create_multi
+    # def create(self, vals):
+    #     obj = super(FixtureModel, self).create(vals)
+    #     if obj.fixture_material_id:
+    #         code = self._onchange_fixture_material_id(obj.fixture_material_id)
+    #         obj.code = code
+    #     return obj
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index 29f14547..77b5d1d8 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -509,7 +509,7 @@
         <field name="name">刀具组</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sf.tool.groups</field>
-        <field name="view_mode">tree,form,search</field>
+        <field name="view_mode">tree</field>
     </record>
 
     <!-- ================================================刀具基础参数================================================ -->
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index b23b87b2..31c49d36 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -1555,7 +1555,7 @@ class SyncFixtureModel(models.Model):
             if result.get('fixture_model_all_list'):
                 for item in result['fixture_model_all_list']:
                     if item:
-                        fixture_model = self.search([("code", '=', item['code'])])
+                        fixture_model = self.search([('code', '=', item['code'])])
                         zero_chuck_list = []
                         for zero_chuck_id in item['zero_chuck_ids']:
                             zero_chuck_list.append(
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 62b0d97c..39805f58 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -23,7 +23,7 @@ class FunctionalCuttingToolEntity(models.Model):
     knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True)
     coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
     new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
-    tool_loading_length = fields.Float(strin='总长度(mm)', readonly=True)
+    tool_loading_length = fields.Float(string='总长度(mm)', readonly=True)
     functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True)
     effective_length = fields.Float(string='有效长(mm)', readonly=True)
     tool_room_num = fields.Integer(string='刀具房数量', readonly=True)
@@ -108,7 +108,7 @@ class FunctionalCuttingToolEntity(models.Model):
 
     suitable_machining_method_ids = fields.Many2many(
         'maintenance.equipment.image', 'rel_machining_product_template_tool_entity', '适合加工方式',
-        domain=[('type', '=', '加工能力')])
+        domain=[('type', '=', '加工能力')], compute='_compute_maintenance_equipment_image')
     blade_tip_characteristics_id = fields.Many2one(
         'maintenance.equipment.image', '刀尖特征',
         domain=[('type', '=', '刀尖特征')])
@@ -125,22 +125,25 @@ class FunctionalCuttingToolEntity(models.Model):
     @api.depends('cutting_tool_integral_model_id', 'cutting_tool_blade_model_id')
     def _compute_maintenance_equipment_image(self):
         for record in self:
+            print('111')
             if record.cutting_tool_integral_model_id:
+                print(record.cutting_tool_integral_model_id)
                 record.suitable_machining_method_ids = record.cutting_tool_integral_model_id.suitable_machining_method_ids.ids
-                record.blade_tip_characteristics_id = record.cutting_tool_integral_model_id.blade_tip_characteristics_id.ids
-                record.handle_type_id = record.cutting_tool_integral_model_id.handle_type_id.ids
+                record.blade_tip_characteristics_id = record.cutting_tool_integral_model_id.blade_tip_characteristics_id.id
+                record.handle_type_id = record.cutting_tool_integral_model_id.handle_type_id.id
                 record.cutting_direction_ids = record.cutting_tool_integral_model_id.cutting_direction_ids.ids
                 record.suitable_coolant_ids = record.cutting_tool_integral_model_id.suitable_coolant_ids.ids
+                print(record.cutting_tool_integral_model_id.blade_tip_characteristics_id.ids)
             elif record.cutting_tool_blade_model_id:
                 record.suitable_machining_method_ids = record.cutting_tool_blade_model_id.suitable_machining_method_ids.ids
-                record.blade_tip_characteristics_id = record.cutting_tool_blade_model_id.blade_tip_characteristics_id.ids
-                record.handle_type_id = record.cutting_tool_blade_model_id.handle_type_id.ids
+                record.blade_tip_characteristics_id = record.cutting_tool_blade_model_id.blade_tip_characteristics_id.id
+                record.handle_type_id = record.cutting_tool_blade_model_id.handle_type_id.id
                 record.cutting_direction_ids = record.cutting_tool_blade_model_id.cutting_direction_ids.ids
                 record.suitable_coolant_ids = record.cutting_tool_blade_model_id.suitable_coolant_ids.ids
             else:
                 record.suitable_machining_method_ids = []
-                record.blade_tip_characteristics_id = []
-                record.handle_type_id = []
+                record.blade_tip_characteristics_id = None
+                record.handle_type_id = None
                 record.cutting_direction_ids = []
                 record.suitable_coolant_ids = []
 
@@ -398,11 +401,11 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
         """
         根据传入的信息新增或者更新功能刀具安全库存的信息
         """
-        # 根据功能刀具名称、直径或尖刀R角、粗/中/精查询该功能刀具是否已经存在
+        # 根据功能刀具名称、刀具组、直径或尖刀R角、粗/中/精查询该功能刀具是否已经存在
         record = self.env['sf.real.time.distribution.of.functional.tools'].search(
             [('name', '=', vals['name']), ('sf_cutting_tool_type_id', '=', vals['sf_cutting_tool_type_id']),
              ('diameter', '=', vals['diameter']), ('knife_tip_r_angle', '=', vals['knife_tip_r_angle']),
-             ('coarse_middle_thin', '=', vals['coarse_middle_thin'])])
+             ('coarse_middle_thin', '=', vals['coarse_middle_thin']), ('tool_groups_id', '=', vals['tool_groups_id'])])
         if len(record) > 0:
             for obj in record:
                 obj.write({'sf_functional_cutting_tool_entity_ids': [(4, sf_functional_cutting_tool_entity_ids.id)]})
@@ -617,7 +620,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False)
     diameter = fields.Integer(string='刀具直径(mm)', readonly=False)
     tool_included_angle = fields.Float(string='刀尖R角(mm)', readonly=False)
-    tool_loading_length = fields.Float(strin='总长度(mm)', readonly=False)
+    tool_loading_length = fields.Float(string='总长度(mm)', readonly=False)
     extension_length = fields.Float(string='伸出长(mm)')
     effective_length = fields.Float(string='有效长(mm)')
     new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=False, default='0')
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index f54f6520..dd8e3bf0 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -121,11 +121,11 @@
                                 <group string="刀尖特征">
                                     <field name="blade_tip_characteristics_id" string=""
                                            widget="many2one_radio"
-                                           domain="[('id','in',blade_tip_characteristics_id)]"/>
+                                           domain="[('id','=',blade_tip_characteristics_id)]"/>
                                 </group>
                                 <group string="柄部类型">
                                     <field name="handle_type_id" string="" widget="many2one_radio"
-                                           domain="[('id','in',handle_type_id)]"/>
+                                           domain="[('id','=',handle_type_id)]"/>
                                 </group>
                             </group>
                             <group>
@@ -351,12 +351,12 @@
                                 <group string="刀尖特征">
                                     <field name="blade_tip_characteristics_id" string=""
                                            widget="many2one_radio" readonly="1"
-                                           domain="[('id','in',blade_tip_characteristics_id)]"/>
+                                           domain="[('id','=',blade_tip_characteristics_id)]"/>
                                 </group>
                                 <group string="柄部类型">
                                     <field name="handle_type_id" string=""
                                            widget="many2one_radio" readonly="1"
-                                           domain="[('id','in',handle_type_id)]"/>
+                                           domain="[('id','=',handle_type_id)]"/>
                                 </group>
                             </group>
                             <group>
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index ec20797a..396aa703 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -37,17 +37,17 @@ class ToolChangeRequirementInformation(models.TransientModel):
     replacement_tool_name = fields.Char(string='待换功能刀具名称', compute='_compute_name')
     replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型')
     replacement_diameter = fields.Integer(string='待换刀具直径(mm)')
-    replacement_knife_tip_r_angle = fields.Float(string='待换刀具刀尖R角(mm)', requride=True)
-    replacement_tool_setting_length = fields.Float(string='待换刀具总长度(mm)', requride=True)
+    replacement_knife_tip_r_angle = fields.Float(string='待换刀具刀尖R角(mm)', required=True)
+    replacement_tool_setting_length = fields.Float(string='待换刀具总长度(mm)', required=True)
     replacement_extension_length = fields.Float(string='待换刀具伸出长(mm)')
     replacement_effective_length = fields.Float(string='待换刀具有效长(mm)')
-    replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], requride=True,
+    replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], requirded=True,
                                                            string='待换刀具粗/中/精', default='3')
 
     replacement_max_lifetime_value = fields.Integer(string='待换刀具最大寿命值(min)')
     replacement_alarm_value = fields.Integer(string='待换刀具报警值(min)')
     replacement_used_value = fields.Integer(string='待换刀具已使用值(min)')
-    new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', default='0', requride=True)
+    new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', default='0', required=True)
     replacement_whether_standard_knife = fields.Boolean(string='待换刀具是否标准刀', default=True)
     used_tool_time = fields.Datetime(string='用刀时间',
                                      default=lambda self: fields.Datetime.now() + timedelta(hours=4))
@@ -483,6 +483,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         self.env['sf.real.time.distribution.of.functional.tools'].create_or_edit_safety_stock({
             'name': self.after_assembly_functional_tool_name,
             'sf_cutting_tool_type_id': self.after_assembly_functional_tool_type_id.id,
+            'tool_groups_id': self.tool_groups_id.id,
             'diameter': self.after_assembly_functional_tool_diameter,
             'knife_tip_r_angle': self.after_assembly_knife_tip_r_angle,
             'coarse_middle_thin': self.after_assembly_coarse_middle_thin,

From bc6303d1afdd73c96b8d0f4997187215a127e89d Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 11 Jan 2024 14:10:49 +0800
Subject: [PATCH 10/14] =?UTF-8?q?1=E3=80=81=E5=88=A0=E9=99=A4=E5=A4=B9?=
 =?UTF-8?q?=E5=85=B7xml=E4=B8=AD=E7=9A=84=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=9B2=E3=80=81=E4=BC=98=E5=8C=96=E5=A4=B9?=
 =?UTF-8?q?=E5=85=B7=E7=89=A9=E6=96=99=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/fixture_view.xml       | 46 ----------------------------
 sf_mrs_connect/models/sync_common.py | 26 ++++++++++++++--
 2 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index 0a7d1e8e..692c3b7f 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -32,30 +32,6 @@
         </field>
     </record>
 
-    <!--    <record id="sf_fixture_material_view_form" model="ir.ui.view">-->
-    <!--        <field name="name">夹具物料</field>-->
-    <!--        <field name="model">sf.fixture.material</field>-->
-    <!--        <field name="arch" type="xml">-->
-    <!--            <form string="夹具物料">-->
-    <!--                <sheet>-->
-    <!--                    <group string="基本信息">-->
-    <!--                        <group>-->
-    <!--                            <field name="code"/>-->
-    <!--                        </group>-->
-    <!--                        <group>-->
-    <!--                            <field name="name"/>-->
-    <!--                        </group>-->
-    <!--                    </group>-->
-    <!--                    <group>-->
-    <!--                        &lt;!&ndash;                        <group>&ndash;&gt;-->
-    <!--                        <field name="remark"/>-->
-    <!--                        &lt;!&ndash;                        </group>&ndash;&gt;-->
-    <!--                    </group>-->
-    <!--                </sheet>-->
-    <!--            </form>-->
-    <!--        </field>-->
-    <!--    </record>-->
-
     <record id="sf_fixture_material_view_act" model="ir.actions.act_window">
         <field name="name">夹具物料</field>
         <field name="type">ir.actions.act_window</field>
@@ -96,28 +72,6 @@
         </field>
     </record>
 
-    <!--    <record id="sf_multi_mounting_type_view_form" model="ir.ui.view">-->
-    <!--        <field name="name">联装类型</field>-->
-    <!--        <field name="model">sf.multi_mounting.type</field>-->
-    <!--        <field name="arch" type="xml">-->
-    <!--            <form string="联装类型">-->
-    <!--                <sheet>-->
-    <!--                    <group string="基本信息">-->
-    <!--                        <group>-->
-    <!--                            <field name="code"/>-->
-    <!--                        </group>-->
-    <!--                        <group>-->
-    <!--                            <field name="name"/>-->
-    <!--                        </group>-->
-    <!--                    </group>-->
-    <!--                    <group>-->
-    <!--                        <field name="remark"/>-->
-    <!--                    </group>-->
-    <!--                </sheet>-->
-    <!--            </form>-->
-    <!--        </field>-->
-    <!--    </record>-->
-
     <record id="sf_multi_mounting_type_view_act" model="ir.actions.act_window">
         <field name="name">联装类型</field>
         <field name="type">ir.actions.act_window</field>
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 31c49d36..df9437ba 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -1465,7 +1465,7 @@ class SyncFixtureModel(models.Model):
             if result.get('fixture_model_yesterday_list'):
                 for item in result['fixture_model_yesterday_list']:
                     if item:
-                        fixture_model = self.search([("code", '=', item['code'])])
+                        fixture_model = self.search([("code", '=', item['code']), ('active', 'in', [True, False])])
                         zero_chuck_list = []
                         for zero_chuck_id in item['zero_chuck_ids']:
                             zero_chuck_list.append(
@@ -1520,6 +1520,17 @@ class SyncFixtureModel(models.Model):
                                 "active": item['active'],
                             })
                         else:
+                            fixture_model.write({
+                                "zero_chuck_ids": [(5, 0, 0)],
+                                "zero_tray_ids": [(5, 0, 0)],
+                                "pneumatic_fixture_ids": [(5, 0, 0)],
+                                "jaw_vice_fixture_ids": [(5, 0, 0)],
+                                "magnet_fixture_ids": [(5, 0, 0)],
+                                "adapter_board_fixture_ids": [(5, 0, 0)],
+                                "scroll_chuck_ids": [(5, 0, 0)],
+                            })
+                            self.env['sf.fixture.materials.basic.parameters'].sudo().search(
+                                [('fixture_model_id', '=', False)]).unlink()
                             fixture_model.write({
                                 "name": item['name'],
                                 "code": item['code'],
@@ -1555,7 +1566,7 @@ class SyncFixtureModel(models.Model):
             if result.get('fixture_model_all_list'):
                 for item in result['fixture_model_all_list']:
                     if item:
-                        fixture_model = self.search([('code', '=', item['code'])])
+                        fixture_model = self.search([('code', '=', item['code']), ('active', 'in', [True, False])])
                         zero_chuck_list = []
                         for zero_chuck_id in item['zero_chuck_ids']:
                             zero_chuck_list.append(
@@ -1610,6 +1621,17 @@ class SyncFixtureModel(models.Model):
                                 "active": item['active'],
                             })
                         else:
+                            fixture_model.write({
+                                "zero_chuck_ids": [(5, 0, 0)],
+                                "zero_tray_ids": [(5, 0, 0)],
+                                "pneumatic_fixture_ids": [(5, 0, 0)],
+                                "jaw_vice_fixture_ids": [(5, 0, 0)],
+                                "magnet_fixture_ids": [(5, 0, 0)],
+                                "adapter_board_fixture_ids": [(5, 0, 0)],
+                                "scroll_chuck_ids": [(5, 0, 0)],
+                            })
+                            self.env['sf.fixture.materials.basic.parameters'].sudo().search(
+                                [('fixture_model_id', '=', False)]).unlink()
                             fixture_model.write({
                                 "name": item['name'],
                                 "code": item['code'],

From fc2c1e06d95194a3f7ce5a8d14a6c90e12727165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E7=84=B1?= <huangyan@jikimo.com>
Date: Thu, 11 Jan 2024 15:47:39 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E8=AE=BE=E7=BD=AEmodal=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index 2b1c6cfc..d8e2ab85 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -434,4 +434,19 @@ div:has(.o_required_modifier) > label::before {
 
 .o_list_renderer .flex-row-reverse > .text-end {
   text-align: left!important;
+}
+
+//  设置modal弹窗样式
+.modal.o_technical_modal {
+  .modal-lg {
+    @media  (min-width: 992px) {
+      max-width: 1200px;
+    }
+    @media (min-width: 576px) {
+     .o_form_view .o_inner_group {
+          grid-template-columns: auto;
+      }
+    }
+
+  }
 }
\ No newline at end of file

From 3acb32a5c256ad7ca4c308b4f709107f998b40b0 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 12 Jan 2024 16:18:57 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E9=87=87=E8=B4=AD=E9=80=89=E6=9C=AA=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=8A=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?Tree=E8=A7=86=E5=9B=BE=E5=88=97=E8=A1=A8=E5=8F=AF=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_dlm/views/product_template_view.xml | 12 ++++++++++++
 sf_sale/models/sale_order.py           |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index 3748a669..7803b263 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -13,6 +13,18 @@
             </field>
         </record>
 
+        <record id="product_template_tree_view_inherit_sf" model="ir.ui.view">
+            <field name="name">product.template.tree.inherit.sf</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_tree_view"/>
+            <field name="arch" type="xml">
+                <tree position="attributes">
+                    <attribute name="delete">False</attribute>
+                </tree>
+            </field>
+        </record>
+
+
         <record id="view_template_property_form" model="ir.ui.view">
             <field name="name">product.template.stock.property.form.inherit</field>
             <field name="model">product.template</field>
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 745b2039..d2e97272 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -197,7 +197,7 @@ class ResPartnerToSale(models.Model):
                 else:
                     domain = [('id', '=', False)]
             return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
-        elif self._context.get('is_supplier'):
+        elif self._context.get('is_supplier') or self.env.user.has_group('sf_base.group_purchase_director'):
             if self.env.user.has_group('sf_base.group_purchase_director'):
                 domain = [('supplier_rank', '>', 0)]
             elif self.env.user.has_group('sf_base.group_purchase'):

From 1b490951b1ac211e28e2fd1d9dbb6f662b06982a Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 15 Jan 2024 17:31:15 +0800
Subject: [PATCH 13/14] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E4=BC=A0=E9=80=92=E5=B7=A5=E5=8D=95=E5=8F=B7=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=B7=A5=E5=8D=95=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/__init__.py                |  1 +
 sf_manufacturing/controllers/__init__.py    |  1 +
 sf_manufacturing/controllers/controllers.py | 40 +++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 sf_manufacturing/controllers/__init__.py
 create mode 100644 sf_manufacturing/controllers/controllers.py

diff --git a/sf_manufacturing/__init__.py b/sf_manufacturing/__init__.py
index 0650744f..f7209b17 100644
--- a/sf_manufacturing/__init__.py
+++ b/sf_manufacturing/__init__.py
@@ -1 +1,2 @@
 from . import models
+from . import controllers
diff --git a/sf_manufacturing/controllers/__init__.py b/sf_manufacturing/controllers/__init__.py
new file mode 100644
index 00000000..e046e49f
--- /dev/null
+++ b/sf_manufacturing/controllers/__init__.py
@@ -0,0 +1 @@
+from . import controllers
diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
new file mode 100644
index 00000000..08bcbfa4
--- /dev/null
+++ b/sf_manufacturing/controllers/controllers.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+import logging
+import json
+import base64
+from odoo import http
+from odoo.http import request
+
+
+class Manufacturing_Connect(http.Controller):
+
+    @http.route('/AutoDeviceApi/GetWoInfo', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
+                cors="*")
+    def get_Work_Info(self, **kw):
+        """
+        自动化传递工单号获取工单信息
+        :param kw:
+        :return:
+        """
+        logging.info('get_Work_Info:%s' % kw)
+        try:
+            res = {'Succeed': True, 'Datas': []}
+            datas = request.httprequest.data
+            ret = json.loads(datas)
+            ret = json.loads(ret['result'])
+            logging.info('RfidCode:%s' % ret)
+            workorder = request.env['mrp.workorder'].sudo().search([('name', '=', ret['RfidCode'])])
+            if workorder:
+                for item in workorder:
+                    res['Datas'].append({
+                        'BillId': item.production_id.name,
+                        'ProductionLine': item.production_line,
+                        'CraftName': item.name,
+                        'Quantity': 1,
+                        # 'MaterialId':item.P
+                    })
+                return json.JSONEncoder().encode(res)
+        except Exception as e:
+            res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
+            logging.info('get_Work_Info error:%s' % e)
+            return json.JSONEncoder().encode(res)

From 22176eda6968d97e6d4ff9305a3a3b59c64a8447 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 16 Jan 2024 11:00:01 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 08bcbfa4..c4fd6b87 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -31,10 +31,12 @@ class Manufacturing_Connect(http.Controller):
                         'ProductionLine': item.production_line,
                         'CraftName': item.name,
                         'Quantity': 1,
-                        # 'MaterialId':item.P
+                        'MaterialId': item.product_id.default_code,
+                        'MaterialName': item.product_id.name,
+                        # 'Spec':item.mat,
+                        'Material': item.materials_type_id.name
                     })
-                return json.JSONEncoder().encode(res)
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
             logging.info('get_Work_Info error:%s' % e)
-            return json.JSONEncoder().encode(res)
+        return json.JSONEncoder().encode(res)