zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

集成Redis
唐明亮 2 years ago
parent
c7985c163f 3fa3242c61
commit
cf160563f4
6 changed files with 32 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/CustomerConverter.cs
  2. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DepartmentConverter.cs
  3. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/InterfaceCalendarConverter.cs
  4. 34
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/ItemBasicReader.cs
  5. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/SupplierConverter.cs
  6. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/UserConverter.cs

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/CustomerConverter.cs
View File

@ -45,7 +45,7 @@ public class CustomerConverter : IIncomingConverter
var incomingToWmsDataList = await BuildIncomingToWmsOfPurchaseOrderAsync(incomingFromExternalList).ConfigureAwait(false);
await _incomingToWmsManager.CreateBulkAsync(incomingToWmsDataList).ConfigureAwait(false);
//归档
await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false);
await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
}
private async Task<List<IncomingToWms>> BuildIncomingToWmsOfPurchaseOrderAsync(List<IncomingFromExternal> incomingDataList)

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DepartmentConverter.cs
View File

@ -41,7 +41,7 @@ IIncomingFromExternalManager incomingFromExternalManager)
var materialRequestList = await BuildIncomingToWmsOfDepartmentRequestAsync(incomingFromExternalList).ConfigureAwait(false);
await _incomingToWmsManager.CreateManyAsync(materialRequestList).ConfigureAwait(false);
//归档
await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false);
await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
}
private async Task<List<IncomingToWms>> BuildIncomingToWmsOfDepartmentRequestAsync(List<IncomingFromExternal> incomingDataList)

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/InterfaceCalendarConverter.cs
View File

@ -41,7 +41,7 @@ public class InterfaceCalendarConverter : IIncomingConverter
var materialRequestList = await BuildIncomingToWmsOfInterfaceCalendarRequestAsync(incomingFromExternalList).ConfigureAwait(false);
await _incomingToWmsManager.CreateManyAsync(materialRequestList).ConfigureAwait(false);
//归档
await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false);
await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
}
private async Task<List<IncomingToWms>> BuildIncomingToWmsOfInterfaceCalendarRequestAsync(List<IncomingFromExternal> incomingDataList)

34
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/ItemBasicReader.cs
View File

@ -109,23 +109,43 @@ public class ItemBasicReader : IReader
private static ItemBasicExchangeDto BuildItemBasicToExchangeDto(mes_product product)
{
string type = "";
switch (product.mes_product_code)
{
case "10C01":
type = "成品";
break;
case "10C02":
type = "成品";
break;
case "10C03":
type = "物料";
break;
case "10C04":
type = "半成品";
break;
default:
type = "无";
break;
}
var itemBasicRequest = new ItemBasicExchangeDto()
{
Code = product.mes_product_part,
Name = product.mes_product_desc,
Name = product.mes_product_part_ser,
Desc1 = product.mes_product_desc,
// Desc2=product.mes_product_fih_factory,
//Desc2=product.mes_product_fih_factory,//目前没有这个字段
Status = product.mes_product_active == "Y" ? EnumItemStatus.Active : EnumItemStatus.Disable,
#region 制造类别
//其中100404 托外-不带原料 、 10405 托外-带原料、10407客户提供料件没有对应字段
CanMake = product.mes_product_mfg == "10401" ? false : true, //10401 自制
CanBuy = product.mes_product_mfg == "10403" ? false : true, //10403 采购
CanOutsourcing = product.mes_product_mfg == "10402" ? false : true,//10402 外包
IsRecycled = product.mes_product_mfg == "10406" ? false : true, //10406 回收
CanMake = product.mes_product_mfg == "10401" ? true : false, //10401 自制
CanBuy = product.mes_product_mfg == "10403" ? true : false, //10403 采购
CanOutsourcing = product.mes_product_mfg == "10402" ? true : false,//10402 外包
IsRecycled = product.mes_product_mfg == "10406" ? true : false, //10406 回收
#endregion
Type = product.mes_product_code,//10C01成品、10C02原料、10C03物料、10C04半成品
Type = type,//10C01成品、10C02原料、10C03物料、10C04半成品
Configuration = product.mes_product_spec,
BasicUom = product.mes_product_unit,
AbcClass = "",

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/SupplierConverter.cs
View File

@ -43,7 +43,7 @@ public class SupplierConverter : IIncomingConverter
var incomingToWmsDataList = await BuildIncomingToWmsOfPurchaseOrderAsync(incomingFromExternalList).ConfigureAwait(false);
await _incomingToWmsManager.CreateBulkAsync(incomingToWmsDataList).ConfigureAwait(false);
//归档
await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false);
await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
}
private async Task<List<IncomingToWms>> BuildIncomingToWmsOfPurchaseOrderAsync(List<IncomingFromExternal> incomingDataList)
{

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/UserConverter.cs
View File

@ -39,7 +39,7 @@ public class UserConverter : IIncomingConverter
var materialRequestList = await BuildIncomingToWmsOfIdentityUserRequestAsync(incomingFromExternalList).ConfigureAwait(false);
await _incomingToWmsManager.CreateManyAsync(materialRequestList).ConfigureAwait(false);
//归档
await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false);
await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
}
private async Task<List<IncomingToWms>> BuildIncomingToWmsOfIdentityUserRequestAsync(List<IncomingFromExternal> incomingDataList)

Write Preview
Loading…
Cancel
Save