From 2de09bec5cc05bf875543fa8956167ca7db73021 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期三, 25 六月 2025 11:36:44 +0800
Subject: [PATCH] 合并
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/CheckTaskChangeHelper.cs | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/CheckTaskChangeHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/CheckTaskChangeHelper.cs"
index 6b08cf7..1adfa38 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/CheckTaskChangeHelper.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/CheckTaskChangeHelper.cs"
@@ -20,9 +20,14 @@
{
wheelsNewOld = "1";
}
- if ((wxrw.Contains("鍥涚骇淇�") || wxrw.Contains("浜旂骇淇�")) && wxrw.Contains("鎹㈣疆(鏂�)"))
+ if ((wxrw.Contains("鍥涚骇淇�") || wxrw.Contains("浜旂骇淇�")) && (wxrw.Contains("鎹㈣疆(鏂�)") || wxrw.Contains("鎹㈣疆缁勬垚(鏂�)")))
{
wheelsNewOld = "0";
+ }
+
+ if ((wxrw.Contains("鍥涚骇淇�") || wxrw.Contains("浜旂骇淇�")) && (wxrw.Contains("鎹㈣疆(鏃�)") || wxrw.Contains("鎹㈣疆缁勬垚(鏃�)")))
+ {
+ wheelsNewOld = "1";
}
if (wxrw.Contains("涓夌骇淇�") && (wxrw.Contains("鎹㈣疆(鏂�)") || wxrw.Contains("鎹㈣疆缁勬垚(鏂�)")))
wheelsNewOld = "0";
@@ -30,5 +35,50 @@
wheelsNewOld = "1";
return wheelsNewOld;
}
+
+ /// <summary>
+ /// 缁翠慨浠诲姟杞崲鍑哄睘鎬�
+ /// </summary>
+ /// <param name="wxrw">缁翠慨浠诲姟</param>
+ /// <returns>閫夐厤杞柊鏃�(0-鏂� 1-鏃�)</returns>
+ public static string CheckTaskwheelsProps(string wxrw)
+ {
+ string wheelsNewOld = string.Empty;
+ if (wxrw.Contains("鎹㈣疆鐩�(鏃�)"))
+ {
+ wheelsNewOld = "鏂拌疆鏃х洏";
+ }else if (wxrw.Contains("鎹㈣疆缁勬垚(鏂�)"))
+ {
+ wheelsNewOld = "鏂拌疆鏂扮洏";
+ }
+ else
+ {
+ wheelsNewOld = "鏃ц疆鏃х洏";
+ }
+ return wheelsNewOld;
+ }
+
+ /// <summary>
+ /// 閫夊埗鍔ㄧ洏杞崲
+ /// </summary>
+ /// <param name="wxrw">閫夊埗鍔ㄧ洏杞崲</param>
+ /// <returns></returns>
+ public static string CheckZdpPost(string Posttype)
+ {
+ string PostContainer = string.Empty;
+ if (Posttype=="宸︿晶")
+ {
+ PostContainer = "left";
+ }
+ else if (Posttype == "鍙充晶")
+ {
+ PostContainer = "right";
+ }
+ else
+ {
+ PostContainer = "middle";
+ }
+ return PostContainer;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3