Browse Source

更新版本

master
赵新宇 6 months ago
parent
commit
89be922904
  1. 7
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs
  2. 132
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs
  3. 18
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json

7
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs

@ -93,8 +93,6 @@ public class TransferNoteConverter : IOutgoingConverter
else else
{ {
outgoingToExternal.DataType = EnumOutgoingDataType.TransferForCustom.ToString(); outgoingToExternal.DataType = EnumOutgoingDataType.TransferForCustom.ToString();
var toLocationErpcode = details[0].ToLocationErpCode; var toLocationErpcode = details[0].ToLocationErpCode;
var erplocation = await _erpLocationAppService.GetByCodeAsync(toLocationErpcode).ConfigureAwait(false); var erplocation = await _erpLocationAppService.GetByCodeAsync(toLocationErpcode).ConfigureAwait(false);
if (erplocation?.Type != "2") if (erplocation?.Type != "2")
@ -102,14 +100,9 @@ public class TransferNoteConverter : IOutgoingConverter
stat = "2"; stat = "2";
} }
var location = stat == "1" ? details[0].ToLocationErpCode : details[0].FromLocationErpCode; var location = stat == "1" ? details[0].ToLocationErpCode : details[0].FromLocationErpCode;
var putawayNoteWmsoutm = BuildWmsoutmDataInterface(exchangeReceipt, departmentCode, dt_w, tyrpNumber, wmsReceipt.Number, location); var putawayNoteWmsoutm = BuildWmsoutmDataInterface(exchangeReceipt, departmentCode, dt_w, tyrpNumber, wmsReceipt.Number, location);
outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteWmsoutm); outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteWmsoutm);
WipDetails = details.GroupBy(r => new { r.Number, r.ItemCode, r.FromLocationErpCode }).Select(p => new TransferNoteDetailExchangeDto { Qty = p.Sum(itm => itm.Qty), Number = p.Key.Number, ItemCode = p.Key.ItemCode, FromLocationErpCode = p.Key.FromLocationErpCode }).ToList(); WipDetails = details.GroupBy(r => new { r.Number, r.ItemCode, r.FromLocationErpCode }).Select(p => new TransferNoteDetailExchangeDto { Qty = p.Sum(itm => itm.Qty), Number = p.Key.Number, ItemCode = p.Key.ItemCode, FromLocationErpCode = p.Key.FromLocationErpCode }).ToList();
} }
outgoingToExternalList.Add(outgoingToExternal); outgoingToExternalList.Add(outgoingToExternal);

132
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs

@ -46,77 +46,77 @@ public class TyrpOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
int wmsoutm_count = 0; //wmsoutm插入条数 int wmsoutm_count = 0; //wmsoutm插入条数
int mesout_asd_count = 0; //mesout_asd插入条数 int mesout_asd_count = 0; //mesout_asd插入条数
#region 采购单 PurchaseOrder scontrol //#region 采购单 PurchaseOrder scontrol
Logger.LogInformation($"Write PurchaseOrder");//采购单 //Logger.LogInformation($"Write PurchaseOrder");//采购单
var purchaseOrderConvert = workerContext.ServiceProvider.GetRequiredService<PurchaseOrderConverter>(); //var purchaseOrderConvert = workerContext.ServiceProvider.GetRequiredService<PurchaseOrderConverter>();
var purchaseOrderList = await purchaseOrderConvert.ConvertAsync().ConfigureAwait(false); //var purchaseOrderList = await purchaseOrderConvert.ConvertAsync().ConfigureAwait(false);
await scontrolWriter.WriteAsync(purchaseOrderList).ConfigureAwait(false); //await scontrolWriter.WriteAsync(purchaseOrderList).ConfigureAwait(false);
if (purchaseOrderList.Count > 0) //if (purchaseOrderList.Count > 0)
{ //{
Logger.LogInformation($"采购单-PurchaseOrder处理{purchaseOrderList.Count}条"); // Logger.LogInformation($"采购单-PurchaseOrder处理{purchaseOrderList.Count}条");
scontrol_count += purchaseOrderList.Count; // scontrol_count += purchaseOrderList.Count;
} //}
#endregion //#endregion
#region 采购退货单 PurchaseReturn scontrol //#region 采购退货单 PurchaseReturn scontrol
Logger.LogInformation($"Write PurchaseReturn");//采购退货单(汇总) //Logger.LogInformation($"Write PurchaseReturn");//采购退货单(汇总)
var purchaseReturnConvert = workerContext.ServiceProvider.GetRequiredService<PurchaseReturnConverter>(); //var purchaseReturnConvert = workerContext.ServiceProvider.GetRequiredService<PurchaseReturnConverter>();
var purchaseReturnList = await purchaseReturnConvert.ConvertAsync().ConfigureAwait(false); //var purchaseReturnList = await purchaseReturnConvert.ConvertAsync().ConfigureAwait(false);
await scontrolWriter.WriteAsync(purchaseReturnList).ConfigureAwait(false); //await scontrolWriter.WriteAsync(purchaseReturnList).ConfigureAwait(false);
if (purchaseReturnList.Count > 0) //if (purchaseReturnList.Count > 0)
{ //{
Logger.LogInformation($"采购退货单-PurchaseReturn处理{purchaseReturnList.Count}条"); // Logger.LogInformation($"采购退货单-PurchaseReturn处理{purchaseReturnList.Count}条");
scontrol_count += purchaseReturnList.Count; // scontrol_count += purchaseReturnList.Count;
} //}
#endregion //#endregion
#region 验收单 Putaway scontrol //#region 验收单 Putaway scontrol
Logger.LogInformation($"Write PutawayNote");//验收单(汇总) //Logger.LogInformation($"Write PutawayNote");//验收单(汇总)
var putawayNoteConvert = workerContext.ServiceProvider.GetRequiredService<PutawayNoteConverter>(); //var putawayNoteConvert = workerContext.ServiceProvider.GetRequiredService<PutawayNoteConverter>();
var putawayNoteList = await putawayNoteConvert.ConvertAsync().ConfigureAwait(false); //var putawayNoteList = await putawayNoteConvert.ConvertAsync().ConfigureAwait(false);
await scontrolWriter.WriteAsync(putawayNoteList).ConfigureAwait(false); //await scontrolWriter.WriteAsync(putawayNoteList).ConfigureAwait(false);
if (putawayNoteList.Count > 0) //if (putawayNoteList.Count > 0)
{ //{
Logger.LogInformation($"验收单-Putaway处理{putawayNoteList.Count}条"); // Logger.LogInformation($"验收单-Putaway处理{putawayNoteList.Count}条");
scontrol_count += putawayNoteList.Count; // scontrol_count += putawayNoteList.Count;
} //}
#endregion //#endregion
#region 线边仓领料单 Issue scontrol //#region 线边仓领料单 Issue scontrol
Logger.LogInformation($"Write IssueNote");//线边仓领料单(汇总) //Logger.LogInformation($"Write IssueNote");//线边仓领料单(汇总)
var issueNoteConvert = workerContext.ServiceProvider.GetRequiredService<IssueNoteConverter>(); //var issueNoteConvert = workerContext.ServiceProvider.GetRequiredService<IssueNoteConverter>();
var issueNoteList = await issueNoteConvert.ConvertAsync().ConfigureAwait(false); //var issueNoteList = await issueNoteConvert.ConvertAsync().ConfigureAwait(false);
await scontrolWriter.WriteAsync(issueNoteList).ConfigureAwait(false); //await scontrolWriter.WriteAsync(issueNoteList).ConfigureAwait(false);
if (issueNoteList.Count > 0) //if (issueNoteList.Count > 0)
{ //{
Logger.LogInformation($"线边仓领料单-Issue处理{issueNoteList.Count}条"); // Logger.LogInformation($"线边仓领料单-Issue处理{issueNoteList.Count}条");
scontrol_count += issueNoteList.Count; // scontrol_count += issueNoteList.Count;
} //}
#endregion //#endregion
#region 线边仓退料单 ProductionReturn scontrol //#region 线边仓退料单 ProductionReturn scontrol
Logger.LogInformation($"Write ProductionReturnNote");//线边仓退料单(汇总) //Logger.LogInformation($"Write ProductionReturnNote");//线边仓退料单(汇总)
var productionReturnNoteConvert = workerContext.ServiceProvider.GetRequiredService<ProductionReturnNoteConverter>(); //var productionReturnNoteConvert = workerContext.ServiceProvider.GetRequiredService<ProductionReturnNoteConverter>();
var productionReturnNoteList = await productionReturnNoteConvert.ConvertAsync().ConfigureAwait(false); //var productionReturnNoteList = await productionReturnNoteConvert.ConvertAsync().ConfigureAwait(false);
await scontrolWriter.WriteAsync(productionReturnNoteList).ConfigureAwait(false); //await scontrolWriter.WriteAsync(productionReturnNoteList).ConfigureAwait(false);
if (productionReturnNoteList.Count > 0) //if (productionReturnNoteList.Count > 0)
{ //{
Logger.LogInformation($"线边仓退料单-ProductionReturn处理{productionReturnNoteList.Count}条"); // Logger.LogInformation($"线边仓退料单-ProductionReturn处理{productionReturnNoteList.Count}条");
scontrol_count += productionReturnNoteList.Count; // scontrol_count += productionReturnNoteList.Count;
} //}
#endregion //#endregion
#region 半成品上架 SemiPutaway scontrol //#region 半成品上架 SemiPutaway scontrol
Logger.LogInformation($"Write SemiPutawayNote");//半成品上架 //Logger.LogInformation($"Write SemiPutawayNote");//半成品上架
var semiPutawayNoteConvert = workerContext.ServiceProvider.GetRequiredService<SemiPutawayNoteConverter>(); //var semiPutawayNoteConvert = workerContext.ServiceProvider.GetRequiredService<SemiPutawayNoteConverter>();
var semiPutawayNoteList = await semiPutawayNoteConvert.ConvertAsync().ConfigureAwait(false); //var semiPutawayNoteList = await semiPutawayNoteConvert.ConvertAsync().ConfigureAwait(false);
await scontrolWriter.WriteAsync(semiPutawayNoteList).ConfigureAwait(false); //await scontrolWriter.WriteAsync(semiPutawayNoteList).ConfigureAwait(false);
if (semiPutawayNoteList.Count > 0) //if (semiPutawayNoteList.Count > 0)
{ //{
Logger.LogInformation($"半成品上架-SemiPutaway处理{semiPutawayNoteList.Count}条"); // Logger.LogInformation($"半成品上架-SemiPutaway处理{semiPutawayNoteList.Count}条");
scontrol_count += semiPutawayNoteList.Count; // scontrol_count += semiPutawayNoteList.Count;
} //}
#endregion //#endregion
#region 储位、线边仓调拨单 和 客户储位调拨单 Transfer scontrol #region 储位、线边仓调拨单 和 客户储位调拨单 Transfer scontrol
Logger.LogInformation($"Write TransferNote");//储位、线边仓调拨单 和 客户储位调拨单(汇总) Logger.LogInformation($"Write TransferNote");//储位、线边仓调拨单 和 客户储位调拨单(汇总)

18
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json

@ -1,13 +1,13 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True", "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", "DataExchange": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_DataExchange_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
"TYRP": "Server=10.164.113.32,1818\\SHDB;Database=TYRP;Uid=ShWmsUser;Pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True", "TYRP": "Server=dev.ccwin-in.com,13319;Database=TYRP_CC;Uid=ccwin-in;Pwd=Microsoft@2022;TrustServerCertificate=True",
"SYBASE_TYRP": "Data Source=10.164.115.137; Port=5000; Database=mesdb; Uid=sa; Pwd=dawning;Charset=cp850;" //iso_1 "SYBASE_TYRP": "Data Source=10.164.233.4; Port=5000; Database=mesdb; Uid=sa; Pwd=dawning;Charset=cp850;" //iso_1
}, },
"AuthServer": { "AuthServer": {
"Authority": "http://10.164.113.31:60083/", "Authority": "http://dev.ccwin-in.com:60083/",
"RequireHttpsMetadata": "false", "RequireHttpsMetadata": "false",
"SwaggerClientId": "admin", "SwaggerClientId": "admin",
"SwaggerClientSecret": "1q2w3E*", "SwaggerClientSecret": "1q2w3E*",
@ -26,16 +26,16 @@
"RemoteServices": { "RemoteServices": {
"BaseData": { "BaseData": {
"BaseUrl": "http://10.164.113.31:60084/" "BaseUrl": "http://dev.ccwin-in.com:60084/"
}, },
"Store": { "Store": {
"BaseUrl": "http://10.164.113.31:60085/" "BaseUrl": "http://dev.ccwin-in.com:60085/"
}, },
"Label": { "Label": {
"BaseUrl": "http://10.164.113.31:60082/" "BaseUrl": "http://dev.ccwin-in.com:60082/"
}, },
"Auth": { "Auth": {
"BaseUrl": "http://10.164.113.31:60083/" "BaseUrl": "http://dev.ccwin-in.com:60083/"
} }
}, },
"TyrpOptions": { "TyrpOptions": {

Loading…
Cancel
Save