Merge branch 'feature/制造订单状态优化_1' into feature/制造订单状态优化_2

sf_manufacturing/models/mrp_production.py

@@ -960,6 +960,13 @@ class MrpProduction(models.Model):
                             productions_not_delivered.write(
                                 {'state': 'progress', 'programming_state': '已编程', 'is_rework': False})
 
+                            # 对制造订单所以面的cnc工单的程序用刀进行校验
+                            try:
+                                logging.info(f'已更新制造订单：{productions_not_delivered}')
+                                productions_not_delivered.production_cnc_tool_checkout()
+                            except Exception as e:
+                                logging.info(f'对cnc工单的程序用刀进行校验报错：{e}')
+
     # 从cloud获取重新编程过的最新程序
     def get_new_program(self, processing_panel):
         try:

sf_manufacturing/views/mrp_workorder_view.xml

@@ -584,6 +584,12 @@
                    position="after">
                 <field name="duration" string="实际时长"/>
             </xpath>
+            <xpath expr="//page[@name='time_tracking']" position="attributes">
+                <attribute name="groups">
+                    mrp.group_mrp_manager,sf_base.group_sf_mrp_manager,sf_base.group_sf_equipment_user,sf_base.group_sf_order_user
+                </attribute>
+            </xpath>
+
         </field>
     </record>