diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 2f4286ce..8de51b8a 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -310,7 +310,8 @@ class CNCprocessing(models.Model):
     depth_of_processing_z = fields.Char('加工深度(Z)')
     cutting_tool_extension_length = fields.Char('刀具伸出长度')
     cutting_tool_handle_type = fields.Char('刀柄型号')
-    estimated_processing_time = fields.Datetime('预计加工时间')
+    estimated_processing_time = fields.Char('预计加工时间')
+    remark = fields.Text('备注')
     workorder_id = fields.Many2one('mrp.workorder', string="工单")
 
     # mrs下发编程单创建CNC加工
@@ -330,5 +331,6 @@ class CNCprocessing(models.Model):
             'depth_of_processing_z': obj['depth_of_processing_z'],
             'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
             'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
+            'remark': obj['remark']
             # 'FJGDate': obj['']
         })
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index b5d711d7..973f507b 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -41,16 +41,16 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="view_mrp_production_workorder_form_inherit_sf">
-        <field name="name">mrp.production.workorder.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">
-            <field name="production_id" position="after">
-                <field name="processing_panel" readonly="1"/>
-            </field>
-        </field>
-    </record>
+<!--    <record model="ir.ui.view" id="view_mrp_production_workorder_form_inherit_sf">-->
+<!--        <field name="name">mrp.production.workorder.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">-->
+<!--            <field name="production_id" position="after">-->
+<!--                <field name="processing_panel" readonly="1"/>-->
+<!--            </field>-->
+<!--        </field>-->
+<!--    </record>-->
 
     <record id="view_mrp_production_workorder_tray_form_inherit_sf" model="ir.ui.view">
         <field name="name">mrp.production.workorder.tray.form.inherit.sf</field>
@@ -213,18 +213,18 @@
                     <field name="cnc_ids" widget="one2many">
                         <tree>
                             <field name="cnc_id"/>
-                            <field name="FNo"/>
-                            <field name="FPGName"/>
-                            <field name="FKnifeName"/>
-                            <field name="FDNo"/>
-                            <field name="FWorkType"/>
-                            <field name="FXY"/>
-                            <field name="FZ"/>
-                            <field name="FJGSD"/>
-                            <field name="FSCCD"/>
-                            <field name="FDJSpec"/>
-                            <field name="FJGDate"/>
-                            <field name="FComment"/>
+                            <field name="sequence_number"/>
+                            <field name="program_name"/>
+                            <field name="cutting_tool_name"/>
+                            <field name="cutting_tool_no"/>
+                            <field name="processing_type"/>
+                            <field name="margin_x_y"/>
+                            <field name="margin_z"/>
+                            <field name="depth_of_processing_z"/>
+                            <field name="cutting_tool_extension_length"/>
+                            <field name="cutting_tool_handle_type"/>
+                            <field name="estimated_processing_time"/>
+                            <field name="remark"/>
                         </tree>
                     </field>
                 </page>