DAL/bin/Release/DAL.dllBinary files differ
DAL/bin/Release/DAL.pdbBinary files differ
Model/obj/Release/Model.csproj.AssemblyReference.cacheBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cacheBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -31,3 +31,4 @@ C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache SyntacticSugar/obj/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdbBinary files differ
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -4,7 +4,9 @@ using System; using System.Collections.Generic; using System.Data; using System.IO; using System.Linq; using System.Text; using System.Web; using System.Web.Http; using WebAPI.Models; @@ -894,5 +896,151 @@ } } #endregion #region 单据翻译 映射 JSON文件 internal Dictionary<string, string> LanguageDictionary = new Dictionary<string, string> { { "zh-Hans", "HFieldName"}, { "zh-Hant", "HFieldName"}, { "en", "HTranslationText_English"}, { "es", "HTranslationText_Spain"} }; /// <summary> /// /// </summary> /// <param name="language">语言</param> /// <param name="forceUpdate">是否强制更新</param> /// <returns></returns> [Route("Xt_grdAlignment_WMES/SelectMESLanguage_JSON")] [HttpGet] public object SelectMESLanguage_JSON(string language, bool forceUpdate) { try { // 获取项目根目录 string path = HttpContext.Current.Server.MapPath($"~/LanguagePack"); ; string lang; bool langSuccess = LanguageDictionary.TryGetValue(language, out lang); if(langSuccess == false) { // 设置默认语言为中文 language = "zh-Hans"; lang = "HFieldName"; } ds = oCN.RunProcReturn("select * from h_v_Xt_LanModuleList where 1=1", "h_v_Xt_LanModuleList"); // 如果目录不存在则创建目录 if (!Directory.Exists(path)) { Directory.CreateDirectory(path); } // 如果语言包不存在则创建新语言包 if(File.Exists($@"{path}\{language}.json") == false) { File.WriteAllText($@"{path}\{language}.json", "{}"); } LogService.Write("语言包地址: " + Path.Combine(path, $"{language}.json")); string JsonStr1 = ""; using (StreamReader sr = new StreamReader(Path.Combine(path, $"{language}.json"), Encoding.UTF8)) { string lines; while ((lines = sr.ReadLine()) != null)//一行一行去读，如果读取这一行赋值lines,并且lines= null证明读取完了 { JsonStr1 += lines; } } JObject languagePack = JObject.Parse(JsonStr1); // 判断版本号 现在MSSQL对应表中 无版本号字段 使用数据条目数替代 if(languagePack["_Version"] == null) { languagePack["_Version"] = 0; } LogService.Write("语言包中数据条数: " + languagePack["_Version"].ToString() + "\n数据库中数据条数: " + ds.Tables[0].Rows.Count.ToString()); if (languagePack["_Version"].Value<int>() != ds.Tables[0].Rows.Count || forceUpdate == true) { // 更新版本号(数据条目数) languagePack["_Version"] = ds.Tables[0].Rows.Count; // 统计每个字符模块中 字段码出现的次数 如果出现多次，则映射为JArray类型 Dictionary<string, int> HFieldCodeDict = ds.Tables[0].AsEnumerable() .GroupBy(row => new { HModuleCode = row.Field<string>("HModuleCode"), HFieldCode = row.Field<string>("HFieldCode") }) .Select(group => new { HModuleCode = group.Key.HModuleCode, HFieldCode = group.Key.HFieldCode, rowNum = group.Count() }).ToDictionary( keySelector: p => $@"{p.HModuleCode}_{p.HFieldCode}", elementSelector: p => p.rowNum ); // 版本号不一致 则读取数据库中的字段，将字段写入到json对象中 foreach (DataRow row in ds.Tables[0].Rows) { // 获取所在模块字符串 string HModuleCode = row["HModuleCode"].ToString(); // 没有模块对象的话，则新建一个模块对象 if(languagePack[HModuleCode] == null) { languagePack[HModuleCode] = new JObject(); } string HFieldCode = row["HFieldCode"].ToString(); int rowNum = 1; HFieldCodeDict.TryGetValue($@"{row["HModuleCode"]}_{row["HFieldCode"]}", out rowNum); // 判断字段码映射中，模块对应的字段码 是否 唯一 if (rowNum == 1) { languagePack[HModuleCode][HFieldCode] = row[lang].ToString(); }else { if(languagePack[HModuleCode][HFieldCode] == null) { languagePack[HModuleCode][HFieldCode] = new JArray(); } var targetJArray = (JArray)languagePack[HModuleCode][HFieldCode]; targetJArray.Add(row[lang].ToString()); } } // 全量写入到json文件中 File.WriteAllText($"{path}/{language}.json", languagePack.ToString(), System.Text.Encoding.UTF8); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Success！"; objJsonResult.data = languagePack.ToString(); return objJsonResult; } else { // 版本号一致， 则直接返回读取的Json字符串 objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Success！"; objJsonResult.data = JsonStr1; return objJsonResult; } } catch(Exception e) { LogService.Write("Exception！" + e.ToString()); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exception！" + e.Message.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
@@ -4,7 +4,7 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <History>True|2025-12-23T03:30:35.3282941Z;True|2025-12-23T11:19:35.4376934+08:00;True|2025-12-23T11:13:22.1061812+08:00;True|2025-12-23T11:12:38.4661298+08:00;True|2025-12-23T11:11:52.9073134+08:00;True|2025-12-23T11:06:34.6733228+08:00;True|2025-12-23T10:58:19.8557838+08:00;True|2025-12-23T10:21:11.8244524+08:00;True|2025-12-23T09:58:55.8195825+08:00;True|2025-12-23T09:37:24.4984716+08:00;True|2025-12-23T09:33:54.6726117+08:00;True|2025-12-23T08:41:43.5845314+08:00;True|2025-12-23T08:37:20.1070190+08:00;False|2025-12-23T08:36:16.3368324+08:00;True|2025-12-22T16:02:06.5410343+08:00;True|2025-12-22T15:43:45.9660702+08:00;True|2025-12-22T15:28:36.1194727+08:00;True|2025-12-22T15:15:46.1540932+08:00;True|2025-12-22T15:14:03.4401553+08:00;True|2025-12-22T13:39:55.5754991+08:00;True|2025-12-22T13:32:39.0919790+08:00;False|2025-12-22T13:31:43.7527463+08:00;True|2025-12-19T15:51:36.9735361+08:00;True|2025-12-19T15:25:54.2767592+08:00;True|2025-12-19T14:41:07.3130752+08:00;True|2025-12-19T14:37:24.0368827+08:00;True|2025-12-19T14:33:43.2528937+08:00;True|2025-12-19T14:22:42.8786085+08:00;False|2025-12-19T14:21:47.3281347+08:00;True|2025-12-18T17:00:25.3978317+08:00;False|2025-12-18T16:59:08.8776140+08:00;True|2025-12-17T15:05:20.4972081+08:00;True|2025-12-17T14:56:40.4723575+08:00;True|2025-12-17T14:42:54.7527692+08:00;True|2025-12-17T14:14:57.6558359+08:00;True|2025-12-17T13:46:50.8083801+08:00;True|2025-12-17T09:27:07.4023648+08:00;False|2025-12-17T09:25:56.6443842+08:00;True|2025-12-16T16:18:59.7366636+08:00;False|2025-12-16T16:18:08.0149952+08:00;True|2025-12-16T10:46:52.7815645+08:00;True|2025-12-16T10:32:25.9340809+08:00;True|2025-12-16T10:23:58.5183174+08:00;False|2025-12-16T10:23:06.1859498+08:00;True|2025-12-15T08:06:12.6833489+08:00;False|2025-12-15T08:05:23.3449223+08:00;True|2025-12-14T21:32:50.6557670+08:00;True|2025-08-13T13:32:18.1126471+08:00;True|2025-08-13T10:05:10.6784109+08:00;True|2025-08-13T09:59:40.2588968+08:00;True|2024-11-11T15:03:29.1473573+08:00;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History> <History>True|2025-12-28T09:57:21.4588736Z;True|2025-12-28T17:41:16.0017959+08:00;True|2025-12-28T17:35:41.8484728+08:00;True|2025-12-28T17:30:45.6431168+08:00;True|2025-12-28T17:25:08.4606489+08:00;True|2025-12-28T17:22:49.8617989+08:00;True|2025-12-28T17:18:54.9699383+08:00;True|2025-12-28T17:17:05.4568948+08:00;True|2025-12-28T17:14:05.4549287+08:00;True|2025-12-28T17:09:23.6179574+08:00;True|2025-12-28T17:06:05.1800482+08:00;True|2025-12-28T16:52:29.9178867+08:00;True|2025-12-28T16:51:49.9932157+08:00;True|2025-12-28T16:45:44.0577012+08:00;True|2025-12-28T16:42:12.0551680+08:00;True|2025-12-28T16:32:28.3767182+08:00;True|2025-12-28T16:21:38.2929432+08:00;True|2025-12-28T16:16:09.2304424+08:00;True|2025-12-28T16:12:30.6062634+08:00;True|2025-12-28T16:07:49.8221394+08:00;True|2025-12-28T16:04:56.1779372+08:00;True|2025-12-28T16:00:55.1805462+08:00;True|2025-12-28T15:56:44.0384817+08:00;True|2025-12-28T15:55:20.6979961+08:00;True|2025-12-28T15:51:22.3663347+08:00;True|2025-12-28T15:49:39.9292090+08:00;True|2025-12-28T15:47:00.8640240+08:00;True|2025-12-28T15:45:37.3051621+08:00;True|2025-12-28T15:44:32.0878287+08:00;True|2025-12-28T15:41:42.3922999+08:00;True|2025-12-28T15:39:34.3073556+08:00;True|2025-12-28T15:32:43.1737252+08:00;True|2025-12-28T15:28:14.9623017+08:00;True|2025-12-28T15:21:35.1991518+08:00;False|2025-12-28T15:20:55.4989005+08:00;True|2025-12-26T15:35:33.8565840+08:00;True|2025-12-26T15:33:36.7426442+08:00;True|2025-12-26T15:15:56.3263425+08:00;True|2025-12-26T15:13:26.3023719+08:00;False|2025-12-26T15:11:30.3712459+08:00;True|2025-12-26T15:02:09.7940367+08:00;True|2025-12-26T14:57:39.6699218+08:00;True|2025-12-26T14:54:21.6899076+08:00;True|2025-12-26T14:53:34.8529476+08:00;True|2025-12-26T14:47:22.7936233+08:00;True|2025-12-26T14:41:29.2307239+08:00;True|2025-12-26T14:40:37.7285093+08:00;True|2025-12-26T14:37:36.1182563+08:00;True|2025-12-26T14:32:05.6490989+08:00;True|2025-12-26T14:28:05.8671419+08:00;True|2025-12-26T14:22:22.4495151+08:00;True|2025-12-26T14:20:50.1366844+08:00;True|2025-12-26T14:18:17.6324582+08:00;True|2025-12-26T14:16:35.2003544+08:00;True|2025-12-26T14:07:25.1452233+08:00;True|2025-12-26T14:04:58.8734325+08:00;True|2025-12-26T13:57:55.1679469+08:00;True|2025-12-26T12:44:02.0347490+08:00;False|2025-12-26T12:42:55.8300897+08:00;True|2025-12-23T14:00:27.0297264+08:00;True|2025-12-23T11:30:35.3282941+08:00;True|2025-12-23T11:19:35.4376934+08:00;True|2025-12-23T11:13:22.1061812+08:00;True|2025-12-23T11:12:38.4661298+08:00;True|2025-12-23T11:11:52.9073134+08:00;True|2025-12-23T11:06:34.6733228+08:00;True|2025-12-23T10:58:19.8557838+08:00;True|2025-12-23T10:21:11.8244524+08:00;True|2025-12-23T09:58:55.8195825+08:00;True|2025-12-23T09:37:24.4984716+08:00;True|2025-12-23T09:33:54.6726117+08:00;True|2025-12-23T08:41:43.5845314+08:00;True|2025-12-23T08:37:20.1070190+08:00;False|2025-12-23T08:36:16.3368324+08:00;True|2025-12-22T16:02:06.5410343+08:00;True|2025-12-22T15:43:45.9660702+08:00;True|2025-12-22T15:28:36.1194727+08:00;True|2025-12-22T15:15:46.1540932+08:00;True|2025-12-22T15:14:03.4401553+08:00;True|2025-12-22T13:39:55.5754991+08:00;True|2025-12-22T13:32:39.0919790+08:00;False|2025-12-22T13:31:43.7527463+08:00;True|2025-12-19T15:51:36.9735361+08:00;True|2025-12-19T15:25:54.2767592+08:00;True|2025-12-19T14:41:07.3130752+08:00;True|2025-12-19T14:37:24.0368827+08:00;True|2025-12-19T14:33:43.2528937+08:00;True|2025-12-19T14:22:42.8786085+08:00;False|2025-12-19T14:21:47.3281347+08:00;True|2025-12-18T17:00:25.3978317+08:00;False|2025-12-18T16:59:08.8776140+08:00;True|2025-12-17T15:05:20.4972081+08:00;True|2025-12-17T14:56:40.4723575+08:00;True|2025-12-17T14:42:54.7527692+08:00;True|2025-12-17T14:14:57.6558359+08:00;True|2025-12-17T13:46:50.8083801+08:00;True|2025-12-17T09:27:07.4023648+08:00;False|2025-12-17T09:25:56.6443842+08:00;True|2025-12-16T16:18:59.7366636+08:00;False|2025-12-16T16:18:08.0149952+08:00;True|2025-12-16T10:46:52.7815645+08:00;True|2025-12-16T10:32:25.9340809+08:00;True|2025-12-16T10:23:58.5183174+08:00;False|2025-12-16T10:23:06.1859498+08:00;True|2025-12-15T08:06:12.6833489+08:00;False|2025-12-15T08:05:23.3449223+08:00;True|2025-12-14T21:32:50.6557670+08:00;True|2025-08-13T13:32:18.1126471+08:00;True|2025-08-13T10:05:10.6784109+08:00;True|2025-08-13T09:59:40.2588968+08:00;True|2024-11-11T15:03:29.1473573+08:00;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History> <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>12/23/2025 08:36:45</publishTime> <publishTime>12/23/2025 13:59:56</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>12/23/2025 08:36:45</publishTime> <publishTime>12/23/2025 13:59:56</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>12/23/2025 08:36:42</publishTime> <publishTime>12/23/2025 13:59:53</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>12/23/2025 08:36:42</publishTime> <publishTime>12/23/2025 13:59:53</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>12/23/2025 08:36:38</publishTime> <publishTime>12/23/2025 13:55:45</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>12/23/2025 08:36:38</publishTime> <publishTime>12/23/2025 13:55:45</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -101,6 +101,9 @@ <File Include="bin/libgrpc_csharp_ext.x64.so"> <publishTime>03/19/2022 07:38:42</publishTime> </File> <File Include="bin/LiteDB.dll"> <publishTime>03/10/2023 01:40:58</publishTime> </File> <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll"> <publishTime>03/19/2015 01:02:50</publishTime> </File> @@ -111,10 +114,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>12/23/2025 08:36:39</publishTime> <publishTime>12/23/2025 13:55:45</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>12/23/2025 08:36:39</publishTime> <publishTime>12/23/2025 13:55:45</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/21/2025 11:46:16</publishTime> @@ -294,13 +297,13 @@ <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>12/23/2025 11:29:51</publishTime> <publishTime>12/28/2025 17:57:11</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>12/23/2025 11:29:51</publishTime> <publishTime>12/28/2025 17:57:11</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>12/23/2025 11:19:33</publishTime> <publishTime>12/28/2025 17:57:19</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -390,7 +393,7 @@ <publishTime>04/21/2025 11:46:16</publishTime> </File> <File Include="packages.config"> <publishTime>04/21/2025 11:46:17</publishTime> <publishTime>12/26/2025 15:32:07</publishTime> </File> <File Include="Properties/PublishProfiles/JFAPI.pubxml.user"> <publishTime>12/07/2025 12:01:10</publishTime> @@ -507,7 +510,7 @@ <publishTime>05/06/2024 13:47:57</publishTime> </File> <File Include="Web.config"> <publishTime>12/23/2025 08:37:19</publishTime> <publishTime>12/26/2025 15:33:36</publishTime> </File> </ItemGroup> </Project> WebAPI/Web.config
@@ -8,7 +8,7 @@ <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> </sectionGroup> </configSections> @@ -40,7 +40,7 @@ <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--斯莫尔--> <!--<add key="surl" value="http://192.168.0.113/WEBS-WMS/Webservice1.asmx" />三升本地配置--> <!--<add key="surl" value="http://36.134.2.30:200/WEBS-WMS/WebService1.asmx" />--> <!--金帅--> <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" /> <add key="webpages:Version" value="3.0.0.0" /> <add key="webpages:Enabled" value="false" /> @@ -58,7 +58,7 @@ <system.web> <customErrors mode="Off" /> <compilation debug="true" targetFramework="4.5" /> <httpRuntime maxQueryStringLength="102400" maxRequestLength="1048576"/> <httpRuntime maxQueryStringLength="102400" maxRequestLength="1048576" /> <pages controlRenderingCompatibilityVersion="4.0" /> </system.web>
@@ -7,7 +7,7 @@ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> WebAPI/packages.config
@@ -16,6 +16,7 @@ <package id="Grpc.Core.Api" version="2.45.0" targetFramework="net45" /> <package id="jQuery" version="1.10.2" targetFramework="net45" /> <package id="jQuery.Validation" version="1.11.1" targetFramework="net45" /> <package id="LiteDB" version="5.0.16" targetFramework="net45" /> <package id="Microsoft.AspNet.Cors" version="5.2.7" targetFramework="net45" /> <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" /> <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" /> sdk_dingding/TopSdk/bin/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cacheBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -32,13 +32,4 @@ D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb <<<<<<< HEAD D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb ======= >>>>>>> 033d6d49fbb0a924653c7fd3ef3700a24f37ee59 sdk_dingding/TopSdk/obj/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdbBinary files differ
