feat: 交接记录子项需保证工段/车间一致2
This commit is contained in:
parent
143d9cb719
commit
d5ea72a021
|
|
@ -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')
|
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)
|
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
|
@property
|
||||||
def count_working(self):
|
def count_working(self):
|
||||||
return Mlogb.objects.filter(wm_in=self, mlog__submit_time__isnull=True).aggregate(count=Sum('count_use'))['count'] or 0
|
return Mlogb.objects.filter(wm_in=self, mlog__submit_time__isnull=True).aggregate(count=Sum('count_use'))['count'] or 0
|
||||||
|
|
@ -655,10 +659,6 @@ class Handover(CommonADModel):
|
||||||
def handoverb(self):
|
def handoverb(self):
|
||||||
return Handoverb.objects.filter(handover=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):
|
class Handoverb(BaseModel):
|
||||||
"""TN: 子级交接记录
|
"""TN: 子级交接记录
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue