lvzb 2 years ago
parent
commit
5e93c22b2a
  1. 9
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/Backflu.cs
  2. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/BackfluManager.cs
  3. 3
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/MesOut/MesOut.cs
  4. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/IScrapRepository.cs
  5. 15
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/Scrap.cs
  6. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/ScrapManager.cs
  7. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ProductReceiptNotes/ProductReceiptNote.cs
  8. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Backflus/BackflusDbContextModelCreatingExtensions.cs
  9. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/MesOut/MesOutDbContextModelCreatingExtensions.cs
  10. 6
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapDbContextModelCreatingExtensions.cs
  11. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapEfCoreRepository.cs
  12. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ProductReceiptNote/ProductReceiptNoteDbContextModelCreatingExtensions.cs
  13. 39
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
  14. 3
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
  15. 42
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs
  16. 3
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs
  17. 3
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapConverter.cs
  18. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapReader.cs
  19. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/MesAgentModule.cs
  20. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs

9
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/Backflu.cs

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
using Volo.Abp.Domain.Entities;
namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes;
public class Backflu : Entity
{
@ -12,11 +12,12 @@ public class Backflu : Entity
/// <summary>
/// 单据类型
/// </summary>
public string scmout_type { get; set; }
/// <summary>
/// TYRP单号
/// </summary>
[Key]
public string scmout_nbr { get; set; }
/// <summary>
/// 料号
@ -50,9 +51,11 @@ public class Backflu : Entity
/// 有效码
/// </summary>
public string scmout_stat { get; set; }
//Bom版本
public string BOMVer { get; set; }
public override object[] GetKeys()
{
return new object[] { scmout_nbr };
return new object[] { scmout_type + scmout_nbr + scmout_part + scmout_no };
}
}

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/BackfluManager.cs

@ -13,7 +13,7 @@ public class BackfluManager : DomainService, IBackfluManager
}
public async Task<List<Backflu>> GetToBeProcessedListAsync()
{
var Backflu = await _repository.GetListAsync().ConfigureAwait(false);
var Backflu = await _repository.GetListAsync(p=>p.scmout_stat=="Y").ConfigureAwait(false);
return Backflu.ToList();
}

3
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/MesOut/MesOut.cs

@ -50,6 +50,7 @@ public class MesOut : Entity
/// 返线数量
/// </summary>
public decimal Mesout_bad { get; set; }
//public string Mes_Barcode { get; set; }
public override object[] GetKeys()
{
@ -59,5 +60,5 @@ public class MesOut : Entity
/// <summary>
/// 是否读取(0,1)
/// </summary>
public int Yl1 { get; set; }
public long Yl1 { get; set; }
}

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/IScrapRepository.cs

@ -2,7 +2,7 @@ using Volo.Abp.Domain.Repositories;
namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes;
public interface IScrapRepository : IRepository<Scrap, long>
public interface IScrapRepository : IRepository<Scrap>
{
}

15
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/Scrap.cs

@ -1,3 +1,4 @@
using System.ComponentModel.DataAnnotations;
using Volo.Abp.Domain.Entities;
namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes;
@ -5,12 +6,14 @@ namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes;
/// <summary>
/// 报废补缴(mesout_asd)
/// </summary>
public class Scrap : Entity<long>
public class Scrap : Entity
{
[Key]
public decimal mesout_asd_id { get; set; }
/// <summary>
/// ERP接收时间
/// </summary>
public string mesout_asd_dt_w { get; set; }
public decimal mesout_asd_dt_w { get; set; }
/// <summary>
/// 类型
/// </summary>
@ -59,6 +62,12 @@ public class Scrap : Entity<long>
/// <summary>
/// 是否读取(0,1)
/// </summary>
public int Yl1 { get; set; }
public long Yl1 { get; set; }
public string Mes_Barcode { get; set; }
public override object[] GetKeys()
{
return new object[] { mesout_asd_id };
}
}

4
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/ScrapManager.cs

@ -23,8 +23,8 @@ public class ScrapManager : DomainService, IScrapManager
public virtual async Task UpdateProcessedListAsync(List<Scrap> entities)
{
var ids = entities.Select(p => p.Id);
var plans = await _repository.GetListAsync(p => ids.Contains(p.Id)).ConfigureAwait(false);
var ids = entities.Select(p => p.mesout_asd_id);
var plans = await _repository.GetListAsync(p => ids.Contains(p.mesout_asd_id)).ConfigureAwait(false);
plans.ForEach(p =>
{
p.Yl1 = 1;

4
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ProductReceiptNotes/ProductReceiptNote.cs

@ -15,7 +15,7 @@ public class ProductReceiptNote : Entity
/// <summary>
/// 物料
/// </summary>
public string mesout_patr { get; set; }
public string mesout_part { get; set; }
/// <summary>
/// 日期
/// </summary>
@ -51,6 +51,6 @@ public class ProductReceiptNote : Entity
public override object[] GetKeys()
{
return new object[] { mesout_ref_nbr + mesout_patr };
return new object[] { mesout_ref_nbr + mesout_part };
}
}

4
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Backflus/BackflusDbContextModelCreatingExtensions.cs

@ -16,7 +16,7 @@ public static class BackfluDbContextModelCreatingExtensions
b.ConfigureByConvention();
b.Property(q => q.scmout_dt_w).HasMaxLength(20);
b.Property(q => q.scmout_type).HasMaxLength(6);
b.Property(q => q.scmout_nbr).HasMaxLength(12);
b.Property(q => q.scmout_nbr).HasMaxLength(20);
b.Property(q => q.scmout_part).HasMaxLength(20);
b.Property(q => q.scmout_no).HasMaxLength(10);
b.Property(q => q.scmout_loc).HasMaxLength(10);
@ -25,6 +25,8 @@ public static class BackfluDbContextModelCreatingExtensions
b.Property(q => q.scmout_qty).HasPrecision(10, 2);
b.Property(q => q.scmout_in_loc).HasMaxLength(10);
b.Property(q => q.scmout_stat).HasMaxLength(1);
b.Property(q => q.BOMVer).HasMaxLength(50);
b.HasKey(x => new { x.scmout_type,x.scmout_nbr,x.scmout_part,x.scmout_no });
});
}

4
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/MesOut/MesOutDbContextModelCreatingExtensions.cs

@ -11,7 +11,7 @@ public static class MesOutDbContextModelCreatingExtensions
builder.Entity<MesOut>(b =>
{
//Configure table & schema Name
b.ToTable(options.TablePrefix + "mesout", options.Schema);
b.ToTable(options.TablePrefix + "mesout_wms", options.Schema);
//Configure ABP properties
b.ConfigureByConvention();
@ -28,7 +28,7 @@ public static class MesOutDbContextModelCreatingExtensions
b.Property(q => q.refno).HasMaxLength(45);
b.Property(q => q.Mesout_bad).HasPrecision(18, 2);
b.Property(q => q.Yl1);
//b.Property(q => q.Mes_Barcode).HasMaxLength(50);
});
}

6
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapDbContextModelCreatingExtensions.cs

@ -11,12 +11,12 @@ public static class ScrapDbContextModelCreatingExtensions
builder.Entity<Scrap>(b =>
{
//Configure table & schema Name
b.ToTable(options.TablePrefix + "mesout_asdwms", options.Schema);
b.ToTable(options.TablePrefix + "mesout_asd", options.Schema);
//Configure ABP properties
b.ConfigureByConvention();
//Properties
b.Property(q => q.Id).UseMySqlIdentityColumn().ValueGeneratedOnAdd().HasColumnName("mesout_asd_id");
b.Property(q => q.mesout_asd_id).HasPrecision(20);
b.Property(q => q.mesout_asd_dt_w).HasMaxLength(20);
b.Property(q => q.mesout_asd_type).HasMaxLength(5);
b.Property(q => q.Mesout_asd_part).HasMaxLength(20);
@ -30,7 +30,7 @@ public static class ScrapDbContextModelCreatingExtensions
b.Property(q => q.mesout_asd_stat).HasMaxLength(1);
b.Property(q => q.SCN).HasMaxLength(45);
b.Property(q => q.Yl1);
b.Property(q => q.Mes_Barcode).HasMaxLength(50);
});
}

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapEfCoreRepository.cs

@ -4,7 +4,7 @@ using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes;
namespace Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes;
public class ScrapEfCoreRepository : EfCoreRepository<MesDbContext, Scrap, long>, IScrapRepository
public class ScrapEfCoreRepository : EfCoreRepository<MesDbContext, Scrap>, IScrapRepository
{
public ScrapEfCoreRepository(IDbContextProvider<MesDbContext> dbContextProvider)
: base(dbContextProvider)

4
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ProductReceiptNote/ProductReceiptNoteDbContextModelCreatingExtensions.cs

@ -19,7 +19,7 @@ public static class ProductReceiptNoteDbContextModelCreatingExtensions
//b.Property(q => q.Id).HasColumnName("Mesout_ref_nbr").HasMaxLength(20);
b.Property(q => q.mesout_ref_nbr).HasMaxLength(20);
b.Property(q => q.mesout_id).HasMaxLength(1);
b.Property(q => q.mesout_patr).HasMaxLength(20);
b.Property(q => q.mesout_part).HasMaxLength(20);
b.Property(q => q.mesout_date).HasMaxLength(8);
b.Property(q => q.mesout_move).HasPrecision(18, 2);
b.Property(q => q.mesout_unable).HasPrecision(18, 2);
@ -28,7 +28,7 @@ public static class ProductReceiptNoteDbContextModelCreatingExtensions
b.Property(q => q.memo).HasMaxLength(45);
b.Property(q => q.refno).HasMaxLength(45);
b.Property(q => q.mesout_bad).HasPrecision(18, 2);
b.HasKey(x => new { x.mesout_ref_nbr, x.mesout_patr });
b.HasKey(x => new { x.mesout_ref_nbr, x.mesout_part });
});
}

39
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs

@ -2,9 +2,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using Castle.Components.DictionaryAdapter;
using Microsoft.Extensions.Logging;
using Volo.Abp.ObjectMapping;
using Win_in.Sfs.Basedata.Application.Contracts;
using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Wms.DataExchange.Domain;
using Win_in.Sfs.Wms.DataExchange.WMS.BackFlushNote;
using Win_in.Sfs.Wms.Store.Application.Contracts;
@ -18,13 +20,14 @@ public class BackFluConverter : IIncomingConverter
private readonly IItemBasicAppService _itemBasicAppService;
private readonly IObjectMapper _objectMapper;
private readonly ILogger<BackFluConverter> _logger;
private readonly ILocationAppService _locationAppService;
public BackFluConverter(
IIncomingToWmsManager incomingToWmsManager,
IItemBasicAppService itemBasicAppService,
IObjectMapper objectMapper,
ILogger<BackFluConverter> logger
,
IIncomingFromExternalManager incomingFromExternalManager
ILogger<BackFluConverter> logger,
IIncomingFromExternalManager incomingFromExternalManager,
ILocationAppService locationAppService
)
{
@ -33,6 +36,7 @@ public class BackFluConverter : IIncomingConverter
_objectMapper = objectMapper;
_logger = logger;
_incomingFromExternalManager = incomingFromExternalManager;
_locationAppService = locationAppService;
}
public virtual async Task ConvertAsync(List<IncomingFromExternal> incomingFromExternalList)
{
@ -66,12 +70,41 @@ public class BackFluConverter : IIncomingConverter
incomingToWms.SetEffectiveDate(first.EffectiveDate);
var exchangeBack = JsonSerializer.Deserialize<BackFlushNoteExchangeDto>(first.DestinationDataContent);
var wmsBack = _objectMapper.Map<BackFlushNoteExchangeDto, BackFlushNoteEditInput>(exchangeBack);
var item1 = await _itemBasicAppService.GetByCodeAsync(wmsBack.ItemCode).ConfigureAwait(false);
if (item1 != null)
{
wmsBack.ItemName = item1.Name;
wmsBack.Uom = item1.BasicUom;
}
else
{
wmsBack.ItemName = "";
wmsBack.Uom = "";
}
wmsBack.Details = new List<BackFlushNoteDetailInput>();
foreach (var incomingFromExternal in group.ToList())
{
var back = JsonSerializer.Deserialize<BackFlushNoteExchangeDto>(incomingFromExternal.DestinationDataContent);
var wmsBackDetail = _objectMapper.Map<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>(back.Detail);
wmsBackDetail.Lot = "";
var item = await _itemBasicAppService.GetByCodeAsync(wmsBackDetail.ItemCode).ConfigureAwait(false);
if (item != null)
{
wmsBackDetail.ItemName = item.Name;
wmsBackDetail.Uom = item.BasicUom;
}
else
{
wmsBackDetail.ItemName = "";
wmsBackDetail.Uom = "";
}
var typesAndErpCodeAsync = await _locationAppService.GetListByTypesAndErpCodeAsync(new EditableList<EnumLocationType>() { EnumLocationType.WIP }, wmsBackDetail.LocationErpCode).ConfigureAwait(false);
var loctioncode = typesAndErpCodeAsync.First();
wmsBackDetail.LocationCode = loctioncode.Code;
wmsBackDetail.WarehouseCode = loctioncode.WarehouseCode;
wmsBackDetail.LocationArea = loctioncode.AreaCode;
wmsBackDetail.LocationGroup = loctioncode.LocationGroupCode;
wmsBack.Details.Add(wmsBackDetail);
}
incomingToWms.DataContent = JsonSerializer.Serialize(wmsBack);

3
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs

@ -34,8 +34,7 @@ public class BackFluReader : IReader
public virtual async Task<List<IncomingFromExternal>> ReadAsync()
{
//从Tyrp读取待处理bom
var BackFull = await _ibackfluManager.GetToBeProcessedListAsync().ConfigureAwait(false);
var toBeProcessedBack = BackFull.Where(p => p.scmout_stat == "Y").ToList();
var toBeProcessedBack = await _ibackfluManager.GetToBeProcessedListAsync().ConfigureAwait(false);
if (!toBeProcessedBack.Any())
{
_logger.LogInformation("no backflus");

42
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs

@ -34,13 +34,13 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
Logger.LogInformation($"{Incoming} is not active!");
return;
}
//Logger.LogInformation($"Read MesOut");//缴库
//var mesOutReader = workerContext.ServiceProvider.GetRequiredService<MesOutReader>();
//var mesOutConverter = workerContext.ServiceProvider.GetRequiredService<MesOutConverter>();
////读取并保存MesOut
//var mesOutsFromExternalList = await mesOutReader.ReadAsync().ConfigureAwait(false);
////转换MesOut
//await mesOutConverter.ConvertAsync(mesOutsFromExternalList).ConfigureAwait(false);
Logger.LogInformation($"Read MesOut");//缴库
var mesOutReader = workerContext.ServiceProvider.GetRequiredService<MesOutReader>();
var mesOutConverter = workerContext.ServiceProvider.GetRequiredService<MesOutConverter>();
//读取并保存MesOut
var mesOutsFromExternalList = await mesOutReader.ReadAsync().ConfigureAwait(false);
//转换MesOut
await mesOutConverter.ConvertAsync(mesOutsFromExternalList).ConfigureAwait(false);
//Logger.LogInformation($"Read PullTask");//拉动任务
//var pullTaskReader = workerContext.ServiceProvider.GetRequiredService<PullTaskReader>();
@ -49,14 +49,14 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
//var pullTaskFromExternalList = await pullTaskReader.ReadAsync().ConfigureAwait(false);
////转换PullTask
//await pullTaskConverter.ConvertAsync(pullTaskFromExternalList).ConfigureAwait(false);
Logger.LogInformation($"Read Scrap");
//Logger.LogInformation($"Read Scrap");
var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
//读取并保存Scrap
var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
//转换Scrap
await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
//var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
//var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
////读取并保存Scrap
//var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
////转换Scrap
//await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
//Logger.LogInformation($"Read Issue");
//var pckHandleService = workerContext.ServiceProvider.GetRequiredService<IssueReader>();
@ -66,13 +66,13 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
////转换Pck
//await pckConverter.ConvertAsync(pcksFromExternalList).ConfigureAwait(false);
//Logger.LogInformation($"Read BackFlush");//耗用单
//var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
//var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
////读取并保存Customer
//var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false);
////转换Customer
//await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false);
Logger.LogInformation($"Read BackFlush");//耗用单
var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
//读取并保存BackFlush
var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false);
//转换BackFlush
await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false);
Logger.LogInformation($"Completed: Handling {Incoming}");
}

3
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs

@ -75,10 +75,9 @@ public class MesOutConverter : IIncomingConverter
incomingToWms.SetEffectiveDate(first.EffectiveDate);
var exchangeProductReceiptNote = JsonSerializer.Deserialize<ProductReceiptNoteExchangeDto>(first.DestinationDataContent);
var wmsProductReceiptNote = _objectMapper.Map<ProductReceiptNoteExchangeDto, ProductReceiptNoteEditInput>(exchangeProductReceiptNote);
wmsProductReceiptNote.WorkShop = "";//车间
wmsProductReceiptNote.WorkShop = "";//车间
wmsProductReceiptNote.Worker = _configuration["Authentication:username"];//操作人
wmsProductReceiptNote.ReceiptType = EnumReceiptType.MesScanReceipt;//完工收货方式
wmsProductReceiptNote.WarehouseCode = "";
wmsProductReceiptNote.Details = new List<ProductReceiptNoteDetailInput>();
foreach (var incomingFromExternal in group.ToList())

3
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapConverter.cs

@ -80,8 +80,7 @@ public class ScrapConverter : IIncomingConverter
var scrap = JsonSerializer.Deserialize<ScrapNoteExchangeDto>(incomingFromExternal.DestinationDataContent);
var wmsScrapDetail = _objectMapper.Map<ScrapNoteDetailExchangeDto, ScrapNoteDetailInput>(scrap.Detail);
wmsScrapDetail.ToPackingCode = "";
wmsScrapDetail.ToLot = "";
//wmsScrapDetail.ToStatus = EnumInventoryStatus.OK;
wmsScrapDetail.ToLot = "";
wmsScrapDetail.FromPackingCode = "";
wmsScrapDetail.FromLot = "";
wmsScrapDetail.FromWarehouseCode = "";

4
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapReader.cs

@ -80,8 +80,8 @@ public class ScrapReader : IReader
DataType = EnumIncomingDataType.Scrap.ToString(),
DataAction = EnumExchangeDataAction.Add,
SourceSystem = EnumSystemType.MES.ToString(),
SourceDataId = scrap.Id.ToString(),
SourceDataGroupCode = scrap.Id.ToString(),
SourceDataId = scrap.mesout_asd_id.ToString(),
SourceDataGroupCode = scrap.mesout_asd_id.ToString(),
SourceDataDetailCode = scrap.Mesout_asd_part,
SourceDataContent = JsonSerializer.Serialize(scrap),
WriteTime = DateTime.Now,

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/MesAgentModule.cs

@ -100,7 +100,7 @@ public class MesAgentModule : AbpModule
Configure<AbpDbContextOptions>(options =>
{
options.UseSqlServer();
options.UseMySQL<MesDbContext>();
options.UseSqlServer<MesDbContext>();
});
}

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs

@ -76,7 +76,7 @@ public class ProductReceiptNoteConverter : IOutgoingConverter
{
mesout_ref_nbr = exchangeProductReceiptNote.Number,
mesout_id = string.IsNullOrEmpty(detail.RawLocationCode)?"": detail.RawLocationCode,
mesout_patr = detail.ItemCode,
mesout_part = detail.ItemCode,
mesout_date = exchangeProductReceiptNote.ActiveDate.ToString("yyyyMMdd"),
mesout_bad = detail.ReturnQty,
mesout_move = detail.ReturnQty != 0 ? 0 : detail.Qty,

Loading…
Cancel
Save