From ecb386a4201213c6635f28f9e9e02e3faf217b51 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期六, 16 三月 2024 11:08:34 +0800
Subject: [PATCH] 修改储位图例柱状图以及圆形图显示数据问题。

---
 Wms/WMS.BLL/BllSoServer/ExportAllotServer.cs |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Wms/WMS.BLL/BllSoServer/ExportAllotServer.cs b/Wms/WMS.BLL/BllSoServer/ExportAllotServer.cs
index be1897b..4c3dc4e 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportAllotServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportAllotServer.cs
@@ -75,6 +75,8 @@
                         LogisticsName = b.CarrierName,
                         IsAdvance = a.IsAdvance,
                         OutMode = a.OutMode,
+                        LoadingAddre=a.LoadingAddre,
+                        UnstackingMode=a.UnstackingMode,
 
                         CreateUserName = c.RealName,
                         UpdateUserName = d.RealName,
@@ -130,16 +132,17 @@
                 {
                     throw new Exception("鏈煡璇㈠埌瑕佸垎閰嶇殑搴撳瓨鎬婚噺淇℃伅");
                 }
-                //楠岃瘉浠诲姟淇℃伅鏄惁瀛樺湪
-                if (task == null)
+
+                // 鑻ヤ换鍔″凡涓嬪彂锛屽垽鏂换鍔$姸鎬�
+                if (task != null)
                 {
-                    throw new Exception("鏈煡璇㈠埌褰撳墠鎵樼洏浠诲姟淇℃伅");
+                    //楠岃瘉浠诲姟鐘舵�佹槸鍚︿负姝e湪鎵ц
+                    if (task.Status == "0" || task.Status == "1" || task.Status == "2")
+                    {
+                        throw new Exception("褰撳墠浠诲姟绛夊緟鎵ц鎴栨鍦ㄦ墽琛岋紝璇峰彇娑堝悗鍒犻櫎");
+                    }
                 }
-                //楠岃瘉浠诲姟鐘舵�佹槸鍚︿负姝e湪鎵ц
-                if (task.Status == "0" || task.Status == "1" || task.Status == "2")
-                {
-                    throw new Exception("褰撳墠浠诲姟绛夊緟鎵ц鎴栨鍦ㄦ墽琛岋紝璇峰彇娑堝悗鍒犻櫎");
-                }
+
                 Db.BeginTran();
                 var time = DateTime.Now;
                 //淇敼浠诲姟淇℃伅

--
Gitblit v1.8.0