Browse Source

自动叫料接口修改

dev_DY_CC
lvzb 10 months ago
parent
commit
b71d31b0be
  1. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/CallMtl/CallMtl.cs
  2. 8
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/CallMtl/CallMtlManager.cs
  3. 3
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/CallMtl/CallMtlDbContextModelCreatingExtensions.cs
  4. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/CallMtlReader.cs
  5. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs
  6. 4
      be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumIssueRequestType.cs

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

@ -8,7 +8,7 @@ public class CallMtl : Entity
/// 序号 /// 序号
/// </summary> /// </summary>
[Key] [Key]
public string mesout_callmtl_id { get; set; } public long ID { get; set; }
/// <summary> /// <summary>
/// 物料 /// 物料
/// </summary> /// </summary>
@ -33,7 +33,7 @@ public class CallMtl : Entity
public override object[] GetKeys() public override object[] GetKeys()
{ {
return new object[] { mesout_callmtl_id }; return new object[] { ID };
} }
} }

8
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/CallMtl/CallMtlManager.cs

@ -20,8 +20,8 @@ public class CallMtlManager : DomainService, ICallMtlManager
} }
public virtual async Task UpdateProcesseErrordListAsync(List<CallMtl> entities) public virtual async Task UpdateProcesseErrordListAsync(List<CallMtl> entities)
{ {
var ids = entities.Select(p => p.mesout_callmtl_id); var ids = entities.Select(p => p.ID);
var plans = await _repository.GetListAsync(p => ids.Contains(p.mesout_callmtl_id)).ConfigureAwait(false); var plans = await _repository.GetListAsync(p => ids.Contains(p.ID)).ConfigureAwait(false);
plans.ForEach(p => plans.ForEach(p =>
{ {
p.Yl1 = 2; p.Yl1 = 2;
@ -31,8 +31,8 @@ public class CallMtlManager : DomainService, ICallMtlManager
} }
public virtual async Task UpdateProcessedListAsync(List<CallMtl> entities) public virtual async Task UpdateProcessedListAsync(List<CallMtl> entities)
{ {
var ids = entities.Select(p => p.mesout_callmtl_id); var ids = entities.Select(p => p.ID);
var plans = await _repository.GetListAsync(p => ids.Contains(p.mesout_callmtl_id)).ConfigureAwait(false); var plans = await _repository.GetListAsync(p => ids.Contains(p.ID)).ConfigureAwait(false);
plans.ForEach(p => plans.ForEach(p =>
{ {
p.Yl1 = 1; p.Yl1 = 1;

3
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/CallMtl/CallMtlDbContextModelCreatingExtensions.cs

@ -15,7 +15,8 @@ public static class CallMtlDbContextModelCreatingExtensions
b.ConfigureByConvention(); b.ConfigureByConvention();
//Properties //Properties
b.Property(q => q.mesout_callmtl_id).HasMaxLength(20); // b.Property(q => q.ID).HasMaxLength(20);
b.Property(q => q.ID);
b.Property(q => q.mesout_callmtl_erpno).HasMaxLength(20); b.Property(q => q.mesout_callmtl_erpno).HasMaxLength(20);
b.Property(q => q.mesout_callmtl_loc).HasMaxLength(10); b.Property(q => q.mesout_callmtl_loc).HasMaxLength(10);
b.Property(q => q.mesout_callmtl_num).HasPrecision(10, 2); b.Property(q => q.mesout_callmtl_num).HasPrecision(10, 2);

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

@ -86,8 +86,8 @@ public class CallMtlReader : IReader
DataType = EnumIncomingDataType.CallMtl.ToString(), DataType = EnumIncomingDataType.CallMtl.ToString(),
DataAction = EnumExchangeDataAction.Add, DataAction = EnumExchangeDataAction.Add,
SourceSystem = EnumSystemType.MES.ToString(), SourceSystem = EnumSystemType.MES.ToString(),
SourceDataId = CallMtl.mesout_callmtl_id.ToString(), SourceDataId = CallMtl.ID.ToString(),
SourceDataGroupCode = CallMtl.mesout_callmtl_id, SourceDataGroupCode = CallMtl.ID.ToString(),
SourceDataDetailCode = CallMtl.mesout_callmtl_erpno, SourceDataDetailCode = CallMtl.mesout_callmtl_erpno,
SourceDataContent = JsonSerializer.Serialize(CallMtl), SourceDataContent = JsonSerializer.Serialize(CallMtl),
WriteTime = DateTime.Now, WriteTime = DateTime.Now,

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

@ -105,7 +105,7 @@ public class MesOutConverter : IIncomingConverter
//} //}
//else //else
//{ //{
wmsProductReceiptNoteDetail.Lot = ""; //排序批次 wmsProductReceiptNoteDetail.Lot = ""; //排序批次
wmsProductReceiptNoteDetail.PackingCode = "";//箱标签 wmsProductReceiptNoteDetail.PackingCode = "";//箱标签
wmsProductReceiptNoteDetail.Status = EnumInventoryStatus.OK; wmsProductReceiptNoteDetail.Status = EnumInventoryStatus.OK;
wmsProductReceiptNoteDetail.WarehouseCode = "T9"; wmsProductReceiptNoteDetail.WarehouseCode = "T9";

4
be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumIssueRequestType.cs

@ -41,8 +41,8 @@ public enum EnumIssueRequestType
ExcelImport=5, ExcelImport=5,
/// <summary> /// <summary>
/// 注塑计划 /// 涂装上线计划
/// </summary> /// </summary>
[Display(Name = "EXCEL导入")] [Display(Name = "涂装上线计划")]
InjectionPlan = 6, InjectionPlan = 6,
} }

Loading…
Cancel
Save