diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 6cb177dc..a3e0da75 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1279,7 +1279,7 @@ class ResMrpWorkOrder(models.Model):
                         raise UserError('请先完成该工单的工艺外协再进行操作')
                 # 表面工艺外协，最后一张工单
                 workorders = self.production_id.workorder_ids
-                subcontract_workorders = workorders.filtered(lambda wo: wo.is_subcontract == True).sorted('sequence')
+                subcontract_workorders = workorders.filtered(lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
                 if self == subcontract_workorders[-1]:
                     # 给下一个库存移动就绪
                     self.move_subcontract_workorder_ids[0].move_dest_ids._action_done()
@@ -1303,8 +1303,8 @@ class ResMrpWorkOrder(models.Model):
             is_production_id = False
             rework_workorder = record.production_id.workorder_ids.filtered(lambda p: p.state == 'rework')
             done_workorder = record.production_id.workorder_ids.filtered(lambda p1: p1.state in ['done'])
-            if (len(rework_workorder) + len(done_workorder) == len(record.production_id.workorder_ids)) or (
-                    len(done_workorder) == len(record.production_id.workorder_ids)):
+            if (len(rework_workorder) + len(done_workorder) == len(record.production_id.workorder_ids.filtered(lambda wo: wo.state != 'cancel'))) or (
+                    len(done_workorder) == len(record.production_id.workorder_ids.filtered(lambda wo: wo.state != 'cancel'))):
                 is_production_id = True
             if record.routing_type in ['解除装夹'] or (
                     record.is_rework is True and record.routing_type in ['装夹预调']):
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 745b5974..86a75759 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -637,7 +637,7 @@ class StockPicking(models.Model):
             if move_in:
                 workorder = move_in.subcontract_workorder_id
                 workorders = workorder.production_id.workorder_ids
-                subcontract_workorders = workorders.filtered(lambda wo: wo.is_subcontract == True).sorted('sequence')
+                subcontract_workorders = workorders.filtered(lambda wo: wo.is_subcontract == True and wo.state!='cancel').sorted('sequence')
                 if workorder == subcontract_workorders[-1]:
                     self.env['stock.quant']._update_reserved_quantity(
                         move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,