信号加载
This commit is contained in:
parent
f3b54b219c
commit
0eec676228
|
@ -4,4 +4,8 @@ class WpmConfig(AppConfig):
|
||||||
name = 'apps.wpm'
|
name = 'apps.wpm'
|
||||||
verbose_name = '车间生产'
|
verbose_name = '车间生产'
|
||||||
|
|
||||||
|
def ready(self):
|
||||||
|
# 加载信号
|
||||||
|
import apps.wpm.signals
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -94,7 +94,6 @@ class WprouctTicket(CommonAModel):
|
||||||
material = models.ForeignKey(Material, verbose_name='所在物料状态', on_delete=models.CASCADE)
|
material = models.ForeignKey(Material, verbose_name='所在物料状态', on_delete=models.CASCADE)
|
||||||
step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE)
|
step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE)
|
||||||
subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='所在子生产计划', on_delete=models.CASCADE)
|
subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='所在子生产计划', on_delete=models.CASCADE)
|
||||||
test_record = models.ForeignKey('qm.testrecord', verbose_name='关联检验记录', on_delete=models.CASCADE, null=True, blank=True)
|
|
||||||
|
|
||||||
ticket = models.ForeignKey('wf.ticket', verbose_name='关联工单', on_delete=models.CASCADE, related_name='wt_ticket')
|
ticket = models.ForeignKey('wf.ticket', verbose_name='关联工单', on_delete=models.CASCADE, related_name='wt_ticket')
|
||||||
decision = models.CharField('最终决定', null=True, blank=True, max_length=100)
|
decision = models.CharField('最终决定', null=True, blank=True, max_length=100)
|
||||||
|
|
|
@ -22,7 +22,8 @@ def handleTicket(sender, instance, created, **kwargs):
|
||||||
obj.step = wproduct.step
|
obj.step = wproduct.step
|
||||||
obj.subproduction_plan = wproduct.subproduction_plan
|
obj.subproduction_plan = wproduct.subproduction_plan
|
||||||
obj.ticket = instance
|
obj.ticket = instance
|
||||||
obj.test_record = TestRecord.objects.filter(wproduct=wproduct, is_deleted=False, is_testok=False).order_by('-id').first()
|
|
||||||
|
test_record = TestRecord.objects.filter(wproduct=wproduct, is_deleted=False, is_testok=False).order_by('-id').first()
|
||||||
obj.save()
|
obj.save()
|
||||||
|
|
||||||
# 工单绑定半成品
|
# 工单绑定半成品
|
||||||
|
@ -31,7 +32,7 @@ def handleTicket(sender, instance, created, **kwargs):
|
||||||
|
|
||||||
# 检验员
|
# 检验员
|
||||||
if not ticket_data.get('tester', None):
|
if not ticket_data.get('tester', None):
|
||||||
ticket_data['tester'] = obj.test_record.create_by.id
|
ticket_data['tester'] = test_record.create_by.id
|
||||||
instance.ticket_data = ticket_data
|
instance.ticket_data = ticket_data
|
||||||
instance.save()
|
instance.save()
|
||||||
|
|
||||||
|
|
|
@ -384,7 +384,7 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
|
||||||
ret['exist_data'] = exist_data
|
ret['exist_data'] = exist_data
|
||||||
return Response(ret)
|
return Response(ret)
|
||||||
else:
|
else:
|
||||||
raise exceptions.APIException('未找到对应工作流程')
|
raise exceptions.APIException('未找到对应审批流程')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue