diff --git a/apps/wpm/models.py b/apps/wpm/models.py index cbaf639d..52f21f3c 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -127,6 +127,10 @@ class WMaterial(CommonBDModel): material_ofrom = models.ForeignKey(Material, verbose_name='原料物料', on_delete=models.SET_NULL, null=True, blank=True, related_name='wm_mofrom') number_from = models.TextField("来源于个号", null=True, blank=True) + @property + def belong_dept_or_mgroup_id(self): + return self.mgroup.id if self.mgroup else self.belong_dept.id + @property def count_working(self): return Mlogb.objects.filter(wm_in=self, mlog__submit_time__isnull=True).aggregate(count=Sum('count_use'))['count'] or 0 @@ -654,10 +658,6 @@ class Handover(CommonADModel): @property def handoverb(self): return Handoverb.objects.filter(handover=self) - - @property - def belong_dept_or_mgroup_id(self): - return self.mgroup.id if self.mgroup else self.belong_dept.id class Handoverb(BaseModel): """TN: 子级交接记录