From 461ef6c5aac44da10ca579cd7d14ae6686f4a4b5 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 11 12月 2024 17:58:45 +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 |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
index 445ea10..c005c3e 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -334,10 +334,11 @@
                                 leijisaomiaomj += Convert.ToDouble(aa.Info13);
                             }
                         }
-                        if (!string.IsNullOrEmpty(item.Info13))
-                        {
-                            leijisaomiaomj += Convert.ToDouble(item.Info13);
-                        }
+                        //涓嶈绠楁湰娆$殑
+                        //if (!string.IsNullOrEmpty(item.Info13))
+                        //{
+                        //    leijisaomiaomj += Convert.ToDouble(item.Info13);
+                        //}
                         data.Add("leijisaomiaomj", leijisaomiaomj);//绱鎵弿闈㈢Н
 
                         //鏌ヨ涓� 鍖呮暟鎹�

--
Gitblit v1.9.3