1.MES接口修改

2.pda增加零件模糊查询接口

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Qtyrfe/Qtyrfe.cs

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

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Qtyrfe/QtyrfeManager.cs

@@ -21,8 +21,8 @@ public class QtyrfeManager : DomainService, IQtyrfeManager
     }
     public virtual async Task UpdateProcesseErrordListAsync(List<Qtyrfe> entities)
     {
-        var ids = entities.Select(p => p.mesout_qtyrfe_id);
-        var plans = await _repository.GetListAsync(p => ids.Contains(p.mesout_qtyrfe_id)).ConfigureAwait(false);
+        var ids = entities.Select(p => p.ID);
+        var plans = await _repository.GetListAsync(p => ids.Contains(p.ID)).ConfigureAwait(false);
         plans.ForEach(p =>
         {
             p.Yl1 = 2;
@@ -32,8 +32,8 @@ public class QtyrfeManager : DomainService, IQtyrfeManager
     }
     public virtual async Task UpdateProcessedListAsync(List<Qtyrfe> entities)
     {
-        var ids = entities.Select(p => p.mesout_qtyrfe_id);
-        var plans = await _repository.GetListAsync(p => ids.Contains(p.mesout_qtyrfe_id)).ConfigureAwait(false);
+        var ids = entities.Select(p => p.ID);
+        var plans = await _repository.GetListAsync(p => ids.Contains(p.ID)).ConfigureAwait(false);
         plans.ForEach(p =>
         {
             p.Yl1 = 1;

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Qtyrfe/QtyrfeDbContextModelCreatingExtensions.cs

@@ -15,7 +15,7 @@ public static class QtyrfeDbContextModelCreatingExtensions
             b.ConfigureByConvention();
 
             //Properties
-            b.Property(q => q.mesout_qtyrfe_id).HasMaxLength(20);
+            b.Property(q => q.ID);
             b.Property(q => q.mesout_qtyrfe_part).HasMaxLength(20);
             b.Property(q => q.mesout_qtyrfe_loc_from).HasMaxLength(10);
             b.Property(q => q.mesout_qtyrfe_loc_to).HasMaxLength(10);

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/QtyrfeReader.cs

@@ -80,8 +80,8 @@ public class QtyrfeReader : IReader
             DataType = EnumIncomingDataType.TransferNote.ToString(),
             DataAction = EnumExchangeDataAction.Add,
             SourceSystem = EnumSystemType.MES.ToString(),
-            SourceDataId = Qtyrfe.mesout_qtyrfe_id.ToString(),
-            SourceDataGroupCode = Qtyrfe.mesout_qtyrfe_id,
+            SourceDataId = Qtyrfe.ID.ToString(),
+            SourceDataGroupCode = Qtyrfe.ID.ToString(),
             SourceDataDetailCode = Qtyrfe.mesout_qtyrfe_part,
             SourceDataContent = JsonSerializer.Serialize(Qtyrfe),
             WriteTime = DateTime.Now,

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/ItemController.cs

@@ -1,8 +1,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Application.Dtos;
 using Volo.Abp.AspNetCore.Mvc;
 using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
 
 namespace Win_in.Sfs.Wms.Pda.Controllers.BaseDatas;
 
@@ -55,4 +57,30 @@ public class ItemController : AbpController
 
         return dtos;
     }
+    /// <summary>
+    /// 按零件号模糊查询
+    /// </summary>
+    /// <param name="itemCode"></param>
+    /// <param name="pageSize"></param>
+    /// <param name="pageIndex"></param>
+    /// <param name="sortBy"></param>
+    /// <returns></returns>
+    [HttpGet("get-fuzzy")]
+    public virtual async Task<PagedResultDto<ItemBasicDTO>> GetListAsync( string itemCode, int pageSize,int pageIndex,string sortBy)
+    {
+        var input = new SfsBaseDataRequestInputBase
+        {
+            MaxResultCount = pageSize,
+            SkipCount = (pageIndex - 1) * pageSize,
+            Sorting = sortBy,
+            Condition = new Condition { Filters = new List<Filter>() }
+        };
+        if (!string.IsNullOrWhiteSpace(itemCode))
+        {
+            input.Condition.Filters.Add(new Filter("Code", itemCode, EnumFilterAction.Like.ToString()));
+        }
+        var itemDTOs = await _itemBasicAppService.GetPagedListByFilterAsync(input, false).ConfigureAwait(false);
+
+        return itemDTOs;
+    }
 }