调整模型显示

sf_base/models/fixture.py

@@ -32,6 +32,7 @@ class FixtureModel(models.Model):
     multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
     brand_id = fields.Many2one('sf.machine.brand', string="品牌")
     model_file = fields.Binary(string="图片")
+    glb_url = fields.Char(string="图片")
     status = fields.Boolean('状态')
     active = fields.Boolean('有效', default=False)
 

sf_base/views/fixture_view.xml

@@ -158,6 +158,8 @@
                             <!--                            <field name="upload_model_file" widget="many2many_binary"/>-->
                             <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
                                    attrs="{'invisible': [('model_file', '=', False)]}"/>
+                            <field name="glb_url" widget="Viewer3D" string="模型" readonly="1" force_save="1"
+                                   attrs="{'invisible': [('glb_url', '=', False)]}"/>
                         </group>
                     </group>
                     <notebook>

sf_dlm/models/product_template.py

@@ -44,7 +44,7 @@ class ResProductTemplate(models.Model):
         else:
             return self.env.ref('sf_dlm.product_uom_cubic_millimeter')
 
-    # model_file = fields.Binary('模型文件')
+    model_file = fields.Binary('模型文件')
 
     # 胚料的库存路线设置
     # def _get_routes(self, route_type):

sf_dlm_management/views/product_template_management_view.xml

@@ -22,12 +22,15 @@
                     <field name='manual_quotation' attrs="{'invisible':[('glb_url', '=', False)]}"/>
                     <field name="is_customer_provided" attrs="{'invisible': [('categ_type', 'not in', ['成品', '坯料'])], 'readonly': True}" />
                     <field name="model_name" invisible="1"/>
+                    <field name="upload_model_file" widget="many2many_binary" attrs="{'invisible': [('upload_model_file', '=', False)]}"/>
                     <field name="model_url"
                            widget="binary_download"
                            filename_field="model_name"
                            attrs="{'invisible': ['|', '|',('categ_type', '!=', '成品'),('categ_type', '=', False),('model_url', '=', False)]}"/>
                     <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
                            attrs="{'invisible': ['|','|', ('categ_type', '!=', '成品'),('categ_type', '=', False),('model_file', '=', False)]}"/>
+                     <field name="glb_url" widget="Viewer3D" string="模型" readonly="1" force_save="1"
+                           attrs="{'invisible': ['|','|', ('categ_type', '!=', '成品'),('categ_type', '=', False),('glb_url', '=', False)]}"/>
                     <field name='cutting_tool_type' invisible="1"/>
                     <field name="fixture_material_type" invisible="1"/>
                     <field name="embryo_model_type_id" string="模型类型" options="{'no_create': True}"

sf_manufacturing/models/mrp_production.py

@@ -25,6 +25,7 @@ class MrpProduction(models.Model):
     maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Number of maintenance requests")
     request_ids = fields.One2many('maintenance.request', 'production_id')
     model_file = fields.Binary('模型文件', related='product_id.model_file')
+    glb_url = fields.Char('模型文件', related='product_id.glb_url')
     schedule_state = fields.Selection([('未排', '未排'), ('已排', '已排'), ('已完成', '已完成')],
                                       string='排程状态', default='未排')
     work_order_state = fields.Selection([('未排', '未排'), ('已排', '已排'), ('已完成', '已完成')],
@@ -239,6 +240,7 @@ class MrpProduction(models.Model):
         string='编程状态',
         tracking=True)
     glb_file = fields.Binary("glb模型文件")
+    glb_url = fields.Char("glb模型文件")
     production_line_id = fields.Many2one('sf.production.line', string='生产线', tracking=True)
     plan_start_processing_time = fields.Datetime('计划开始加工时间')
     is_rework = fields.Boolean(string='是否返工', default=False)

sf_manufacturing/models/mrp_workorder.py

@@ -289,6 +289,7 @@ class ResMrpWorkOrder(models.Model):
     cmm_ids = fields.One2many("sf.cmm.program", 'workorder_id', string="CMM程序")
     tray_code = fields.Char(string="托盘编码")
     glb_file = fields.Binary("glb模型文件", related='production_id.model_file')
+    glb_url = fields.Char("glb模型文件", related='production_id.glb_url')
     is_subcontract = fields.Boolean(string='是否外协')
     surface_technics_parameters_id = fields.Many2one('sf.production.process.parameter', string="表面工艺可选参数")
 

sf_manufacturing/models/product_template.py

@@ -1106,6 +1106,7 @@ class ResProductFixture(models.Model):
     fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
     multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
     model_file = fields.Binary(string="3D模型图")
+    glb_url = fields.Char(string="3D模型图")
 
     # 夹具物料基本参数
     diameter = fields.Float('直径(mm)', digits=(16, 2))

sf_manufacturing/views/mrp_workcenter_views.xml

@@ -450,7 +450,9 @@
                 </button>
             </div>
             <field name="product_id" position="after">
-                <field name="model_file" string="产品模型" readonly="1" widget="Viewer3D"/>
+                <field name="model_file" string="产品模型" readonly="1" widget="Viewer3D" attrs="{'invisible': [('model_file', '=', False)]}"/>
+                <field name="glb_url" widget="Viewer3D" string="模型" readonly="1" force_save="1"
+                           attrs="{'invisible': [('glb_url', '=', False)]}"/>
             </field>
         </field>
     </record>

sf_quality/models/quality.py

@@ -26,6 +26,7 @@ class QualityCheck(models.Model):
                                          string='生产线')
     equipment_id = fields.Many2one(related='workorder_id.equipment_id', string='加工设备')
     model_file = fields.Binary(related='workorder_id.glb_file', string='加工模型')
+    glb_url = fields.Char(related='workorder_id.glb_url', string='加工模型')
 
     detection_report = fields.Binary(related='workorder_id.detection_report', readonly=True, string='检测报告')
     test_results = fields.Selection([("合格", "合格"), ("返工", "返工")], string="检测结果",

sf_quality/models/quality_cnc_test.py

@@ -12,6 +12,7 @@ class SfQualityCncTest(models.Model):
     production_id = fields.Many2one(related='workorder_id.production_id', string='制造订单')
     product_id = fields.Many2one(related='workorder_id.product_id', string='产品')
     model_file = fields.Binary(related='workorder_id.glb_file', string='加工模型')
+    glb_url = fields.Char(related='workorder_id.glb_url', string='加工模型')
     processing_panel = fields.Char(related='workorder_id.processing_panel', string='加工面')
     equipment_id = fields.Many2one(related='workorder_id.equipment_id', string='加工设备')
     production_line_id = fields.Many2one(related='workorder_id.production_line_id',

sf_quality/views/quality_check_view.xml

@@ -13,6 +13,8 @@
                 <field name="equipment_id" attrs="{'invisible': [('production_id', '=', False)]}"/>
                 <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
                        attrs="{'invisible': ['|',('model_file', '=', False), ('production_id', '=', False)]}"/>
+                <field name="glb_url" widget="Viewer3D" string="模型" readonly="1" force_save="1"
+                       attrs="{'invisible': ['|',('glb_url', '=', False), ('production_id', '=', False)]}"/>
             </xpath>
             <xpath expr="//field[@name='partner_id']" position="after">
                 <field name="processing_panel" attrs="{'invisible': [('production_id', '=', False)]}"/>

sf_quality/views/quality_cnc_test_view.xml

@@ -87,7 +87,8 @@
                             <field name="product_id"/>
                             <field name="production_line_id"/>
                             <field name="equipment_id"/>
-                            <field name="model_file" widget="Viewer3D"/>
+                            <field name="model_file" widget="Viewer3D" attrs="{'invisible': [('model_file', '=', False)]}"/>
+                            <field name="glb_url" widget="Viewer3D" attrs="{'invisible': [('glb_url', '=', False)]}"/>
                         </group>
                         <group>
                             <field name="part_name"/>

sf_sale/models/sale_order.py

@@ -248,6 +248,7 @@ class ResaleOrderLine(models.Model):
     # part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
     part_name = fields.Char('零件名称', related='product_id.part_name', readonly=True)
     model_glb_file = fields.Binary('模型的glb文件', compute='_compute_model_glb_file', store=True)
+    glb_url = fields.Char('glb文件地址', compute='_compute_model_glb_file', store=True)
     # product_template_id = fields.Many2one(
     #     string="产品",
     #     comodel_name='product.template',
@@ -265,7 +266,6 @@ class ResaleOrderLine(models.Model):
     embryo_redundancy_id = fields.Many2one('sf.embryo.redundancy', '坯料冗余')
     manual_quotation = fields.Boolean('人工编程', default=False)
     model_url = fields.Char('模型文件地址')
-    glb_url = fields.Char('glb文件地址')
     model_id = fields.Char('模型id')
 
     @api.depends('embryo_redundancy_id')
@@ -279,6 +279,8 @@ class ResaleOrderLine(models.Model):
             if line.product_template_id:
                 if not line.model_glb_file:
                     line.model_glb_file = line.product_id.product_tmpl_id.model_file
+                if not line.glb_url:
+                    line.glb_url = line.product_id.product_tmpl_id.glb_url
                 if not line.price_unit:
                     line.price_unit = line.product_id.product_tmpl_id.list_price
 

sf_sale/views/quick_easy_order_view.xml

@@ -50,9 +50,13 @@
                             <group>
                                 <field name="customer_id" context="{'is_customer': True }"
                                        options="{'no_create': True}" required="1"/>
-                                <field name="upload_model_file" widget="many2many_binary"/>
+                                <field name="upload_model_file" widget="many2many_binary" attrs="{'invisible': [('upload_model_file', '=', False)]}"/>
+                                <!-- <field name="model_url" widget="binary_download" filename_field="model_name" readonly="1" string="模型文件"
+                                       attrs="{'invisible': [('model_url', '=', False)]}"/> -->
                                 <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
                                        attrs="{'invisible': [('model_file', '=', False)]}"/>
+                                <!-- <field name="glb_url" widget="Viewer3D" string="模型" readonly="1" force_save="1"
+                                       attrs="{'invisible': [('glb_url', '=', False)]}"/> -->
                                 <label for="model_length" string="尺寸(mm)"
                                        attrs='{"invisible": [("model_file","=",False)]}'/>
                                 <div class="test_model"