From 7118596e1cd986021e5f425f52886b054ff64636 Mon Sep 17 00:00:00 2001
From: gqh <email@example.com472285236@qq.co>
Date: Mon, 7 Nov 2022 16:42:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/__manifest__.py                       | 10 ++-
 sf_base/views/menu_view.xml                   | 14 ++--
 sf_base/views/mrs_base_view.xml               | 66 +++++++++++++++++--
 sf_base/views/mrs_common_view.xml             | 27 --------
 sf_bpm_api/__manifest__.py                    |  3 +-
 .../models/sf_production.py                   | 24 -------
 sf_route_workcenter/models/workcenter.py      | 12 +++-
 sf_route_workcenter/views/sf_workorder.xml    | 14 +++-
 8 files changed, 100 insertions(+), 70 deletions(-)

diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py
index 77165cde..967e1ba1 100644
--- a/sf_base/__manifest__.py
+++ b/sf_base/__manifest__.py
@@ -10,13 +10,19 @@
     """,
     'category': 'YZ',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['account', 'base', 'mrp'],
+    'depends': ['account', 'base', 'mrp','sale'],
     'data': [
         'security/group_security.xml',
         'security/ir.model.access.csv',
+        'data/product_data.xml',
         'views/mrs_base_view.xml',
         'views/mrs_common_view.xml',
-        "views/menu_view.xml"
+        'views/menu_view.xml',
+        'views/sale_order_view.xml',
+        'views/product_template_view.xml',
+        'views/mrp_routing_workcenter_view.xml',
+
+
 
     ],
     'demo': [
diff --git a/sf_base/views/menu_view.xml b/sf_base/views/menu_view.xml
index 42c9602c..4babedb1 100644
--- a/sf_base/views/menu_view.xml
+++ b/sf_base/views/menu_view.xml
@@ -142,13 +142,13 @@
                 action="action_mrs_machine_control_system"/>
 
 
-<!--         <menuitem-->
-<!--                id="menu_sf_partner_views"-->
-<!--                name="工厂token"-->
-<!--                parent="menu_mrs_base"-->
-<!--                sequence="1"-->
-<!--                action="token_factory_view"-->
-<!--        />-->
+         <menuitem
+                id="menu_sf_model_type"
+                name="模型类型"
+                parent="mrp.menu_mrp_configuration"
+                sequence="10"
+                action="action_sf_model_type"
+        />
 
 
 
diff --git a/sf_base/views/mrs_base_view.xml b/sf_base/views/mrs_base_view.xml
index 1d6aeaf3..b7f61d4f 100644
--- a/sf_base/views/mrs_base_view.xml
+++ b/sf_base/views/mrs_base_view.xml
@@ -355,11 +355,11 @@
         <field name="arch" type="xml">
             <form string="机床">
                 <header>
-                    <button type="object" class="oe_highlight" name ='enroll_machine_tool' string="机床注册"  />
+                    <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"/>
                 </header>
                 <group string="基本信息">
                     <group>
-                        <field name="MTcode"  string="编码" />
+                        <field name="MTcode" string="编码"/>
 
                         <field name="brand_id"
                                required="1"
@@ -368,7 +368,8 @@
                     </group>
                     <group>
                         <field name="name" required="1"/>
-                        <field name="type_id" required="1" options="{'no_create': True}"   domain="[('brand_id', '=', brand_id)]" attrs="{'invisible': [('brand_id','=',False)]}"/>
+                        <field name="type_id" required="1" options="{'no_create': True}"
+                               domain="[('brand_id', '=', brand_id)]" attrs="{'invisible': [('brand_id','=',False)]}"/>
                     </group>
 
                     <group>
@@ -406,7 +407,7 @@
                         <field name="rotate_speed" required="1" string="转速(min)" options="{'format': false}"/>
                         <field name="precision" required="1" string="加工精度(mm)"/>
                         <field name="control_system_id" required="1" options="{'no_create': True}"/>
-                         <field name="state" widget="selection"/>
+                        <field name="state" widget="selection"/>
                     </group>
                 </group>
                 <group string="其它">
@@ -489,4 +490,61 @@
             </p>
         </field>
     </record>
+
+    #------------------模型类型------------------
+
+    <record model="ir.ui.view" id="search_sf_model_type_view">
+        <field name="name">search.sf.model.type</field>
+        <field name="model">sf.model.type</field>
+        <field name="arch" type="xml">
+            <search string="模型类型">
+                <field name="name" string="模糊搜索"
+                       filter_domain="[('name', 'ilike', self)]"/>
+            </search>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="tree_sf_model_type_view">
+        <field name="name">tree.sf.model.type</field>
+        <field name="model">sf.model.type</field>
+        <field name="arch" type="xml">
+            <tree string="模型类型">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="form_sf_model_type">
+        <field name="name">form.sf.model.type</field>
+        <field name="model">sf.model.type</field>
+        <field name="arch" type="xml">
+            <form string="模型类型">
+                <group>
+                    <field name="name" required="1"/>
+                </group>
+                <group>
+                    <field name='routing_tmpl_ids'>
+                        <tree editable='bottom'>
+                            <field name="sequence" widget="handle"/>
+                            <field name="route_workcenter_id" string="工序"/>
+                        </tree>
+                    </field>
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_sf_model_type" model="ir.actions.act_window">
+        <field name="name">模型类型</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.model.type</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                [模型类型] 还没有哦！点左上角的[创建]按钮，沙发归你了!
+            </p>
+            <p>
+            </p>
+        </field>
+    </record>
 </odoo>
\ No newline at end of file
diff --git a/sf_base/views/mrs_common_view.xml b/sf_base/views/mrs_common_view.xml
index 966bccec..c5ab6744 100644
--- a/sf_base/views/mrs_common_view.xml
+++ b/sf_base/views/mrs_common_view.xml
@@ -293,24 +293,10 @@
             <field name="name">sf.tray.search</field>
             <field name="model">sf.tray</field>
             <field name="arch" type="xml">
-
-
-
-                    <search string="托盘">
-                        <field name="name" string="名称" filter_domain="[('name','like',self)]"/>
-                        <field name="code" string="编码" filter_domain="[('code','like',self)]"/>
-
-                    </search>
-                    <group string="分组">
-                        <filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
-                    </group>
-<!--                </group>-->
-
                 <search string="托盘">
                     <field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
                     <field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
                 </search>
-
             </field>
         </record>
 
@@ -347,18 +333,5 @@
         </record>
 
 
-        <record id="action_sf_tray" model="ir.actions.act_window">
-            <field name="name">托盘</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.tray</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_smiling_face">
-                    创建托盘吧
-                </p>
-            </field>
-        </record>
-
-
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_bpm_api/__manifest__.py b/sf_bpm_api/__manifest__.py
index b659bd14..f8e6070f 100644
--- a/sf_bpm_api/__manifest__.py
+++ b/sf_bpm_api/__manifest__.py
@@ -13,8 +13,7 @@
     'depends': ['sale', 'sf_base'],
     'data': [
         'data/product_data.xml',
-        'views/product_template_view.xml',
-        'views/sale_order_view.xml'
+
     ],
     'demo': [
     ],
diff --git a/sf_manufacturing_orders/models/sf_production.py b/sf_manufacturing_orders/models/sf_production.py
index c55cac6e..fcce77c1 100644
--- a/sf_manufacturing_orders/models/sf_production.py
+++ b/sf_manufacturing_orders/models/sf_production.py
@@ -99,30 +99,6 @@ class StockRule(models.Model):
         # in order to to batch the read. We also make a sanitary check on the
         # `location_src_id` field.
 
-        # list1 = []
-        # for item in procurements:
-        #     num = int(item[0].product_qty)
-        #     if num > 1:
-        #         for no in range(1, num+1):
-        #
-        #             Procurement = namedtuple('Procurement', ['product_id', 'product_qty',
-        #                                                      'product_uom', 'location_id', 'name', 'origin',
-        #                                                      'company_id',
-        #                                                      'values'])
-        #             s = Procurement(product_id=item[0].product_id,product_qty=1.0,product_uom=item[0].product_uom,
-        #                             location_id=item[0].location_id,
-        #                             name=item[0].name,
-        #                             origin=item[0].origin,
-        #                             company_id=item[0].company_id,
-        #                             values=item[0].values,
-        #                             )
-        #             item1 = list(item)
-        #             item1[0]=s
-        #
-        #             list1.append(tuple(item1))
-        #     else:
-        #         list1.append(item)
-
         for procurement, rule in procurements:
             if not rule.location_src_id:
                 msg = _('No source location defined on stock rule: %s!') % (rule.name,)
diff --git a/sf_route_workcenter/models/workcenter.py b/sf_route_workcenter/models/workcenter.py
index 8b0f9451..fc20a4e9 100644
--- a/sf_route_workcenter/models/workcenter.py
+++ b/sf_route_workcenter/models/workcenter.py
@@ -84,14 +84,15 @@ class MrpWorkOrder(models.Model):
     _inherit = 'mrp.workorder'
     _description = '工单'
 
+    cnc_id = fields.Many2one('ir.attachment', string='CNC程序')
     tray_ids = fields.One2many('sf.tray', 'workorder_id', string='托盘')
     # def get_tray_info(self):
     # @api.onchange('X_axis', 'Y_axis', 'Z_axis')
     # def get_center_point(self):
     #     return 'X:%s,Y:%s,Z:%s' % (self.X_axis, self.Y_axis, self.Z_axis)
     # 加工面
-    surface = fields.Selection([("前面", "前面"), ("后面", "后面"), ("左面", "左面"), ("右面", "右面"),
-                                ("上面", "上面")],  string="加工面1")
+    # surface = fields.Selection([("前面", "前面"), ("后面", "后面"), ("左面", "左面"), ("右面", "右面"),
+    #                             ("上面", "上面")],  string="加工面1")
 
     material_center_point = fields.Char(string='配料中心点')
     X1_axis = fields.Float(string='Lx1', default=0)
@@ -203,3 +204,10 @@ class MrpProduction(models.Model):
     _description = "制造订单"
 
     tray_ids = fields.One2many('sf.tray', 'production_id', string="托盘")
+
+class Attachment(models.Model):
+    _inherit = 'ir.attachment'
+
+    cnc_model = fields.Binary('cnc文件', attachment=False)
+    model_name = fields.Char('模型名称')
+
diff --git a/sf_route_workcenter/views/sf_workorder.xml b/sf_route_workcenter/views/sf_workorder.xml
index 6d79a348..f0b38b58 100644
--- a/sf_route_workcenter/views/sf_workorder.xml
+++ b/sf_route_workcenter/views/sf_workorder.xml
@@ -6,10 +6,20 @@
             <field name="model">mrp.workorder</field>
             <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
             <field name="arch" type="xml">
+                <xpath expr="//page[last()]" position="after">
+                    <page string="获取CNC加工程序">
+                        <group>
+                            <field name="cnc_id" />
+
+
+                        </group>
+                    </page>
+
+                </xpath>
                 <xpath expr="//page[last()]" position="after">
                     <page string="装夹托盘">
                         <group>
-                            <field name="surface" widget="radio"/>
+                            <field name="processing_panel" readonly = "1"/>
                             <div class="col-12 col-lg-6 o_setting_box">
                                 <button type="object" class="oe_highlight" name="gettray" string="扫描托盘"
                                         attrs='{"invisible": [("production_id","=",False)]}'
@@ -25,7 +35,7 @@
                     <page string="三元前置检测定位参数">
                         <group>
                             <group>
-                                <field name="surface" widget="radio"/>
+                                <field name="processing_panel" readonly = "1"/>
 
                             </group>
 

From eab76f8b323da43b5c54e0179b120081a90ca430 Mon Sep 17 00:00:00 2001
From: gqh <email@example.com472285236@qq.co>
Date: Tue, 8 Nov 2022 10:27:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0NC=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing_orders/models/sf_production.py | 1 +
 sf_route_workcenter/models/workcenter.py        | 4 ++--
 sf_route_workcenter/views/sf_workorder.xml      | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sf_manufacturing_orders/models/sf_production.py b/sf_manufacturing_orders/models/sf_production.py
index fcce77c1..79bba3db 100644
--- a/sf_manufacturing_orders/models/sf_production.py
+++ b/sf_manufacturing_orders/models/sf_production.py
@@ -74,6 +74,7 @@ class MrpProduction(models.Model):
                             'operation_id': False,
                             'name': route.route_workcenter_id.name,
                             'processing_panel': k,
+
                             'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids),
                             'date_planned_start': False,
                             'date_planned_finished': False,
diff --git a/sf_route_workcenter/models/workcenter.py b/sf_route_workcenter/models/workcenter.py
index fc20a4e9..878c0901 100644
--- a/sf_route_workcenter/models/workcenter.py
+++ b/sf_route_workcenter/models/workcenter.py
@@ -4,7 +4,7 @@ import base64
 import logging
 import math
 
-import qrcode
+
 
 from io import BytesIO
 from odoo import api, fields, models
@@ -84,7 +84,7 @@ class MrpWorkOrder(models.Model):
     _inherit = 'mrp.workorder'
     _description = '工单'
 
-    cnc_id = fields.Many2one('ir.attachment', string='CNC程序')
+    cnc_id = fields.Many2many('ir.attachment', 'cnc_attachment', string="cnc程序获取")
     tray_ids = fields.One2many('sf.tray', 'workorder_id', string='托盘')
     # def get_tray_info(self):
     # @api.onchange('X_axis', 'Y_axis', 'Z_axis')
diff --git a/sf_route_workcenter/views/sf_workorder.xml b/sf_route_workcenter/views/sf_workorder.xml
index f0b38b58..42dbcff4 100644
--- a/sf_route_workcenter/views/sf_workorder.xml
+++ b/sf_route_workcenter/views/sf_workorder.xml
@@ -9,9 +9,7 @@
                 <xpath expr="//page[last()]" position="after">
                     <page string="获取CNC加工程序">
                         <group>
-                            <field name="cnc_id" />
-
-
+                            <field name="cnc_id" widget="many2many_binary"/>
                         </group>
                     </page>
 
@@ -19,6 +17,8 @@
                 <xpath expr="//page[last()]" position="after">
                     <page string="装夹托盘">
                         <group>
+
+
                             <field name="processing_panel" readonly = "1"/>
                             <div class="col-12 col-lg-6 o_setting_box">
                                 <button type="object" class="oe_highlight" name="gettray" string="扫描托盘"