Browse Source

修改生成路径至Root文件夹

Branch_PaiNaWeiSJob
xusc 3 weeks ago
parent
commit
72f98158b8
  1. BIN
      .vs/ICSSoft.FromERP/v16/.suo
  2. 0
      ICSSoft.FromERP/Data/ICSHelper.cs
  3. 7
      ICSSoft.FromERP/ICSSoft.FromERP.csproj
  4. 44
      ICSSoft.FromERP/Model/金杨/CapInputDto.cs
  5. 20
      ICSSoft.FromERP/Model/金杨/ResponseInfoDto.cs
  6. 104
      ICSSoft.FromERP/SyncCas_Jinyang.cs
  7. 2
      ICSSoft.FromERP/SyncCustomer_WeiMas.cs
  8. 29
      Root/App.config
  9. BIN
      Root/ICSSoft.FromERP.dll
  10. 20
      Root/ICSSoft.FromERP.dll.config
  11. BIN
      Root/ICSSoft.FromERP.pdb
  12. BIN
      Root/Newtonsoft.Json.dll
  13. BIN
      Root/System.IO.dll
  14. BIN
      Root/System.Net.Http.dll
  15. BIN
      Root/System.Runtime.dll
  16. BIN
      Root/log4net.dll
  17. 36295
      Root/log4net.xml

BIN
.vs/ICSSoft.FromERP/v16/.suo

Binary file not shown.

0
ICSSoft.FromERP/ICSHelper.cs → ICSSoft.FromERP/Data/ICSHelper.cs

7
ICSSoft.FromERP/ICSSoft.FromERP.csproj

@ -26,7 +26,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\ICSSoft.Test\bin\Debug\</OutputPath>
<OutputPath>..\Root\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@ -114,7 +114,7 @@
<Compile Include="ConstWorkPoint.cs" />
<Compile Include="ICSBrrow.cs" />
<Compile Include="ICSDepartment.cs" />
<Compile Include="ICSHelper.cs" />
<Compile Include="Data\ICSHelper.cs" />
<Compile Include="ICSODeliveryNotice.cs" />
<Compile Include="ICSOIssue.cs" />
<Compile Include="ICSOtherIn.cs" />
@ -142,6 +142,8 @@
<Compile Include="Model\威迈\TokenDto.cs" />
<Compile Include="Model\威迈\VendorDto.cs" />
<Compile Include="Model\威迈\VendorInputDto.cs" />
<Compile Include="Model\金杨\CapInputDto.cs" />
<Compile Include="Model\金杨\ResponseInfoDto.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ICSInventory.cs" />
<Compile Include="ICSMo.cs" />
@ -168,6 +170,7 @@
<Compile Include="SK\YERP_011.cs" />
<Compile Include="SK\YERP_012.cs" />
<Compile Include="SRMUser.cs" />
<Compile Include="SyncCas_Jinyang.cs" />
<Compile Include="SyncCustomer_WeiMas.cs" />
<Compile Include="SyncItem_WeiMas.cs" />
<Compile Include="SyncVendor_WeiMas.cs" />

44
ICSSoft.FromERP/Model/金杨/CapInputDto.cs

@ -0,0 +1,44 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ICSSoft.FromERP.Model
{
public class CapInputDto
{
/// <summary>
/// 车间编号
/// </summary>
public string WorkshopID { get; set; }
/// <summary>
/// 设备编号
/// </summary>
public string EquipmentID { get; set; }
/// <summary>
/// 产品信息
/// </summary>
public string ProductNo { get; set; }
/// <summary>
/// 批次号
/// </summary>
public string LotNo { get; set; }
/// <summary>
/// 数据采集时间
/// </summary>
public string CollectionTime { get; set; }
/// <summary>
/// 内阻值
/// </summary>
public double ParamValue_Resistance { get; set; }
/// <summary>
/// 高度值
/// </summary>
public double ParamValue_Height { get; set; }
/// <summary>
/// 备注预留
/// </summary>
public string Msg { get; set; }
}
}

20
ICSSoft.FromERP/Model/金杨/ResponseInfoDto.cs

@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ICSSoft.FromERP.Model
{
public class ResponseInfoDto
{
/// <summary>
/// 响应时间
/// </summary>
public string ResponseTime { get; set; }
/// <summary>
/// 上传结果,OK为上传成功
/// </summary>
public string Result { get; set; }
}
}

104
ICSSoft.FromERP/SyncCas_Jinyang.cs

@ -0,0 +1,104 @@
using ICSSoft.FromERP.Model;
using Newtonsoft.Json;
using Quartz;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ICSSoft.FromERP
{
/// <summary>
/// 数采上传(金杨)
/// </summary>
public class SyncCas_Jinyang : IJob
{
private static object key = new object();
private static log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public void Execute(IJobExecutionContext context)
{
try
{
lock (key)
{
log.Info("开始……………………………………………………………………");
Execute();
log.Info("结束……………………………………………………………………");
}
}
catch (Exception ex)
{
log.Error(ex.ToString());
}
}
public void Execute()
{
try
{
string conStr = ICSHelper.GetConnectString();
string Namespace = this.GetType().Namespace;
//string Class = this.GetType().Name;
DataTable dt = ICSHelper.GetERPDB(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);
string sql0 = " SELECT top 1 ModifyDate FROM ICSERPTime where ClassName='" + Class + "'";
var lastDate = ICSHelper.ExecuteScalar(conStr, sql0).ToDateOrNull();
if (!lastDate.HasValue)
{
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);
var input = new CapInputDto();
input.WorkshopID = "";
input.EquipmentID = "";
input.ProductNo = "";
input.LotNo = "";
input.CollectionTime = "";
input.ParamValue_Resistance = 12;
input.ParamValue_Height = 12;
input.Msg = "";
var inputObj = JsonConvert.SerializeObject(input);
string url = ICSHelper.GetConfigString()["WeiMasErpUrl"] + @"/BasicAssistingService/FromWeMec/APIVenderToMES";
var result = HttpHelper.HttpClientPost<ResponseInfoDto>(url, inputObj).Result;
if (result.Result == "OK")
{
// insertSql += "DROP TABLE #tempFromErp4Vendor";
//ICSHelper.ExecuteDate(conStr, insertSql);
}
else
{
throw new Exception(result.Result);
}
}
}
catch (Exception ex)
{
log.Error(ex.ToString());
}
}
}
}

2
ICSSoft.FromERP/SyncCustomer_WeiMas.cs

@ -14,7 +14,7 @@ namespace ICSSoft.FromERP
/// <summary>
/// 客户档案(威迈)
/// </summary>
public class SyncCustomer_WeiMas
public class SyncCustomer_WeiMas : IJob
{
private static object key = new object();

29
Root/App.config

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<!--<add key="ERPDB" value="[U9Ctest]"/>-->
<add key="ERPDB" value="[192.168.93.132].[U9TEST0628]"/>
<add key="Workpoint_ERPDB" value="zhc|[MESTOU8].[UFDATA_001_2017]"/>
<!--token 地址-->
<add key="WeiMasTokenUrl" value="https://test.zhangsanfeng.vip"/>
<add key="app_id" value="sj_w_id"/>
<add key="app_secret" value="70FF7F01C5899A5ACAAD4ECB7FA5B3C5"/>
<!--子公司 地址-->
<add key="WeiMasOrgUrl" value="https://test.zhangsanfeng.vip"/>
<!--基础资料 地址-->
<add key="WeiMasErpUrl" value="https://test-basic.zhangsanfeng.vip"/>
</appSettings>
<connectionStrings>
<!--<add name="SysConnectionString" connectionString="Data Source=119.3.29.177;Database=ICSMESBase;Uid=gitea;Pwd=aA123456;"/>-->
<!--<add name="SysConnectionString" connectionString="server=192.168.93.135; Database=ICSMESBase_RuiTeng; User ID=sa; Password=rhyt0n***;MultipleActiveResultSets=True;Connect Timeout=300;"/>-->
<add name="SysConnectionString" connectionString="server=192.168.1.155; Database=ICSMESBase_WeiMas; User ID=sa; Password=aA123456;MultipleActiveResultSets=True;Connect Timeout=300;"/>
<add name="APIAddStdWorkHour" connectionString="http://192.168.1.110:9097/api/APIAddStdWorkHour"/>
<add name="MailOpen" connectionString="true"/>
<add name="SendHost" connectionString="mail.huahengweld.com"/>
<add name="SendPort" connectionString="25"/>
<add name="SendDisplayName" connectionString="zzx"/>
<add name="SendAddress" connectionString="srm-huaheng@huahengweld.com"/>
<add name="SendPassword" connectionString="mail.huahengweld.com"/>
</connectionStrings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>

BIN
Root/ICSSoft.FromERP.dll

Binary file not shown.

20
Root/ICSSoft.FromERP.dll.config

@ -1,15 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="ERPDB" value="[U9Ctest]"/>
<!--<add key="ERPDB" value="[U9Ctest]"/>-->
<add key="ERPDB" value="[192.168.93.132].[U9TEST0628]"/>
<add key="Workpoint_ERPDB" value="zhc|[MESTOU8].[UFDATA_001_2017]"/>
<!--token 地址-->
<add key="WeiMasTokenUrl" value="https://test.zhangsanfeng.vip"/>
<add key="app_id" value="sj_w_id"/>
<add key="app_secret" value="70FF7F01C5899A5ACAAD4ECB7FA5B3C5"/>
<!--子公司 地址-->
<add key="WeiMasOrgUrl" value="https://test.zhangsanfeng.vip"/>
<!--基础资料 地址-->
<add key="WeiMasErpUrl" value="https://test-basic.zhangsanfeng.vip"/>
</appSettings>
<connectionStrings>
<add name="SysConnectionString" connectionString="Data Source=119.3.29.177;Database=ICSMESBase;Uid=gitea;Pwd=aA123456;"/>
<!--<add name="SysConnectionString" connectionString="Data Source=119.3.29.177;Database=ICSMESBase;Uid=gitea;Pwd=aA123456;"/>-->
<!--<add name="SysConnectionString" connectionString="server=192.168.93.135; Database=ICSMESBase_RuiTeng; User ID=sa; Password=rhyt0n***;MultipleActiveResultSets=True;Connect Timeout=300;"/>-->
<add name="SysConnectionString" connectionString="server=192.168.1.155; Database=ICSMESBase_WeiMas; User ID=sa; Password=aA123456;MultipleActiveResultSets=True;Connect Timeout=300;"/>
<add name="APIAddStdWorkHour" connectionString="http://192.168.1.110:9097/api/APIAddStdWorkHour"/>
<add name="MailOpen" connectionString="true"/>
<add name="SendHost" connectionString="mail.huahengweld.com"/>
<add name="SendPort" connectionString="25"/>
<add name="SendDisplayName" connectionString="zzx"/>
<add name="SendAddress" connectionString="srm-huaheng@huahengweld.com"/>
<add name="SendPassword" connectionString="mail.huahengweld.com"/>
</connectionStrings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>

BIN
Root/ICSSoft.FromERP.pdb

Binary file not shown.

BIN
Root/Newtonsoft.Json.dll

Binary file not shown.

BIN
Root/System.IO.dll

Binary file not shown.

BIN
Root/System.Net.Http.dll

Binary file not shown.

BIN
Root/System.Runtime.dll

Binary file not shown.

BIN
Root/log4net.dll

Binary file not shown.

36295
Root/log4net.xml
File diff suppressed because it is too large
View File

Loading…
Cancel
Save