From 00fda34dd9bbe207583d7fac19b306ae32db18f0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 31 3月 2025 11:00:32 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
index f95c236..d4bb416 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -312,45 +312,47 @@
Dictionary<string, object> data = new Dictionary<string, object>();
if (printClassifyEnum == PrintClassifyEnum.鍖呰鏉＄爜)
{
- data.Add("Info4", item.Info4 ?? "");//鍚堝悓鍗曞彿
+ //data.Add("Info4", item.Info4 ?? "");//鍚堝悓鍗曞彿
data.Add("Info5", item.Info5 ?? "");//鐢熶骇鍗曞彿
data.Add("Info6", "绗�" + (item.Info6 ?? "") + "鍖�");//绗嚑鍖�
- data.Add("bar", item.PackageCode);//浜岀淮鐮侊紙鍖呭彿锛�
+ data.Add("bar", item.PackageCode ?? "");//浜岀淮鐮侊紙鍖呭彿锛�
data.Add("Info7", item.Info7 ?? "");//缁忛攢搴�
data.Add("Info8", item.Info8 ?? "");//浜у搧
data.Add("Info9", item.PackageCode ?? "");//鍖呰缂栫爜
data.Add("Info10", item.Info10 ?? "");//瀹㈡埛鍚嶇О
data.Add("Info11", item.Info11 ?? "");//鑷彁or鍙戣揣
- data.Add("Info12", "鍖呰鏄庣粏 閮ㄤ欢鎬绘暟" + item.Info12 ?? "");//閮ㄤ欢鏄庣粏
- data.Add("Info13", item.Info13 ?? "");//褰撳墠鍖呴潰绉�
+ data.Add("Info12", "鍖呰鏄庣粏 [鏉夸欢鎬绘暟" + (item.Info12 ?? "") + "]");//閮ㄤ欢鏄庣粏
+ //data.Add("Info13", item.Info13 ?? "");//褰撳墠鍖呴潰绉�
data.Add("printTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
- var finsiList = mycontext.mes_package_gather.Where(x => x.Info5 == item.Info5 && x.UpiStatus >= (int)UpiStatusEnum.宸插悎鍖�).ToList();
- double leijisaomiaomj = 0;
- foreach (var aa in finsiList)
- {
- if (!string.IsNullOrEmpty(aa.Info13))
- {
- leijisaomiaomj += Convert.ToDouble(aa.Info13);
- }
- }
- if (!string.IsNullOrEmpty(item.Info13))
- {
- leijisaomiaomj += Convert.ToDouble(item.Info13);
- }
- data.Add("leijisaomiaomj", leijisaomiaomj);//绱鎵弿闈㈢Н
+ //var finsiList = mycontext.mes_package_gather.Where(x => x.Info5 == item.Info5 && x.UpiStatus >= (int)UpiStatusEnum.宸插悎鍖�).ToList();
+ //double leijisaomiaomj = 0;
+ //foreach (var aa in finsiList)
+ //{
+ // if (!string.IsNullOrEmpty(aa.Info13))
+ // {
+ // leijisaomiaomj += Convert.ToDouble(aa.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++)
{
data.Add("detail_" + p, "");//閮ㄤ欢鍚嶇О
--
Gitblit v1.9.3