From d5ea72a021231f88aa50afb8a2c2211605cf58f3 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 12 Jan 2026 15:44:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BA=A4=E6=8E=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=AD=90=E9=A1=B9=E9=9C=80=E4=BF=9D=E8=AF=81=E5=B7=A5=E6=AE=B5?= =?UTF-8?q?/=E8=BD=A6=E9=97=B4=E4=B8=80=E8=87=B42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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: 子级交接记录