Merge branch 'release/release_2.10'

Merge Request: 修复报废-外协入库验证

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1284

quality_control/models/quality.py

@@ -130,7 +130,7 @@ class QualityPoint(models.Model):
 
 class QualityCheck(models.Model):
     _inherit = "quality.check"
-    part_name = fields.Char('零件名称', related='product_id.part_name', readonly=False, store=True)
+    part_name = fields.Char('零件名称', related='product_id.part_name')
     part_number = fields.Char('零件图号', related='product_id.part_number', readonly=False, store=True)
     material_name = fields.Char('材料名称', compute='_compute_material_name')
 

sf_machine_connect/views/delivery_record.xml

@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
+    <record id="view_delivery_record_form_inherit_sf" model="ir.ui.view">
+        <field name="name">delivery.record.form.inherit.sf</field>
+        <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()-3]" position="before">
+<!--                <page string="下发记录" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>-->
+                <page string="下发记录" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "HDR")]}'>
+                    <field name="delivery_records">
+                        <tree create="false">
+                            <field name="delivery_type"/>
+                            <field name="delivery_time"/>
+                            <field name="influence_record"/>
+                        </tree>
+                    </field>
+
+
+                </page>
+            </xpath>
+        </field>
+    </record>
 <!--     <record id="seqence_b_purchase_order" model='ir.sequence'> -->
 <!--         <field name='name'>Purchase Order</field> -->
 <!--         <field name='code'>sf_machine_connect.delivery.record</field> -->

sf_machine_connect/views/machine_info_present.xml

@@ -3,9 +3,9 @@
     <record id="view_machine_info_form_inherit_sf" model="ir.ui.view">
         <field name="name">machine.info.form.inherit.sf</field>
         <field name="model">mrp.workorder</field>
-        <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
+        <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
         <field name="arch" type="xml">
-            <xpath expr="//page[@name='CMR']" position="after">
+            <xpath expr="//page[last()-3]" position="before">
                 <page string="机床信息" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "MTI")]}'>
                     <group string="机床信息">
                         <group>
@@ -33,15 +33,6 @@
                         </group>
                     </group>
                 </page>
-                <page string="下发记录" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "HDR")]}'>
-                    <field name="delivery_records">
-                        <tree create="false">
-                            <field name="delivery_type"/>
-                            <field name="delivery_time"/>
-                            <field name="influence_record"/>
-                        </tree>
-                    </field>
-                </page>
             </xpath>
         </field>
     </record>

sf_manufacturing/data/sf_work_individuation_page.xml

@@ -1,72 +1,57 @@
 <odoo>
-    <data noupdate="0">
+    <data noupdate="1">
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_1">
+            <field name="code">PTD</field>
+            <field name="name">后置三元检测</field>
+        </record>
         <record model="sf.work.individuation.page" id="sf_work_individuation_page_2">
             <field name="code">WCP</field>
             <field name="name">工件装夹</field>
-            <field name="sequence">10</field>
         </record>
         <record model="sf.work.individuation.page" id="sf_work_individuation_page_3">
             <field name="code">ITD_PP</field>
             <field name="name">前置三元检测定位参数</field>
-            <field name="sequence">20</field>
-        </record>
-        <record model="sf.work.individuation.page" id="sf_work_individuation_page_6">
-            <field name="code">WD</field>
-            <field name="name">工件配送</field>
-            <field name="sequence">30</field>
-        </record>
-        <record model="sf.work.individuation.page" id="sf_work_individuation_page_9">
-            <field name="code">CNC_P</field>
-            <field name="name">CNC程序</field>
-            <field name="sequence">40</field>
-        </record>
-        <record model="sf.work.individuation.page" id="sf_work_individuation_page_10">
-            <field name="code">CMM_P</field>
-            <field name="name">CMM程序</field>
-            <field name="sequence">50</field>
-        </record>
-        <record model="sf.work.individuation.page" id="sf_work_individuation_page_1">
-            <field name="code">PTD</field>
-            <field name="name">后置三元检测</field>
-            <field name="sequence">60</field>
-        </record>
-        <record model="sf.work.individuation.page" id="sf_work_individuation_page_14">
-            <field name="code">DCP</field>
-            <field name="name">解除装夹</field>
-            <field name="sequence">70</field>
         </record>
         <record model="sf.work.individuation.page" id="sf_work_individuation_page_4">
             <field name="code">2D_MD</field>
             <field name="name">2D加工图纸</field>
-            <field name="sequence">80</field>
         </record>
         <record model="sf.work.individuation.page" id="sf_work_individuation_page_5">
             <field name="code">QIS</field>
             <field name="name">质检标准</field>
-            <field name="sequence">90</field>
         </record>
-        <record model="sf.work.individuation.page" id="sf_work_individuation_page_15">
-            <field name="code">CMR</field>
-            <field name="name">开料要求</field>
-            <field name="sequence">100</field>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_6">
+            <field name="code">WD</field>
+            <field name="name">工件配送</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_9">
+            <field name="code">CNC_P</field>
+            <field name="name">CNC程序</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_10">
+            <field name="code">CMM_P</field>
+            <field name="name">CMM程序</field>
         </record>
         <record model="sf.work.individuation.page" id="sf_work_individuation_page_11">
             <field name="code">MTI</field>
             <field name="name">机床信息</field>
-            <field name="sequence">110</field>
         </record>
         <record model="sf.work.individuation.page" id="sf_work_individuation_page_12">
             <field name="code">HDR</field>
             <field name="name">下发记录</field>
-            <field name="sequence">120</field>
         </record>
         <record model="sf.work.individuation.page" id="sf_work_individuation_page_13">
             <field name="code">ER</field>
             <field name="name">异常记录</field>
-            <field name="sequence">130</field>
         </record>
-
-
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_14">
+            <field name="code">DCP</field>
+            <field name="name">解除装夹</field>
+        </record>
+        <record model="sf.work.individuation.page" id="sf_work_individuation_page_15">
+            <field name="code">CMR</field>
+            <field name="name">开料要求</field>
+        </record>
 
             <!--   原生页签先不进行配置     -->
 <!--        <record model="sf.work.individuation.page" id="sf_work_individuation_page_7">-->

sf_manufacturing/models/mrp_routing_workcenter.py

@@ -107,8 +107,6 @@ class ResMrpRoutingWorkcenter(models.Model):
 
 class WorkIndividuationPage(models.Model):
     _name = 'sf.work.individuation.page'
-    _order = 'sequence'
 
     code = fields.Char('编号')
     name = fields.Char('名称')
-    sequence = fields.Integer('序号')

sf_manufacturing/views/mrp_workorder_view.xml

@@ -226,6 +226,22 @@
                 <!--                        string="返工"-->
                 <!--                        attrs='{"invisible": [("rework_flag","=",True)]}' confirm="是否返工"/>-->
             </xpath>
+            <xpath expr="//page[1]" position="before">
+                <page string="开料要求" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "CMR")]}'>
+                    <group>
+                        <group>
+                            <field name="product_tmpl_id_materials_id" widget="many2one"/>
+                            <field name="product_tmpl_id_materials_type_id" widget="many2one"/>
+
+                        </group>
+                        <group>
+                            <field name="product_tmpl_id_length"/>
+                            <field name="product_tmpl_id_width"/>
+                            <field name="product_tmpl_id_height"/>
+                        </group>
+                    </group>
+                </page>
+            </xpath>
             <xpath expr="//label[1]" position="before">
                 <!--                -->
                 <field name="production_id" invisible="0"/>
@@ -309,8 +325,6 @@
 
 
             <xpath expr="//page[1]" position="before">
-                <field name="results" invisible="1"/>
-                <field name="individuation_page_list" invisible="1"/>
                 <page string="工件装夹" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "WCP")]}'>
                     <group>
                         <!--                         <field name="_barcode_scanned" widget="barcode_handler"/> -->
@@ -489,6 +503,7 @@
                         <field name='X_deviation_angle' readonly="1"/>
                     </group>
                 </page>
+
                 <page string="工件配送" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "WD")]}'>
                     <field name="workpiece_delivery_ids">
                         <tree editable="bottom">
@@ -508,6 +523,58 @@
                         </tree>
                     </field>
                 </page>
+
+            </xpath>
+
+            <xpath expr="//form//header" position="inside">
+                <button type="object" class="oe_highlight jikimo_button_confirm" name="get_three_check_datas"
+                        string="获取数据"
+                        attrs='{"invisible": ["|", ("state","!=","progress"), ("routing_type","!=","装夹预调")]}'/>
+            </xpath>
+
+                <!--  =====原生页签，暂时不进行配置=====   -->
+<!--            <xpath expr="//page[@name='components']" position="attributes">-->
+<!--                <attribute name="attrs">{"invisible": ["!", ("individuation_page_list", "ilike", "ML")]}</attribute>-->
+<!--            </xpath>-->
+<!--            <xpath expr="//page[@name='time_tracking']" position="attributes">-->
+<!--                <attribute name="attrs">{"invisible": ["!", ("individuation_page_list", "ilike", "TT")]}</attribute>-->
+<!--            </xpath>-->
+                <!--  =============================  -->
+
+            <xpath expr="//page[1]" position="before">
+                <field name="results" invisible="1"/>
+                <field name="individuation_page_list" invisible="1"/>
+                <page string="后置三元检测" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "PTD")]}'>
+                    <group>
+                        <field name="test_results"
+                               attrs='{"readonly":["&amp;","|",("state","!=","to be detected"), "|",("routing_type","=","CNC加工"),("is_inspect", "=", True),("state","in",["done","rework"])],
+                               "invisible":[("results","!=",False)]}'/>
+                        <!--                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>-->
+                        <!--                        <field name="is_fetchcnc"-->
+                        <!--                               attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/>-->
+                        <field name="reason"
+                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")],"readonly":[("state","in",("done", "rework"))]}'/>
+                        <field name="detailed_reason"
+                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")],"readonly":[("state","in",("done", "rework"))]}'/>
+                        <!--                                                <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>-->
+                        <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
+                               widget="pdf_viewer" readonly="1"/>
+                    </group>
+                    <!--                    <div class="col-12 col-lg-6 o_setting_box">-->
+                    <!--                        <button type="object" class="oe_highlight" name="recreateManufacturingOrWorkerOrder"-->
+                    <!--                                string="检测确认"-->
+                    <!--                                attrs='{"invisible": ["|","|",("state","!=","progress"),("user_permissions","=",False),("results","=","合格")]}'/>-->
+                    <!--                    </div>-->
+                </page>
+                <page string="2D加工图纸" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "2D_MD")]}'>
+                    <field name="machining_drawings" widget="adaptive_viewer"/>
+                </page>
+
+                <page string="质检标准" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "QIS")]}'>
+                    <field name="quality_standard" widget="adaptive_viewer"/>
+                </page>
+            </xpath>
+            <xpath expr="//page[1]" position="before">
                 <page string="CNC程序" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "CNC_P")]}'>
                     <field name="cnc_ids" widget="one2many" string="工作程序" default_order="sequence_number,id"
                            readonly="0">
@@ -543,28 +610,8 @@
                         </tree>
                     </field>
                 </page>
-                <page string="后置三元检测" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "PTD")]}'>
-                    <group>
-                        <field name="test_results"
-                               attrs='{"readonly":["&amp;","|",("state","!=","to be detected"), "|",("routing_type","=","CNC加工"),("is_inspect", "=", True),("state","in",["done","rework"])],
-                               "invisible":[("results","!=",False)]}'/>
-                        <!--                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>-->
-                        <!--                        <field name="is_fetchcnc"-->
-                        <!--                               attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/>-->
-                        <field name="reason"
-                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")],"readonly":[("state","in",("done", "rework"))]}'/>
-                        <field name="detailed_reason"
-                               attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")],"readonly":[("state","in",("done", "rework"))]}'/>
-                        <!--                                                <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>-->
-                        <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
-                               widget="pdf_viewer" readonly="1"/>
-                    </group>
-                    <!--                    <div class="col-12 col-lg-6 o_setting_box">-->
-                    <!--                        <button type="object" class="oe_highlight" name="recreateManufacturingOrWorkerOrder"-->
-                    <!--                                string="检测确认"-->
-                    <!--                                attrs='{"invisible": ["|","|",("state","!=","progress"),("user_permissions","=",False),("results","=","合格")]}'/>-->
-                    <!--                    </div>-->
-                </page>
+            </xpath>
+            <xpath expr="//page[1]" position="before">
                 <page string="解除装夹" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "DCP")]}'>
                     <!--                    <field name="tray_id" readonly="1"/>-->
                     <!--                    <div class="col-12 col-lg-6 o_setting_box">-->
@@ -578,45 +625,7 @@
                     <!--                    </div>-->
 
                 </page>
-                <page string="2D加工图纸" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "2D_MD")]}'>
-                    <field name="machining_drawings" widget="adaptive_viewer"/>
-                </page>
-                <page string="质检标准" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "QIS")]}'>
-                    <field name="quality_standard" widget="adaptive_viewer"/>
-                </page>
-                <page name="CMR" string="开料要求" attrs='{"invisible": ["!", ("individuation_page_list", "ilike", "CMR")]}'>
-                    <group>
-                        <group>
-                            <field name="product_tmpl_id_materials_id" widget="many2one"/>
-                            <field name="product_tmpl_id_materials_type_id" widget="many2one"/>
-
-                        </group>
-                        <group>
-                            <field name="product_tmpl_id_length"/>
-                            <field name="product_tmpl_id_width"/>
-                            <field name="product_tmpl_id_height"/>
-                        </group>
-                    </group>
-                </page>
             </xpath>
-
-            <xpath expr="//form//header" position="inside">
-                <button type="object" class="oe_highlight jikimo_button_confirm" name="get_three_check_datas"
-                        string="获取数据"
-                        attrs='{"invisible": ["|", ("state","!=","progress"), ("routing_type","!=","装夹预调")]}'/>
-            </xpath>
-
-                <!--  =====原生页签，暂时不进行配置=====   -->
-<!--            <xpath expr="//page[@name='components']" position="attributes">-->
-<!--                <attribute name="attrs">{"invisible": ["!", ("individuation_page_list", "ilike", "ML")]}</attribute>-->
-<!--            </xpath>-->
-<!--            <xpath expr="//page[@name='time_tracking']" position="attributes">-->
-<!--                <attribute name="attrs">{"invisible": ["!", ("individuation_page_list", "ilike", "TT")]}</attribute>-->
-<!--            </xpath>-->
-                <!--  =============================  -->
-
-
-
             <!--            <xpath expr="//form//sheet//group//group//div[1]" position="after">-->
             <!--                <label for="date_start" string="实际加工时间"/>-->
             <!--                <div class="oe_inline">-->

sf_sale/views/sale_order_view.xml

@@ -103,9 +103,9 @@
                 </field>
                 <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="before">
                     <field name="model_glb_file" widget="Viewer3D" optional="show"
-                           string="模型文件" readonly="1" attrs="{'column_invisible': [('parent.model_display_version', '!=', 'v1')], 'isInList': True}"/>
+                           string="模型文件" readonly="1" attrs="{'column_invisible': [('parent.model_display_version', '!=', 'v1')]}"/>
                     <field name="glb_url" widget="Viewer3D" optional="show"
-                           string="模型文件" readonly="1" attrs="{'column_invisible': [('parent.model_display_version', '!=', 'v2')], 'isInList': True}"/>
+                           string="模型文件" readonly="1" attrs="{'column_invisible': [('parent.model_display_version', '!=', 'v2')]}"/>
                     <field name="part_name" optional="show"/>
                 </xpath>
                 <xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">

sf_tool_management/models/base.py

@@ -791,50 +791,48 @@ class FunctionalToolAssembly(models.Model):
         # 刀柄之外的物料配置
         if options == '刀柄+整体式刀具':
             # 配置整体式刀具
-            integra_lot_ids = self._get_old_tool_material_lot(bom.get('integral_ids'))
-            integra_location_lot_id = self._get_shelf_location_lot(integra_lot_ids)
+            integra_lot_id = self._get_old_tool_material_lot(bom.get('integral_ids'))
+            integra_location_lot_id = self._get_shelf_location_lot(integra_lot_id)
             self.integral_freight_barcode_id = integra_location_lot_id.shelf_location_id.id
             self.integral_lot_id = integra_location_lot_id.lot_id.id
         else:
             # 配置刀片
-            blade_lot_ids = self._get_old_tool_material_lot(bom.get('blade_ids'))
-            blade_location_lot_id = self._get_shelf_location_lot(blade_lot_ids)
+            blade_lot_id = self._get_old_tool_material_lot(bom.get('blade_ids'))
+            blade_location_lot_id = self._get_shelf_location_lot(blade_lot_id)
             self.blade_freight_barcode_id = blade_location_lot_id.shelf_location_id.id
             self.blade_lot_id = blade_location_lot_id.lot_id.id
 
             if options == '刀柄+刀杆+刀片':
                 # 配置刀杆
-                bar_lot_ids = self._get_old_tool_material_lot(bom.get('bar_ids'))
-                bar_location_lot_id = self._get_shelf_location_lot(bar_lot_ids)
+                bar_lot_id = self._get_old_tool_material_lot(bom.get('bar_ids'))
+                bar_location_lot_id = self._get_shelf_location_lot(bar_lot_id)
                 self.bar_freight_barcode_id = bar_location_lot_id.shelf_location_id.id
                 self.bar_lot_id = bar_location_lot_id.lot_id.id
             elif options == '刀柄+刀盘+刀片':
                 # 配置刀盘
-                pad_lot_ids = self._get_old_tool_material_lot(bom.get('pad_ids'))
-                pad_location_lot_id = self._get_shelf_location_lot(pad_lot_ids)
+                pad_lot_id = self._get_old_tool_material_lot(bom.get('pad_ids'))
+                pad_location_lot_id = self._get_shelf_location_lot(pad_lot_id)
                 self.pad_freight_barcode_id = pad_location_lot_id.shelf_location_id.id
                 self.pad_lot_id = pad_location_lot_id.lot_id.id
 
     def _get_old_tool_material_lot(self, material_ids):
         """ 根据先进先出原则选择物料批次 """
         location_id = self.env['stock.location'].search([('name', '=', '刀具房')])
-        stock_quant_ids = self.env['stock.quant'].sudo().search(
+        stock_quant = self.env['stock.quant'].sudo().search(
             [('location_id', '=', location_id.id), ('product_id', 'in', material_ids.ids), ('quantity', '>', '0')],
-            order='lot_id')
-        if stock_quant_ids:
-            return [stock_quant_id.lot_id for stock_quant_id in stock_quant_ids]
+            order='lot_id', limit=1)
+        if stock_quant:
+            return stock_quant.lot_id
         else:
             raise ValidationError(f'【{material_ids[0].cutting_tool_material_id.name}】物料库存不足，请先进行盘点或采购')
 
-    def _get_shelf_location_lot(self, lot_ids):
+    def _get_shelf_location_lot(self, lot_id):
         """根据所给的刀具物料批次号，返回一个刀具物料货位、批次信息"""
-        for lot_id in lot_ids:
-            location_lots = self.env['sf.shelf.location.lot'].sudo().search([('lot_id', '=', lot_id.id)])
-            if location_lots:
-                return location_lots[0]
-        if lot_ids:
-            raise ValidationError(
-                f'【{lot_ids[0].product_id.cutting_tool_material_id.name}】物料在货位上库存不足，请先进行盘点或采购！')
+        location_lots = self.env['sf.shelf.location.lot'].sudo().search([('lot_id', '=', lot_id.id)])
+        if not location_lots:
+            raise ValidationError(f'没有查询到批次为【{lot_id.name}】物料的货位信息！')
+        else:
+            return location_lots[0]
 
     def _get_inventory_bom(self, inventory_id):
         """获取BOM的刀具物料产品信息"""