fix: pre_info可为空
This commit is contained in:
parent
8de4d1197b
commit
95605be52f
|
|
@ -614,7 +614,6 @@ class Mlogbw(BaseModel):
|
||||||
mlogbw_from = models.ForeignKey("self", verbose_name='来源个', on_delete=models.CASCADE, null=True, blank=True, related_name="w_mlogbw_from")
|
mlogbw_from = models.ForeignKey("self", verbose_name='来源个', on_delete=models.CASCADE, null=True, blank=True, related_name="w_mlogbw_from")
|
||||||
wpr = models.ForeignKey("wpmw.wpr", verbose_name='关联产品', on_delete=models.SET_NULL
|
wpr = models.ForeignKey("wpmw.wpr", verbose_name='关联产品', on_delete=models.SET_NULL
|
||||||
, related_name='wpr_mlogbw', null=True, blank=True)
|
, related_name='wpr_mlogbw', null=True, blank=True)
|
||||||
pre_info = models.JSONField('预处理信息', default=dict, blank=True)
|
|
||||||
equip = models.ForeignKey(Equipment, verbose_name='设备', on_delete=models.SET_NULL, null=True, blank=True, related_name='mlogbw_equip')
|
equip = models.ForeignKey(Equipment, verbose_name='设备', on_delete=models.SET_NULL, null=True, blank=True, related_name='mlogbw_equip')
|
||||||
tooling = models.ForeignKey(Equipment, verbose_name='工装', on_delete=models.SET_NULL, null=True, blank=True, related_name='mlogbw_tooling')
|
tooling = models.ForeignKey(Equipment, verbose_name='工装', on_delete=models.SET_NULL, null=True, blank=True, related_name='mlogbw_tooling')
|
||||||
work_start_time = models.DateTimeField('开始加工时间', null=True, blank=True)
|
work_start_time = models.DateTimeField('开始加工时间', null=True, blank=True)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
# Generated by Django 4.2.27 on 2026-05-28 03:20
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('wpmw', '0010_wpr_pre_info'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='wpr',
|
||||||
|
name='pre_info',
|
||||||
|
field=models.JSONField(blank=True, default=dict, null=True, verbose_name='预处理信息'),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -30,7 +30,7 @@ class Wpr(BaseModel):
|
||||||
oinfo = models.JSONField(verbose_name="其他信息", default=dict, blank=True)
|
oinfo = models.JSONField(verbose_name="其他信息", default=dict, blank=True)
|
||||||
wpr_from = models.ForeignKey("self", verbose_name="来源于", on_delete=models.CASCADE, null=True, blank=True)
|
wpr_from = models.ForeignKey("self", verbose_name="来源于", on_delete=models.CASCADE, null=True, blank=True)
|
||||||
data = models.JSONField(verbose_name="数据", default=dict, blank=True)
|
data = models.JSONField(verbose_name="数据", default=dict, blank=True)
|
||||||
pre_info = models.JSONField(verbose_name="预处理信息", default=dict, blank=True)
|
pre_info = models.JSONField(verbose_name="预处理信息", default=dict, blank=True, null=True)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def change_or_new(cls, wpr=None, number=None, mb=None, wm=None, old_mb=None, old_wm=None, ftest=None, wpr_from=None, add_version=True, number_out=None):
|
def change_or_new(cls, wpr=None, number=None, mb=None, wm=None, old_mb=None, old_wm=None, ftest=None, wpr_from=None, add_version=True, number_out=None):
|
||||||
|
|
|
||||||
|
|
@ -157,7 +157,7 @@ class WprViewSet(BulkUpdateModelMixin, CustomListModelMixin, CustomRetrieveModel
|
||||||
sr.is_valid(raise_exception=True)
|
sr.is_valid(raise_exception=True)
|
||||||
raw_info = sr.validated_data
|
raw_info = sr.validated_data
|
||||||
from apps.utils.tools import update_dict
|
from apps.utils.tools import update_dict
|
||||||
wpr.pre_info = update_dict(wpr.pre_info, raw_info)
|
wpr.pre_info = update_dict(wpr.pre_info or {}, raw_info)
|
||||||
wpr.save(update_fields=["pre_info"])
|
wpr.save(update_fields=["pre_info"])
|
||||||
return Response({"pre_info": wpr.pre_info})
|
return Response({"pre_info": wpr.pre_info})
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue