From 8b7a87abb647e36a3bbe6dcb3b864baa11ddf010 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 10 Sep 2025 13:11:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=92=8C=E4=BA=A4=E6=8E=A5=E8=AE=B0=E5=BD=95=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=A4=84=E7=90=86=E6=97=B6=E9=83=BD=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=8D=95=E4=B8=AA=E7=9A=84=E5=BC=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/inm/services.py | 6 ++---- apps/wpm/services.py | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/apps/inm/services.py b/apps/inm/services.py index fa30767f..b94e904f 100644 --- a/apps/inm/services.py +++ b/apps/inm/services.py @@ -117,8 +117,7 @@ def do_out(item: MIOItem): mioitemws = MIOItemw.objects.filter(mioitem=item) if mioitemws.count() != item.count: raise ParseError("出入库与明细数量不一致,操作失败") - wprIds = [i["wpr"].id for i in mioitemws] - mb_ids = list(Wpr.objects.filter(id__in=wprIds).values_list("mb__id", flat=True).distinct()) + mb_ids = list(Wpr.objects.filter(wpr_mioitemw__in=mioitemws).values_list("mb__id", flat=True).distinct()) if len(mb_ids) == 1 and mb_ids[0] == mb.id: pass else: @@ -235,8 +234,7 @@ def do_in(item: MIOItem): mioitemws = MIOItemw.objects.filter(mioitem=item) if mioitemws.count() != item.count: raise ParseError("出入库与明细数量不一致,操作失败") - wprIds = [i["wpr"].id for i in mioitemws] - wm_ids = list(Wpr.objects.filter(id__in=wprIds).values_list("wm__id", flat=True).distinct()) + wm_ids = list(Wpr.objects.filter(wpr_mioitemw__in=mioitemws).values_list("wm__id", flat=True).distinct()) if len(wm_ids) == 1 and wm_ids[0] == wm.id: pass else: diff --git a/apps/wpm/services.py b/apps/wpm/services.py index bfda3756..8dd1b259 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -926,8 +926,7 @@ def handover_submit(handover:Handover, user: User, now: Union[datetime.datetime, handoverbws = Handoverbw.objects.filter(handoverb=handover_or_b) if handoverbws.count() != xcount: raise ParseError("交接与明细数量不一致,操作失败") - wprIds = [i["wpr"].id for i in handoverbws] - wm_ids = list(Wpr.objects.filter(id__in=wprIds).values_list("wm_id", flat=True).distinct()) + wm_ids = list(Wpr.objects.filter(wpr_handoverbw__in=handoverbws).values_list("wm_id", flat=True).distinct()) if len(wm_ids) == 1 and wm_ids[0] == wm_from.id: pass else: