提交客户退货修改

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/AgvJobs/AgvJobOutputService.cs

@@ -38,13 +38,7 @@ public class AgvJobOutputService : ApplicationService
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly IOptions<AgvOptions> _options;
     private readonly ILogger<AgvJobOutputService> _logger;
-    private readonly AssembleIssueJobAppService _assembleIssueJobAppService;
-    private readonly CoatingIssueJobAppService _coatingIssueJobAppService;
-    private readonly InjectionIssueJobAppService _injectionIssueJobAppService;
-    private readonly KittingIssueJobAppService _kittingIssueJobAppService;
-    private readonly SparePartIssueJobAppService _sparePartIssueJobAppService;
-    private readonly UnplannedIssueJobAppService _unplannedIssueJobAppService;
-    private readonly UnplannedReceiptJobAppService _unplannedReceiptJobAppService;
+ 
     private readonly IOptions<AgvOptions> _agvOptions;
 
 
@@ -53,29 +47,18 @@ public class AgvJobOutputService : ApplicationService
         IHttpClientFactory httpClientFactory,
         IOptions<AgvOptions> options,
         ILogger<AgvJobOutputService> logger,
-        AssembleIssueJobAppService assembleIssueJobAppService,
-        CoatingIssueJobAppService coatingIssueJobAppService,
-        InjectionIssueJobAppService injectionIssueJobAppService,
-        KittingIssueJobAppService kittingIssueJobAppService,
-        SparePartIssueJobAppService sparePartIssueJobAppService,
-        UnplannedIssueJobAppService unplannedIssueJobAppService,
-        UnplannedReceiptJobAppService unplannedReceiptJobAppService
+        IOptions<AgvOptions> agvOptions
 
         )
     {
-        _assembleIssueJobAppService = assembleIssueJobAppService;
-        _coatingIssueJobAppService = coatingIssueJobAppService;
-        _injectionIssueJobAppService = injectionIssueJobAppService;
-        _kittingIssueJobAppService = kittingIssueJobAppService;
-        _sparePartIssueJobAppService = sparePartIssueJobAppService;
-        _unplannedIssueJobAppService = unplannedIssueJobAppService;
-        _unplannedReceiptJobAppService = unplannedReceiptJobAppService;
+    
 
 
         _logger = logger;
         _unitOfWorkManager = unitOfWorkManager;
         _httpClientFactory = httpClientFactory;
         _options = options;
+        _agvOptions = agvOptions;
     }
 
     [HttpPost("test-callagv-Coating")]

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs

@@ -96,31 +96,33 @@ public class CustomerProductionReturnNoteAppService :
             throw new UserFriendlyException($"未{entity.CustomerCode}查到客户信息!");
         }
 
+       var parts= input.Details.Select(itm => itm.ItemCode).Distinct();
 
-             /// <summary>
-             /// 客户名称
-             /// </summary>
+        var custitmDetail = await  _customerItemAppService.GetListByPartsAsync(parts.ToList()).ConfigureAwait(false);
+
+        #region 20241230修改
+        var query = from itm in custitmDetail
+                     join itm1 in custitmDetail on itm.ItemCode equals itm1.ItemCode
+                     where itm.CustomerCode != itm1.CustomerCode
+                     select itm;
+        var diff= query.ToList();
+        if (diff.Count > 0)
+        {
+            var diffparts=diff.Select(p => p.ItemCode).Distinct().ToList();
+            throw new UserFriendlyException($"零件编号{string.Join(",",diffparts)},对应多个客户不能进行退货,请查看客户零件关系表!");
+        }
+        #endregion
+        #region 20241230修改
 
 
 
 
-       var parts= input.Details.Select(itm => itm.ItemCode).Distinct();
 
-       //var ls=await IsExistCustomerItemPrice(parts.ToList(),input.CustomerCode).ConfigureAwait(false);
+        #endregion
 
-       //if (ls.Count > 0)
-       //{
-       //     throw new UserFriendlyException($"销售价格表中没有查到客户为{input.CustomerCode}零件号为{string.Join(",", ls.ToArray())}的零件关系和价格");
-       //}
 
-       //var errlist= await CheckCustomerItem(parts.ToList(), input.CustomerCode).ConfigureAwait(false);
 
-       // if (errlist.Count > 0)
-       // {
-       //     throw new UserFriendlyException($"客户零件关系表中没有查到客户为{input.CustomerCode}零件号为{string.Join(",", ls.ToArray())}的零件关系");
-       // }
 
-       var custitmDetail = await  _customerItemAppService.GetListByPartsAsync(parts.ToList()).ConfigureAwait(false);
 
         var checkPart = from itm in entity.Details.ToList()
                     join itm1 in custitmDetail