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

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

@@ -111,7 +111,7 @@ public class MesOutReader : IReader
             DataAction = EnumExchangeDataAction.Add,
             SourceSystem = EnumSystemType.MES.ToString(),
             SourceDataId = mesOut.Mesout_ref_nbr.ToString(),
-            SourceDataGroupCode = mesOut.Mesout_ref_nbr.ToString(),
+            SourceDataGroupCode = mesOut.Mesout_loc.ToString(),
             SourceDataDetailCode = mesOut.Mesout_part,
             SourceDataContent = JsonSerializer.Serialize(mesOut),
             WriteTime = DateTime.Now,

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictpjReader.cs

@@ -83,8 +83,8 @@ public class DictpjReader : IReader
             DataType = EnumIncomingDataType.Dict.ToString(),
             DataAction = EnumExchangeDataAction.Add,
             SourceSystem = EnumSystemType.ERP.ToString(),
-            SourceDataId = dict.pjtmout_desc,
+            SourceDataId = dict.pjtmout_id,
-            SourceDataGroupCode = dict.pjtmout_id,
+            SourceDataGroupCode = EnumDictType.CaseCode.ToString(),
             SourceDataDetailCode = dict.pjtmout_desc,
             SourceDataContent = JsonSerializer.Serialize(dict),
             WriteTime = DateTime.Now,

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs

@@ -26,7 +26,6 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase
     /// 单位
     /// </summary>
     [Display(Name = "单位")]
-    [Required(ErrorMessage = "单位不能为空")]
     public string Uom { get; set; }
 
     /// <summary>
@@ -40,6 +39,7 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase
     /// 专案
     /// </summary>
     [Display(Name = "专案")]
+    [Required(ErrorMessage = "专案不能为空")]
     public string CaseCode { get; set; }
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs

@@ -26,7 +26,6 @@ public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase
     /// 单位
     /// </summary>
     [Display(Name = "单位")]
-    [Required(ErrorMessage = "单位不能为空")]
     public string Uom { get; set; }
 
     /// <summary>
@@ -40,6 +39,7 @@ public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase
     /// 专案
     /// </summary>
     [Display(Name = "专案")]
+    [Required(ErrorMessage = "专案不能为空")]
     public string CaseCode { get; set; }
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestManager.cs

@@ -1,20 +1,26 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
+using Volo.Abp;
+using Win_in.Sfs.Basedata.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
 public class UnplannedIssueRequestManager : SfsStoreRequestManagerBase<UnplannedIssueRequest, UnplannedIssueRequestDetail>, IUnplannedIssueRequestManager
 {
-    public readonly IUnplannedIssueRequestRepository _repository;
+    private readonly IUnplannedIssueRequestRepository _repository;
+    private readonly IDictAppService _dictAppService;
+    private readonly IItemBasicAppService _itemBasicAppService;
 
     //public readonly  _repository;
     //public readonly IUnplannedIssueRequestRepository _repository;
 
     public UnplannedIssueRequestManager(
-        IUnplannedIssueRequestRepository repository
+        IUnplannedIssueRequestRepository repository, IDictAppService dictAppService, IItemBasicAppService itemBasicAppService) : base(repository)
-        ) : base(repository)
     {
         _repository = repository;
+        _dictAppService = dictAppService;
+        _itemBasicAppService = itemBasicAppService;
     }
 
     /// <summary>
@@ -29,4 +35,26 @@ public class UnplannedIssueRequestManager : SfsStoreRequestManagerBase<Unplanned
 
         await CreateManyAsync(mergeEntities).ConfigureAwait(false);
     }
+
+    public override async Task<List<UnplannedIssueRequest>> CreateManyAsync(List<UnplannedIssueRequest> entities)
+    {
+        var dictDto = await _dictAppService.GetByCodeAsync("CaseCode").ConfigureAwait(false);
+
+        foreach (var entity in entities)
+        {
+            foreach (var unplannedIssueRequestDetail in entity.Details)
+            {
+                var flag = dictDto.Items.ToList().FirstOrDefault(p => p.Value == unplannedIssueRequestDetail.CaseCode);
+                if (flag == null)
+                {
+                    throw new UserFriendlyException($"【{unplannedIssueRequestDetail.CaseCode}】专案不存在");
+                }
+
+                var itemBasicDto= await _itemBasicAppService.GetByCodeAsync(unplannedIssueRequestDetail.ItemCode).ConfigureAwait(false);
+                unplannedIssueRequestDetail.Uom = itemBasicDto.BasicUom;
+            }
+        }
+
+        return await base.CreateManyAsync(entities).ConfigureAwait(false);
+    }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestManager.cs

@@ -1,20 +1,26 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
+using Volo.Abp;
+using Win_in.Sfs.Basedata.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
 public class UnplannedReceiptRequestManager : SfsStoreRequestManagerBase<UnplannedReceiptRequest, UnplannedReceiptRequestDetail>, IUnplannedReceiptRequestManager
 {
-    public readonly IUnplannedReceiptRequestRepository _repository;
+    private readonly IUnplannedReceiptRequestRepository _repository;
+    private readonly IDictAppService _dictAppService;
+    private readonly IItemBasicAppService _itemBasicAppService;
 
     //public readonly  _repository;
     //public readonly IUnplannedReceiptRequestRepository _repository;
 
     public UnplannedReceiptRequestManager(
-        IUnplannedReceiptRequestRepository repository
+        IUnplannedReceiptRequestRepository repository, IDictAppService dictAppService, IItemBasicAppService itemBasicAppService) : base(repository)
-        ) : base(repository)
     {
         _repository = repository;
+        _dictAppService = dictAppService;
+        _itemBasicAppService = itemBasicAppService;
     }
 
     /// <summary>
@@ -30,4 +36,25 @@ public class UnplannedReceiptRequestManager : SfsStoreRequestManagerBase<Unplann
         await CreateManyAsync(mergeEntities).ConfigureAwait(false);
     }
 
+    public override async Task<List<UnplannedReceiptRequest>> CreateManyAsync(List<UnplannedReceiptRequest> entities)
+    {
+        var dictDto= await _dictAppService.GetByCodeAsync("CaseCode").ConfigureAwait(false);
+
+        foreach (var entity in entities)
+        {
+            foreach (var unplannedReceiptRequestDetail in entity.Details)
+            {
+                var flag= dictDto.Items.ToList().FirstOrDefault(p => p.Value == unplannedReceiptRequestDetail.CaseCode);
+                if (flag == null)
+                {
+                    throw new UserFriendlyException($"【{unplannedReceiptRequestDetail.CaseCode}】专案不存在");
+                }
+
+                var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(unplannedReceiptRequestDetail.ItemCode).ConfigureAwait(false);
+                unplannedReceiptRequestDetail.Uom = itemBasicDto.BasicUom;
+            }
+        }
+
+        return await base.CreateManyAsync(entities).ConfigureAwait(false);
+    }
 }