From ffd7bc13b0cf05e9027a04d1a53c540bf20d0857 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 4 Dec 2024 11:00:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20get=5Falldata=5Fwith=5Fbatch=20?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=A3=80=E9=AA=8C=E5=A4=87=E6=B3=A8=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wpm/services_2.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/apps/wpm/services_2.py b/apps/wpm/services_2.py
index e3ad071c..68d0650c 100644
--- a/apps/wpm/services_2.py
+++ b/apps/wpm/services_2.py
@@ -68,9 +68,12 @@ def get_alldata_with_batch(batch: str):
     mlogs_glcx_qs = Mlog.objects.filter(submit_time__isnull=False, mgroup=mgroup_glcx, batch=batch)
     if mlogs_glcx_qs.exists():
         data["产品规格"] = []
+        data["管料成型_备注"] = ""
         for item in mlogs_glcx_qs:
             last_time = item.update_time if item.update_time > last_time else last_time
             data["产品规格"].append(item.material_out)  # 对象
+            if item.note:
+                data["管料成型_备注"] = ";".join([data["管料成型_备注"], item.note])
             for field in mlog_count_fields:
                 if getattr(item, field) > 0 or field in ["count_real", "count_ok"]:
                     if f'管料成型_{field}' not in data:
@@ -88,9 +91,12 @@ def get_alldata_with_batch(batch: str):
         data["七车间入库_日期"] = []
         data["七车间入库_车间执行人"] = []
         data["七车间入库_仓库执行人"] = []
+        data["七车间入库_检验备注"] = ""
         for item in mioitem_qs:
             last_time = item.update_time if item.update_time > last_time else last_time
             data["七车间入库_日期"].append(item.mio.inout_date)
+            if item.test_note:
+                data["七车间入库_检验备注"] = ";".join([data["七车间入库_检验备注"], item.note])
             if item.mio.mio_user:
                 data["七车间入库_车间执行人"].append(item.mio.mio_user)
             if item.mio.do_user:
@@ -116,7 +122,10 @@ def get_alldata_with_batch(batch: str):
         data["十车间入库_抽检人"] = []
         data["十车间入库_仓库执行人"] = []
         data["十车间入库_日期"] = []
+        data["十车间入库_检验备注"] = ""
         for item in mioitem10_qs:
+            if item.test_note:
+                data["十车间入库_检验备注"] = ";".join([data["十车间入库_检验备注"], item.note])
             if item.mio.do_user:
                 data["十车间入库_仓库执行人"].append(item.mio.do_user)
             if item.test_user:
@@ -145,7 +154,10 @@ def get_alldata_with_batch(batch: str):
     if mlogs_glth_qs.exists():
         data["管料退火_日期"] = []
         data["管料退火_操作人"] = []
+        data["管料退火_备注"] = ""
         for item in mlogs_glth_qs:
+            if item.note: 
+                data["管料退火_备注"] = ";".join([data["管料退火_备注"], item.note])
             if item.handle_date:
                 data["管料退火_日期"].append(item.handle_date)
             if item.handle_user:
@@ -199,7 +211,10 @@ def get_alldata_with_batch(batch: str):
             last_time = item.update_time if item.update_time > last_time else last_time
             data[f'六车间_{mgroup_name}_日期'] = []
             data[f'六车间_{mgroup_name}_操作人'] = []
+            data[f'六车间_{mgroup_name}_备注'] = ""
             for item in mlogs_qs:
+                if item.note:
+                    data[f'六车间_{mgroup_name}_备注'] = ";".join([data[f'六车间_{mgroup_name}_备注'], item.note])
                 if item.handle_date:
                     data[f'六车间_{mgroup_name}_日期'].append(item.handle_date)
                 if item.handle_user: