From 359ba4ff99244b2c02c3a095cdd1dd56fcf25f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Mon, 30 Dec 2024 15:26:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A2=E6=88=B7=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Jobs/AgvJobs/AgvJobOutputService.cs       | 25 +++----------
 .../CustomerProductionReturnNoteAppService.cs | 36 ++++++++++---------
 2 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/AgvJobs/AgvJobOutputService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/AgvJobs/AgvJobOutputService.cs
index 0a4fa332a..63908b2f6 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/AgvJobs/AgvJobOutputService.cs
+++ b/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")]
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs
index 2af06fcc7..71d460828 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs
@@ -96,33 +96,35 @@ public class CustomerProductionReturnNoteAppService :
             throw new UserFriendlyException($"未{entity.CustomerCode}查到客户信息!");
         }
 
+       var parts= input.Details.Select(itm => itm.ItemCode).Distinct();
+
+        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修改
 
-             /// <summary>
-             /// 客户名称
-             /// </summary>
-    
 
 
 
-       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()
+        var checkPart = from itm in entity.Details.ToList()
                     join itm1 in custitmDetail
                     on itm.ItemCode equals itm1.ItemCode
                     into temp