From 3a9b5dcd5dd6ed033f80f1696b07135635b3e9f8 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期三, 17 七月 2024 15:35:07 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
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("鏈煡璇㈠埌褰撳墠鎵樼洏浠诲姟淇℃伅");
+ //楠岃瘉浠诲姟鐘舵�佹槸鍚︿负姝ｅ湪鎵ц
+ if (task.Status == "0" || task.Status == "1" || task.Status == "2")
+ {
+ throw new Exception("褰撳墠浠诲姟绛夊緟鎵ц鎴栨鍦ㄦ墽琛岋紝璇峰彇娑堝悗鍒犻櫎");
+ }
}
- //楠岃瘉浠诲姟鐘舵�佹槸鍚︿负姝ｅ湪鎵ц
- if (task.Status == "0" || task.Status == "1" || task.Status == "2")
- {
- throw new Exception("褰撳墠浠诲姟绛夊緟鎵ц鎴栨鍦ㄦ墽琛岋紝璇峰彇娑堝悗鍒犻櫎");
- }
+
Db.BeginTran();
var time = DateTime.Now;
//淇敼浠诲姟淇℃伅
--
Gitblit v1.8.0