From 639ea7256f10697d19c19cc878e999bcb7b1e6a1 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 09 三月 2026 22:53:49 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index bc0c468..12c27a7 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -18,6 +18,7 @@
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
grdAlignment omdelMian = new grdAlignment();
List<grdAlignmentSub> omdelsub = new List<grdAlignmentSub>();
@@ -903,7 +904,8 @@
{ "zh-Hans", "HFieldName"},
{ "zh-Hant", "HFieldName"},
{ "en", "HTranslationText_English"},
- { "es", "HTranslationText_Spain"}
+ { "es", "HTranslationText_Spain"},
+ { "Thai", "HTranslationText_Thai"}
};
/// <summary>
@@ -916,8 +918,23 @@
[HttpGet]
public object SelectMESLanguage_JSON(string language, bool forceUpdate)
{
+
try
{
+ // 鍒ゆ柇鏄惁鍚敤澶氳瑷�閰嶇疆
+ string enableRemote = oSystemParameter.GetSingleSystemParameter("Xt_grdAlignment_WMES_RemoteTransFileCTL", ref DBUtility.ClsPub.sErrInfo);
+ if (enableRemote == "N")
+ {
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Success锛�";
+ objJsonResult.data = null;
+ var objJObj = JObject.FromObject(objJsonResult);
+ objJObj["EnableRemoteI18n"] = enableRemote;
+ return objJObj;
+ }
+
// 鑾峰彇椤圭洰鏍圭洰褰�
string path = HttpContext.Current.Server.MapPath($"~/LanguagePack"); ;
string lang;
@@ -928,7 +945,7 @@
language = "zh-Hans";
lang = "HFieldName";
}
- ds = oCN.RunProcReturn("select * from h_v_Xt_LanModuleList where 1=1", "h_v_Xt_LanModuleList");
+ ds = oCN.RunProcReturn("select * from h_v_Xt_LanModuleList where 1=1 order by HUpdateDate desc", "h_v_Xt_LanModuleList");
// 濡傛灉鐩綍涓嶅瓨鍦ㄥ垯鍒涘缓鐩綍
if (!Directory.Exists(path))
@@ -961,11 +978,17 @@
{
languagePack["_Version"] = 0;
}
+ if (languagePack["_UpdateDate"] == null)
+ {
+ languagePack["_UpdateDate"] = "";
+ }
LogService.Write("璇█鍖呬腑鏁版嵁鏉℃暟: " + languagePack["_Version"].ToString() + "\n鏁版嵁搴撲腑鏁版嵁鏉℃暟: " + ds.Tables[0].Rows.Count.ToString());
- if (languagePack["_Version"].Value<int>() != ds.Tables[0].Rows.Count || forceUpdate == true)
+ if (languagePack["_Version"].Value<int>() != ds.Tables[0].Rows.Count || forceUpdate == true || languagePack["_UpdateDate"].Value<string>() != ds.Tables[0].Rows[0]["HUpdateDate"].ToString())
{
// 鏇存柊鐗堟湰鍙�(鏁版嵁鏉＄洰鏁�)
languagePack["_Version"] = ds.Tables[0].Rows.Count;
+ //鏇存柊瀛楁缈昏瘧鏃ユ湡
+ languagePack["_UpdateDate"] = ds.Tables[0].Rows[0]["HUpdateDate"].ToString();
// 缁熻姣忎釜瀛楃妯″潡涓� 瀛楁鐮佸嚭鐜扮殑娆℃暟 濡傛灉鍑虹幇澶氭锛屽垯鏄犲皠涓篔Array绫诲瀷
Dictionary<string, int> HFieldCodeDict = ds.Tables[0].AsEnumerable()
.GroupBy(row => new
@@ -1035,7 +1058,9 @@
objJsonResult.count = 1;
objJsonResult.Message = "Success锛�";
objJsonResult.data = languagePack;
- return objJsonResult;
+ var objJObj = JObject.FromObject(objJsonResult);
+ objJObj["EnableRemoteI18n"] = enableRemote;
+ return objJObj;
} else
{
// 鐗堟湰鍙蜂竴鑷达紝 鍒欑洿鎺ヨ繑鍥炶鍙栫殑Json瀛楃涓�
@@ -1043,7 +1068,9 @@
objJsonResult.count = 1;
objJsonResult.Message = "Success锛�";
objJsonResult.data = JObject.Parse(JsonStr1);
- return objJsonResult;
+ var objJObj = JObject.FromObject(objJsonResult);
+ objJObj["EnableRemoteI18n"] = enableRemote;
+ return objJObj;
}
}
catch(Exception e)
@@ -1053,7 +1080,9 @@
objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
- return objJsonResult;
+ var objJObj = JObject.FromObject(objJsonResult);
+ objJObj["EnableRemoteI18n"] = "N";
+ return objJObj;
}
}
#endregion
--
Gitblit v1.9.1