diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 9e3dde4c..dd7dbd3c 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1176,7 +1176,9 @@ class WorkPieceDelivery(models.Model): item.feeder_station_start_id.name, item.feeder_station_start_id.state)) logging.info('工件配送-终点状态:%s-%s' % ( item.feeder_station_destination_id.name, item.feeder_station_destination_id.state)) - if item.feeder_station_start_id.state == '占用' and item.feeder_station_destination_id.state == '空闲': + if ( + item.feeder_station_start_id.state == '占用' and item.feeder_station_destination_id.state == '空闲') or ( + item.feeder_station_start_id.state == '空闲' and item.feeder_station_destination_id.state == '空闲'): is_free = True logging.info('is_free:%s' % is_free) return is_free