From 0a9114107f0ff064a9ab93d8011b9fe8b57ac7b8 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周四, 28 11月 2024 10:53:39 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
index 2ac9750..528d7b8 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -325,8 +325,14 @@
data.Add("Info13", item.Info13 ?? "");//褰撳墠鍖呴潰绉�
data.Add("printTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
- //mycontext.mes
- data.Add("leijisaomiaomj", item.Info13 ?? "");//绱鎵弿闈㈢Н
+ var finsiList = mycontext.mes_package_gather.Where(x => x.Info5 == item.Info5 && x.UpiStatus >= (int)UpiStatusEnum.宸插悎鍖�);
+ double leijisaomiaomj = 0;
+ foreach (var aa in finsiList)
+ {
+ leijisaomiaomj += Convert.ToDouble(aa.Info13);
+ }
+ leijisaomiaomj += Convert.ToDouble(item.Info13);
+ data.Add("leijisaomiaomj", leijisaomiaomj);//绱鎵弿闈㈢Н
//鏌ヨ涓� 鍖呮暟鎹�
var mylist = mycontext.mes_batchOrderUPI_new.Where(x => x.PackageCode == item.PackageCode).ToList();
--
Gitblit v1.9.3