From 5936031a3fb8cff8bbdde698ea687f03de839419 Mon Sep 17 00:00:00 2001 From: xusc Date: Fri, 30 Aug 2024 09:47:43 +0800 Subject: [PATCH] .. --- .vs/ICSSoft.FromERP/v16/.suo | Bin 364544 -> 375808 bytes ICSSoft.FromERP/Data/ICSHelper.cs | 28 ++++++++++++++++++++++++++++ ICSSoft.FromERP/SyncCas_Jinyang.cs | 27 +++++++++++++++++++++++---- 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo index ce8cf8e0db7f6f3269db175ffd5ca49e1da91db6..3f54ae37dc5479102841c8cd4765fc0752e85069 100644 GIT binary patch delta 14089 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 delta 12539 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 diff --git a/ICSSoft.FromERP/Data/ICSHelper.cs b/ICSSoft.FromERP/Data/ICSHelper.cs index 5379115..95cec9f 100644 --- a/ICSSoft.FromERP/Data/ICSHelper.cs +++ b/ICSSoft.FromERP/Data/ICSHelper.cs @@ -126,6 +126,15 @@ namespace ICSSoft.FromERP log.Warn(name + "-内存占用:" + memoryUsed); } + /// + /// BS MES + /// + /// + /// + /// + /// + /// + /// public static string Time(string Namespace, string ClassName, string TenantId, string sql, string TempTableName) { try @@ -157,6 +166,15 @@ WHERE Namespace='{0}' AND ClassName='{1}' AND TenantId='{2}' } } + /// + /// CS MES + /// + /// + /// + /// + /// + /// + /// public static string Time4Old(string Namespace, string Class, string WorkPoint, string sql, string TempTableName) { try @@ -399,6 +417,11 @@ WHERE Namespace='{0}' AND ClassName='{1}' AND TenantId='{2}' } + /// + /// BS MES + /// + /// + /// public static DataTable GetERPDB(string conStr) { try @@ -413,6 +436,11 @@ WHERE Namespace='{0}' AND ClassName='{1}' AND TenantId='{2}' } } + /// + /// CS MES + /// + /// + /// public static DataTable GetOldERPDB(string conStr) { try diff --git a/ICSSoft.FromERP/SyncCas_Jinyang.cs b/ICSSoft.FromERP/SyncCas_Jinyang.cs index 5a83232..d6bcd90 100644 --- a/ICSSoft.FromERP/SyncCas_Jinyang.cs +++ b/ICSSoft.FromERP/SyncCas_Jinyang.cs @@ -66,7 +66,7 @@ DROP TABLE #tempSyncCas_Jinyang select * ,a.CreateTime as MTime into #tempSyncCas_Jinyang from [ICSDomeAmb] a with( nolock) - where a.CreateTime>=@LastTime + where a.CreateTime>@LastTime select a.* @@ -96,6 +96,7 @@ select * ,a.CreateTime as MTime into #tempSyncCas_Jinyang from [ICSDomeAmb] a wi { return; } + var insertSql = ""; foreach (DataRow item in resultDT.Rows) { var input = new CapInputDto(); @@ -110,9 +111,25 @@ select * ,a.CreateTime as MTime into #tempSyncCas_Jinyang from [ICSDomeAmb] a wi list.Add(input); + insertSql += @" +INSERT INTO [dbo].[ICSDomeAmb_cus] + ([CreateTime] +,IPAddress +,UserCode + ,[LotNO] + ,[InvStd ] + ,[EqCode] + ,[Free1] + ,[Free2] + ) +values ('" + item["CreateTime"].ToString() + "','"+ item["IPAddress"].ToString() + "','"+ item["UserCode"].ToStringExt() + "','" + input.LotNo + "','" + input.ProductNo + "','" + input.EquipmentID + "','" + item["Free1"].ToStringExt() + "','"+ item["Free2"].ToStringExt() + "')"; } - + if (list.Count == 0) + { + log.Info("没有数据行"); + return; + } var inputObj = JsonConvert.SerializeObject(list); //string url = ICSHelper.GetConfigString()["JinyangCapUrl"]+ @"?deipaaskeyauth=a5P1RTL4380zd9jpb57qXx63rdynUHN2"; string url = ICSHelper.GetConfigString()["JinyangCapUrl"]; @@ -121,8 +138,10 @@ select * ,a.CreateTime as MTime into #tempSyncCas_Jinyang from [ICSDomeAmb] a wi // var result = HttpHelper.HttpClientPost(url, inputObj).Result; if (result.Result == "OK") { - - + + + + ICSHelper.ExecuteDate(conStr, insertSql); } else {