Browse Source

接口修改

dev_DY_CC
lvzb 10 months ago
parent
commit
c2bfe86e83
  1. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Client/WebApi.cs
  2. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs
  3. 20
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/appsettings.json
  4. 3
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemGuideBooks/ItemGuideBook.cs

4
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Client/WebApi.cs

@ -98,8 +98,8 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Incoming
var urlBuilder_ = new System.Text.StringBuilder(); var urlBuilder_ = new System.Text.StringBuilder();
if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl); if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl);
// Operation Path: "CargoState/GetMacStatic" // Operation Path: "CargoState/GetMacStatic"
urlBuilder_.Append("CargoState/GetMacStatic"); urlBuilder_.Append("api/CargoState/GetMacStatic");
//urlBuilder_.Append("CargoState/GetMacStatic");
PrepareRequest(client_, request_, urlBuilder_); PrepareRequest(client_, request_, urlBuilder_);
var url_ = urlBuilder_.ToString(); var url_ = urlBuilder_.ToString();

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs

@ -58,7 +58,7 @@ public class InjectionMoldingTaskIncomingBackgroundWorker : AsyncPeriodicBackgro
return; return;
} }
} }
Logger.LogInformation($"注塑任务");//缴库 Logger.LogInformation($"注塑任务");//缴库
var reader = workerContext.ServiceProvider.GetService<InjectionMoldingRequestReader>(); var reader = workerContext.ServiceProvider.GetService<InjectionMoldingRequestReader>();
await reader.ReadAsync().ConfigureAwait(false); await reader.ReadAsync().ConfigureAwait(false);

20
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/appsettings.json

@ -1,8 +1,8 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True;Encrypt=false", "Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
"DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True;Encrypt=false", "DataExchange": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_DataExchange_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
"MES": "Server=10.164.113.32,1818\\SHDB;Database=MES_SH;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True;Encrypt=false" "MES": "Server=10.164.233.7;Database=MES_JY;uid=sa;pwd=Asdf1234$;TrustServerCertificate=True;Encrypt=false"
}, },
"AuthServer": { "AuthServer": {
@ -27,10 +27,10 @@
"Inventory": { "Inventory": {
"BaseUrl": "http://localhost:59095/" "BaseUrl": "http://dev.ccwin-in.com:60082/"
}, },
"Job": { "Job": {
"BaseUrl": "http://localhost:59095/" "BaseUrl": "http://dev.ccwin-in.com:60085/"
}, },
"Label": { "Label": {
"BaseUrl": "http://dev.ccwin-in.com:60082/" "BaseUrl": "http://dev.ccwin-in.com:60082/"
@ -39,10 +39,10 @@
"BaseUrl": "http://dev.ccwin-in.com:60082/" "BaseUrl": "http://dev.ccwin-in.com:60082/"
}, },
"Store": { "Store": {
"BaseUrl": "http://localhost:59095/" "BaseUrl": "http://dev.ccwin-in.com:60085/"
}, },
"BaseData": { "BaseData": {
"BaseUrl": "http://localhost:59094/" "BaseUrl": "http://dev.ccwin-in.com:60084/"
} }
@ -67,7 +67,7 @@
"InjectionMoldingTaskOptions": { "InjectionMoldingTaskOptions": {
"AutoRemote": { "AutoRemote": {
"IpAddress": "http://10.164.227.103:30000/", "IpAddress": "http://dev.ccwin-in.com:60084/",
"UserName": "", "UserName": "",
"Password": "", "Password": "",
"Token": "", "Token": "",
@ -78,14 +78,14 @@
"IncomingOptions": { "IncomingOptions": {
"Active": true, "Active": true,
"PeriodSeconds": 10, "PeriodSeconds": 5,
"BatchSize": 10, "BatchSize": 10,
"MaxCount": 100, "MaxCount": 100,
"RetryTimes": 3 "RetryTimes": 3
}, },
"OutgoingOptions": { "OutgoingOptions": {
"Active": true, "Active": true,
"PeriodSeconds": 10, "PeriodSeconds": 5,
"BatchSize": 10, "BatchSize": 10,
"MaxCount": 100, "MaxCount": 100,
"RetryTimes": 3 "RetryTimes": 3

3
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemGuideBooks/ItemGuideBook.cs

@ -13,19 +13,16 @@ public class ItemGuideBook : SfsBaseDataAggregateRootBase
/// <summary> /// <summary>
/// 物品名称 /// 物品名称
/// </summary> /// </summary>
[IgnoreUpdate]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// 物品描述1 /// 物品描述1
/// </summary> /// </summary>
[IgnoreUpdate]
public string Desc1 { get; set; } public string Desc1 { get; set; }
/// <summary> /// <summary>
/// 物品描述2 /// 物品描述2
/// </summary> /// </summary>
[IgnoreUpdate]
public string Desc2 { get; set; } public string Desc2 { get; set; }
/// <summary> /// <summary>

Loading…
Cancel
Save