Browse Source

零件接口修改

集成Redis
lvzb 2 years ago
parent
commit
d94d31a8eb
  1. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/ItemBasicConverter.cs
  2. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemBasic/ItemBasicExchangeDto.cs
  3. 1
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/Items/ItemBasicEfCoreRepository.cs

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/ItemBasicConverter.cs

@ -7,6 +7,7 @@ using Microsoft.Extensions.Logging;
using Volo.Abp.Guids; using Volo.Abp.Guids;
using Volo.Abp.ObjectMapping; using Volo.Abp.ObjectMapping;
using Win_in.Sfs.Basedata.Application.Contracts; 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.Domain;
using Win_in.Sfs.Wms.DataExchange.WMS.ItemBasic; using Win_in.Sfs.Wms.DataExchange.WMS.ItemBasic;
@ -69,6 +70,7 @@ public class ItemBasicConverter : IIncomingConverter
incomingToWms.SetEffectiveDate(item.EffectiveDate); incomingToWms.SetEffectiveDate(item.EffectiveDate);
var exchangeItemBasicRequest = JsonSerializer.Deserialize<ItemBasicExchangeDto>(item.DestinationDataContent); var exchangeItemBasicRequest = JsonSerializer.Deserialize<ItemBasicExchangeDto>(item.DestinationDataContent);
var wmsMaterialRequest = _objectMapper.Map<ItemBasicExchangeDto, ItemBasicEditInput>(exchangeItemBasicRequest); var wmsMaterialRequest = _objectMapper.Map<ItemBasicExchangeDto, ItemBasicEditInput>(exchangeItemBasicRequest);
wmsMaterialRequest.ValidityUnit = EnumValidityUnit.Infinite;
incomingToWms.DataContent = JsonSerializer.Serialize(wmsMaterialRequest); incomingToWms.DataContent = JsonSerializer.Serialize(wmsMaterialRequest);
incomingToWmsList.Add(incomingToWms); incomingToWmsList.Add(incomingToWms);
} }

4
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemBasic/ItemBasicExchangeDto.cs

@ -89,13 +89,13 @@ public class ItemBasicExchangeDto
ItemBasicExchangeDto itembasic = obj as ItemBasicExchangeDto; ItemBasicExchangeDto itembasic = obj as ItemBasicExchangeDto;
return Code == itembasic.Code && Desc1 == itembasic.Desc1 && Desc2 == itembasic.Desc2 && Configuration == itembasic.Configuration && Type == itembasic.Type && return Code == itembasic.Code && Desc1 == itembasic.Desc1 && Desc2 == itembasic.Desc2 && Configuration == itembasic.Configuration && Type == itembasic.Type &&
CanMake == itembasic.CanMake && CanBuy == itembasic.CanBuy && CanOutsourcing == itembasic.CanOutsourcing && IsRecycled == itembasic.IsRecycled && CanMake == itembasic.CanMake && CanBuy == itembasic.CanBuy && CanOutsourcing == itembasic.CanOutsourcing && IsRecycled == itembasic.IsRecycled &&
BasicUom == itembasic.BasicUom; BasicUom == itembasic.BasicUom&& StdPackQty==itembasic.StdPackQty;
} }
return false; return false;
} }
public override int GetHashCode() public override int GetHashCode()
{ {
return Code.GetHashCode() ^ (Desc1 == null ? 0 : Desc1.GetHashCode()) ^ (Desc2 == null ? 0 : Desc2.GetHashCode()) ^ (Configuration == null ? 0 : Configuration.GetHashCode()) ^ (Type == null ? 0 : Type.GetHashCode()) ^ CanMake.GetHashCode() ^ CanBuy.GetHashCode() ^ CanOutsourcing.GetHashCode() ^ IsRecycled.GetHashCode() ^ BasicUom.GetHashCode(); return Code.GetHashCode() ^ (Desc1 == null ? 0 : Desc1.GetHashCode()) ^ (Desc2 == null ? 0 : Desc2.GetHashCode()) ^ (Configuration == null ? 0 : Configuration.GetHashCode()) ^ (Type == null ? 0 : Type.GetHashCode()) ^ CanMake.GetHashCode() ^ CanBuy.GetHashCode() ^ CanOutsourcing.GetHashCode() ^ IsRecycled.GetHashCode() ^ BasicUom.GetHashCode() ^ StdPackQty.GetHashCode();
} }
} }

1
be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/Items/ItemBasicEfCoreRepository.cs

@ -22,6 +22,7 @@ public class ItemBasicEfCoreRepository : SfsBaseDataEfCoreRepositoryBase<Basedat
} }
else else
{ {
exist.StdPackQty=entity.StdPackQty;
exist.Name = entity.Name; exist.Name = entity.Name;
exist.Desc1 = entity.Desc1; exist.Desc1 = entity.Desc1;
exist.Desc2 = entity.Desc2; exist.Desc2 = entity.Desc2;

Loading…
Cancel
Save