From aa00074986140e57be1f56272311e84abd8566ac Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周六, 30 11月 2024 17:04:28 +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 | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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..bd0ea2f 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;
@@ -324,6 +325,21 @@
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.宸插悎鍖�);
+ 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);
--
Gitblit v1.9.3