From 76cdd08e9a29e8795c702aa35ab851ff2669d0c6 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 27 Jun 2025 15:09:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20wpr=20change=5For=5Fnew=E6=97=B6?= =?UTF-8?q?=E6=A0=B9=E6=8D=AEnumber=E8=8E=B7=E5=8F=96=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpmw/models.py | 3 ++- apps/wpmw/views.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/wpmw/models.py b/apps/wpmw/models.py index 77a8c3d8..01d64dab 100644 --- a/apps/wpmw/models.py +++ b/apps/wpmw/models.py @@ -28,6 +28,7 @@ class Wpr(BaseModel): wm = models.ForeignKey("wpm.wmaterial", verbose_name="车间物料", on_delete=models.CASCADE, null=True, 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) + data = models.JSONField(verbose_name="数据", default=dict, blank=True) @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): @@ -43,7 +44,7 @@ class Wpr(BaseModel): wpr.delete() return elif number: - ins_x = cls.objects.filter(number=number).order_by("-version").first() + ins_x = cls.objects.filter(number=number).order_by("-update_time").first() if ins_x: if ins_x.wm is None and ins_x.mb is None: if ins_x.version > 1: # 说明被复用了 diff --git a/apps/wpmw/views.py b/apps/wpmw/views.py index 217a8b4f..7c7a15f9 100644 --- a/apps/wpmw/views.py +++ b/apps/wpmw/views.py @@ -29,7 +29,7 @@ class WprViewSet(CustomListModelMixin, RetrieveModelMixin, CustomGenericViewSet) } ordering = ["number", "create_time"] ordering_fields = ["number", "create_time", "update_time"] - search_fields = ["number", "material__name", "material__model", "material__specification"] + search_fields = ["number", "material__name", "material__model", "material__specification", "number_out"] def filter_queryset(self, queryset): qs = super().filter_queryset(queryset)