From c00d4c5cda3af8e63a5969c58b9151b858e9105e Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 26 11月 2024 17:41:56 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
index 581055e..90a1fcb 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -311,12 +311,36 @@
Dictionary<string, object> data = new Dictionary<string, object>();
if (printClassifyEnum == PrintClassifyEnum.鍖呰鏉＄爜)
{
- //data.Add("bar", item.SNCode);
- //data.Add("material", item.MaterialCode ?? "" + "/" + item.MaterialName ?? "");
- //data.Add("supplier", item.SupplierName ?? "");
- //data.Add("unit", item.MaterialUnit ?? "");
- //data.Add("qty", item.Quantity);
- //data.Add("date", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ data.Add("Info4", item.Info4);//鍚堝悓鍗曞彿
+ data.Add("Info5", item.Info5 ?? "");//鐢熶骇鍗曞彿
+ data.Add("Info6", "绗�" + (item.Info6 ?? "") + "鍖�");//绗嚑鍖�
+ 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("printTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+
+ //鏌ヨ涓� 鍖呮暟鎹�
+ var mylist = mycontext.mes_batchOrderUPI_new.Where(x => x.PackageCode == item.PackageCode).ToList();
+ var gg = mylist.GroupBy(x => x.DetailName);
+ 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 + "_number", g.ToList().Count());//閮ㄤ欢鏁伴噺
+ }
+ for (int p = (i + 1); p <= 6; p++)
+ {
+ data.Add("detail_" + p, "");//閮ㄤ欢鍚嶇О
+ data.Add("detail_" + p + "_length", "");//閮ㄤ欢灏哄
+ data.Add("detail_" + p + "_number", "");//閮ㄤ欢鏁伴噺
+ }
}
else
{
--
Gitblit v1.9.3