From 9baffa8a8a5c9fbdda690544132b95db9196cc88 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 16 12月 2024 15:22:08 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
index 445ea10..103ab40 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -334,21 +334,22 @@
leijisaomiaomj += Convert.ToDouble(aa.Info13);
}
}
- if (!string.IsNullOrEmpty(item.Info13))
- {
- leijisaomiaomj += Convert.ToDouble(item.Info13);
- }
+ //涓嶈绠楁湰娆＄殑
+ //if (!string.IsNullOrEmpty(item.Info13))
+ //{
+ // leijisaomiaomj += Convert.ToDouble(item.Info13);
+ //}
data.Add("leijisaomiaomj", leijisaomiaomj);//绱鎵弿闈㈢Н
//鏌ヨ涓� 鍖呮暟鎹�
var mylist = mycontext.mes_batchOrderUPI_new.Where(x => x.PackageCode == item.PackageCode).ToList();
- var gg = mylist.GroupBy(x => x.DetailName);
+ var gg = mylist.GroupBy(x => new { x.DetailName, x.Info16 });
int i = 0;
foreach (var g in gg)
{
i++;
- data.Add("detail_" + i, g.Key ?? "");//閮ㄤ欢鍚嶇О
- data.Add("detail_" + i + "_length", g.ToList().First().Info16 ?? "");//閮ㄤ欢灏哄
+ data.Add("detail_" + i, g.Key.DetailName ?? "");//閮ㄤ欢鍚嶇О
+ data.Add("detail_" + i + "_length", g.Key.Info16 ?? "");//閮ㄤ欢灏哄
data.Add("detail_" + i + "_number", g.ToList().Count());//閮ㄤ欢鏁伴噺
}
for (int p = (i + 1); p <= 6; p++)
--
Gitblit v1.9.3