From 037008d7c992e14a309e8b97a4bb0cce12c465ca Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 24 Jun 2025 13:52:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=89=E5=AD=90get=5Falldata=5Fwith?=
 =?UTF-8?q?=5Fbatch=20=E4=BA=BA=E5=91=98=E8=8E=B7=E5=8F=96=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wpm/services_2.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/wpm/services_2.py b/apps/wpm/services_2.py
index 534215a2..e197733c 100644
--- a/apps/wpm/services_2.py
+++ b/apps/wpm/services_2.py
@@ -150,9 +150,9 @@ def get_alldata_with_batch(batch: str):
             data["七车间入库_日期"].append(item.mio.inout_date)
             if item.test_note:
                 data["七车间入库_检验备注"] = ";".join([data["七车间入库_检验备注"], item.test_note])
-            if item.mio.mio_user:
-                data["七车间入库_车间执行人"].append(item.mio.do_user)
             if item.mio.do_user:
+                data["七车间入库_车间执行人"].append(item.mio.do_user)
+            if item.mio.mio_user:
                 data["七车间入库_仓库执行人"].append(item.mio.mio_user)
             for field in mioitem_count_fields:
                 f_v = getattr(item, field)
@@ -167,8 +167,6 @@ def get_alldata_with_batch(batch: str):
         data["七车间入库_车间执行人"] = list(set(data["七车间入库_车间执行人"]))
         data["七车间入库_车间执行人"] = ";".join([item.name for item in data["七车间入库_车间执行人"]])
         data["七车间入库_仓库执行人"] = list(set(data["七车间入库_仓库执行人"]))
-        if None in data["七车间入库_仓库执行人"]:
-            data["七车间入库_仓库执行人"].remove(None)
         data["七车间入库_仓库执行人"] = ";".join([item.name for item in data["七车间入库_仓库执行人"]])
 
     # 十车间入库检验
@@ -216,7 +214,7 @@ def get_alldata_with_batch(batch: str):
             if material_start is None:
                 material_start = item.material
             data["其他入库_日期"].append(item.mio.inout_date)
-            if item.mio.do_user:
+            if item.mio.mio_user:
                 data["其他入库_仓库执行人"].append(item.mio.mio_user)
             for field in mioitem_count_fields:
                 if getattr(item, field) is not None and (getattr(item, field) > 0 or field in ["count", "count_notok", "count_sampling"]):
@@ -275,9 +273,9 @@ def get_alldata_with_batch(batch: str):
             if material_start is None:
                 material_start = item.material
             data["六车间领料_日期"].append(item.mio.inout_date)
-            if item.mio.do_user:
-                data["六车间领料_仓库执行人"].append(item.mio.mio_user)
             if item.mio.mio_user:
+                data["六车间领料_仓库执行人"].append(item.mio.mio_user)
+            if item.mio.do_user:
                 data["六车间领料_车间执行人"].append(item.mio.do_user)
             for field in mioitem_count_fields:
                 if getattr(item, field) is not None and getattr(item, field) > 0:
@@ -461,7 +459,7 @@ def get_alldata_with_batch(batch: str):
                 material_start = item.material
             if item.mio.inout_date:
                 data["销售发货_日期"].append(item.mio.inout_date)
-            if item.mio.do_user:
+            if item.mio.mio_user:
                 data['销售发货_仓库执行人'].append(item.mio.mio_user)
             data['销售发货_count']+= item.count
         if getattr(data, "棒料成型_count_real", 0) > 0: