From 840d53d52bfdc89ea2ab208f6428e86ba4d43b4f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 15 12月 2024 18:02:17 +0800
Subject: [PATCH] 修复分组错误
---
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
index 90a1fcb..103ab40 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -7,6 +7,7 @@
using iWareSql;
using iWareSql.DataAccess;
using iWareSql.MyDbContext;
+using iWareSql.WmsDBModel;
using System;
using System.Collections.Generic;
using System.Data;
@@ -311,10 +312,10 @@
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 ?? "");//鍖呰缂栫爜
@@ -324,15 +325,31 @@
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 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