diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 6a9c3e28..25436081 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1042,7 +1042,10 @@ class SfWorkOrderBarcodes(models.Model):
         #     [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)])
         workorder_old = self.env['mrp.workorder'].search([('rfid_code', '=', barcode)])
         if workorder_old:
-            raise UserError('该托盘已绑定【%s】制造订单，请先解除绑定！！！' % workorder_old.production_id.name)
+            name = ''
+            for workorder in workorder_old:
+                name = '%s  %s' % (name, workorder.production_id.name)
+            raise UserError('该托盘已绑定【%s】制造订单，请先解除绑定！！！' % name)
         if workorder:
             if workorder.routing_type == '装夹预调':
                 if workorder.state in ['done']:
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 12ba4dd9..c5616242 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -78,6 +78,7 @@
                     <field name="programming_no" readonly="1"/>
                     <field name="work_state" invisible="1"/>
                     <field name="schedule_state" invisible='1'/>
+                    <field name="manual_quotation" readonly="1"/>
                     <field name="programming_state" readonly="1"/>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="before">
@@ -258,6 +259,18 @@
             </field>
         </record>
 
+        <record id="product_template_search_view_manual_quotation" model="ir.ui.view">
+            <field name="name">product.template.search</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_search_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//filter[@name='consumable']" position="after">
+                    <separator/>
+                    <filter string="人工编程" name="manual_quotation" domain="[('manual_quotation', '=', True)]"/>
+                </xpath>
+            </field>
+        </record>
+
         <!-- 工单的操作按钮只让制造用户可见 -->
         <record id="sf_mrp_production_workorder_tree_editable_view" model="ir.ui.view">
             <field name="name">sf.mrp.production.workorder.tree.editable</field>
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 61bbd110..06a60b1c 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -914,7 +914,7 @@
                                             <field name="pad_freight_id" string="目标货位"
                                                    options="{'no_create': True,'no_create_edit':True}"
                                                    attrs="{'invisible': [('dismantle_cause', 'not in', ['更换为其他刀具'])], 'readonly': [('state', '=', '已拆解')],
-                                                    'required': [('pad_freight_id', '!=', False), ('dismantle_cause', 'in', ['更换为其他刀具'])]}"/>
+                                                    'required': [('pad_product_id', '!=', False), ('dismantle_cause', 'in', ['更换为其他刀具'])]}"/>
                                         </group>
                                     </group>
                                 </group>
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index fdbd0c33..e526d5b9 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -838,7 +838,7 @@ class Sf_stock_move_line(models.Model):
                 if obj:
                     obj.product_id = record.product_id.id
                     # obj.location_status = '占用'
-                    obj.product_num += record.reserved_uom_qty
+                    obj.product_num += record.qty_done
 
     @api.onchange('destination_location_id')
     def _check_destination_location_id(self):