|
|
@ -40,18 +40,16 @@ namespace ICSSoft.FromERP |
|
|
|
{ |
|
|
|
string conStr = ICSHelper.GetConnectString(); |
|
|
|
string Namespace = this.GetType().Namespace; |
|
|
|
//string Class = this.GetType().Name;
|
|
|
|
DataTable dt = ICSHelper.GetERPDB(conStr); |
|
|
|
// string Class = this.GetType().Name;
|
|
|
|
DataTable dt = ICSHelper.GetOldERPDB(conStr); |
|
|
|
foreach (DataRow dr in dt.Rows) |
|
|
|
{ |
|
|
|
//var dtNowBegin = new DateTime(2000, 1, 1, 0, 0, 0);//默认开始时间
|
|
|
|
//var dtNow = DateTime.Now;
|
|
|
|
//string erpName = ICSHelper.GetConfigString()["ERPDB"];
|
|
|
|
//string TenantId = dr["TenantId"].ToString();//mes 组织
|
|
|
|
//string TenantCode = dr["TenantCode"].ToString();
|
|
|
|
//string ErpId = dr["ErpID"].ToString(); //erpID
|
|
|
|
//string Class = this.GetType().Name + TenantCode;
|
|
|
|
//erpName = string.Format(erpName, TenantId);
|
|
|
|
var dtNowBegin = new DateTime(2000, 1, 1, 0, 0, 0);//默认开始时间
|
|
|
|
var dtNow = DateTime.Now; |
|
|
|
string erpName = ICSHelper.GetConfigString()["ERPDB"]; |
|
|
|
string WorkPoint = dr["WorkPointCode"].ToString(); |
|
|
|
string Class = this.GetType().Name + WorkPoint; |
|
|
|
erpName = string.Format(erpName, WorkPoint); |
|
|
|
|
|
|
|
//string sql0 = " SELECT top 1 ModifyDate FROM ICSERPTime where ClassName='" + Class + "'";
|
|
|
|
//var lastDate = ICSHelper.ExecuteScalar(conStr, sql0).ToDateOrNull();
|
|
|
@ -60,31 +58,67 @@ namespace ICSSoft.FromERP |
|
|
|
// lastDate = dtNowBegin;
|
|
|
|
//}
|
|
|
|
|
|
|
|
//string sql = @" select '" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "' as MTIME into #TempVendor ";
|
|
|
|
//sql = ICSHelper.Time(Namespace, Class, TenantId, sql, "#TempVendor");
|
|
|
|
//sql += "DROP TABLE #TempVendor";
|
|
|
|
//ICSHelper.ExecuteDate(conStr, sql);
|
|
|
|
// string sql = @" select '" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "' as MTIME into #TempCas ";
|
|
|
|
string sql = @"if exists (select * from tempdb.dbo.sysobjects where id = object_id(N'tempdb..#tempSyncCas_Jinyang') and type='U')
|
|
|
|
DROP TABLE #tempSyncCas_Jinyang |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
select * ,a.CreateTime as MTime into #tempSyncCas_Jinyang from [ICSDomeAmb] a with( nolock) |
|
|
|
where a.CreateTime>=@LastTime |
|
|
|
|
|
|
|
select |
|
|
|
a.* |
|
|
|
from |
|
|
|
( |
|
|
|
select a.* |
|
|
|
,row_number() over(partition by a.EqCode order by a.CreateTime desc) RowSeq |
|
|
|
from #tempSyncCas_Jinyang a |
|
|
|
|
|
|
|
) a |
|
|
|
where a.RowSeq=1 |
|
|
|
order by a.EqCode ";
|
|
|
|
|
|
|
|
// sql = string.Format(sql, ErpId, erpName);
|
|
|
|
sql = ICSHelper.Time4Old(Namespace, Class, WorkPoint, sql, "#tempSyncCas_Jinyang"); |
|
|
|
// sql += "DROP TABLE #tempSyncCas_Jinyang";
|
|
|
|
|
|
|
|
|
|
|
|
// sql += @"";
|
|
|
|
|
|
|
|
|
|
|
|
var resultDT = ICSHelper.ExecuteTable(conStr, sql); |
|
|
|
List<CapInputDto> list = new List<CapInputDto>(); |
|
|
|
var input = new CapInputDto(); |
|
|
|
input.WorkshopID = "1"; |
|
|
|
input.EquipmentID = "1"; |
|
|
|
input.ProductNo = "1"; |
|
|
|
input.LotNo = "1"; |
|
|
|
input.CollectionTime = "1"; |
|
|
|
input.ParamValue_Resistance = 12; |
|
|
|
input.ParamValue_Height = 12; |
|
|
|
input.Msg = ""; |
|
|
|
|
|
|
|
list.Add(input); |
|
|
|
|
|
|
|
|
|
|
|
if (resultDT == null) |
|
|
|
{ |
|
|
|
return; |
|
|
|
} |
|
|
|
foreach (DataRow item in resultDT.Rows) |
|
|
|
{ |
|
|
|
var input = new CapInputDto(); |
|
|
|
input.WorkshopID = "6"; |
|
|
|
input.EquipmentID = item["EqCode"].ToStringExt(); |
|
|
|
input.ProductNo = item["InvStd "].ToStringExt(); |
|
|
|
input.LotNo = item["LotNO"].ToStringExt(); |
|
|
|
input.CollectionTime = item["CreateTime"].ToString(); |
|
|
|
input.ParamValue_Resistance = item["Free2"].ToDecimal(); |
|
|
|
input.ParamValue_Height = item["Free1"].ToDecimal(); |
|
|
|
input.Msg = ""; |
|
|
|
|
|
|
|
list.Add(input); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var inputObj = JsonConvert.SerializeObject(list); |
|
|
|
//string url = ICSHelper.GetConfigString()["JinyangCapUrl"]+ @"?deipaaskeyauth=a5P1RTL4380zd9jpb57qXx63rdynUHN2";
|
|
|
|
string url = ICSHelper.GetConfigString()["JinyangCapUrl"]; |
|
|
|
string url = ICSHelper.GetConfigString()["JinyangCapUrl"]; |
|
|
|
|
|
|
|
var result = HttpHelper.HttpClientPost<ResponseInfoDto>(url, inputObj, new Dictionary<string, string>() { { "deipaaskeyauth", "a5P1RTL4380zd9jpb57qXx63rdynUHN2" } }).Result; |
|
|
|
// var result = HttpHelper.HttpClientPost<ResponseInfoDto>(url, inputObj).Result;
|
|
|
|
// var result = HttpHelper.HttpClientPost<ResponseInfoDto>(url, inputObj).Result;
|
|
|
|
if (result.Result == "OK") |
|
|
|
{ |
|
|
|
|
|
|
|