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

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json

@@ -1,12 +1,12 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
+    "Default": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
-    "DataExchange": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_DataExchange_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
+    "DataExchange": "Server=10.164.233.6;Database=WMS_DongYang_DataExchange_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
-    "EOS": "Server=10.164.0.224;Database=EOSNEV;Uid=wms;Pwd=1;TrustServerCertificate=True"
+    "EOS": "Server=61.139.155.47;Database=EOSNEV;Uid=wms;Pwd=1;TrustServerCertificate=True"
   },
 
   "AuthServer": {
-    "Authority": "http://dev.ccwin-in.com:60083/",
+    "Authority": "http://10.164.233.5:60083/",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "admin",
     "SwaggerClientSecret": "1q2w3E*",
@@ -25,13 +25,13 @@
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      "BaseUrl": "http://10.164.233.5:60084/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:60085/"
+      "BaseUrl": "http://localhost:59095/"
     },
     "Label": {
-      "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      "BaseUrl": "http://10.164.233.5:60082/"
     }
   },
   "EosOptions": {

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

@@ -53,20 +53,19 @@ public class ErpLocationItemConverter : IIncomingConverter
     {
         await Task.CompletedTask.ConfigureAwait(false);
         var incomingToWmsList = new List<IncomingToWms>();
-        var groups = incomingDataList.GroupBy(p => p.SourceDataGroupCode);
+       // var groups = incomingDataList.GroupBy(p => p.SourceDataGroupCode);
-        foreach (var group in groups)
+        foreach (var detail  in incomingDataList)
         {
-            var first = group.First();
             var incomingToWms = new IncomingToWms()
             {
-                DataType = first.DataType,
+                DataType = detail.DataType,
-                DataAction = first.DataAction,
+                DataAction = detail.DataAction,
-                SourceSystem = first.SourceSystem,
+                SourceSystem = detail.SourceSystem,
-                DataIdentityCode = first.SourceDataGroupCode,
+                DataIdentityCode = detail.SourceDataGroupCode,
             };
             incomingToWms.SetId(_guidGenerator.Create());
-            incomingToWms.SetEffectiveDate(first.EffectiveDate);
+            incomingToWms.SetEffectiveDate(detail.EffectiveDate);
-            var exchangeErpLocationItem = JsonSerializer.Deserialize<ErpLocationItemExchangeDto>(first.DestinationDataContent);
+            var exchangeErpLocationItem = JsonSerializer.Deserialize<ErpLocationItemExchangeDto>(detail.DestinationDataContent);
             var wmsErpLocationItem = _objectMapper.Map<ErpLocationItemExchangeDto, ErpLocationItemEditInput>(exchangeErpLocationItem);
             incomingToWms.DataContent = JsonSerializer.Serialize(wmsErpLocationItem);
             incomingToWmsList.Add(incomingToWms);

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json

@@ -1,13 +1,13 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True",
+    "Default": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True",
-    "DataExchange": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_DataExchange_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True"
+    "DataExchange": "Server=10.164.233.6;Database=WMS_DongYang_DataExchange_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True"
   },
 
 
 
   "AuthServer": {
-    "Authority": "http://dev.ccwin-in.com:60083/",
+    "Authority": "http://10.164.233.5:60083/",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "admin",
     "SwaggerClientSecret": "1q2w3E*",
@@ -26,16 +26,16 @@
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      "BaseUrl": "http://10.164.233.5:60084/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:60085/"
+      "BaseUrl": "http://localhost:59095/"
     },
     "Label": {
-      "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      "BaseUrl": "http://10.164.233.5:60082/"
     },
     "Auth": {
-      "BaseUrl": "http://dev.ccwin-in.com:60083/"
+      "BaseUrl": "http://10.164.233.5:60083/"
     }
   },
   "DataExchangeOptions": {
@@ -44,7 +44,7 @@
       "PeriodSeconds": 10,
       "RetryTimes": 1,
       "BatchSize": 100,
-      "apiUrl": "http://dev.ccwin-in.com:60085/"
+      "apiUrl": "http://10.164.233.5:60085/"
     },
     "OutgoingOptions": {
       "Active": false,

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/CountJobController.cs

@@ -105,10 +105,10 @@ public class CountJobController : AbpController
     /// </summary>
     /// <param name="jobNumber"></param>
     /// <returns></returns>
-    [HttpGet("by-number/{jobNumber}")]
+    [HttpGet("by-number")]
     public virtual async Task<ActionResult<CountJobDTO>> GetByNumberAsync(string jobNumber)
     {
-        var jobDto = await _countJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false);
+        var jobDto = await _countJobAppService.GetByNumber2Async(jobNumber).ConfigureAwait(false);
         if (jobDto == null)
         {
             throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务");

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/ICountJobAppService.cs

@@ -15,4 +15,5 @@ public interface ICountJobAppService
     Task CloseByCountPlanAsync(string countPlanNumber);
     Task<List<CountJob>> GetCountJobDependentDetailByPlanNumber(string countPlanNumber,int inventoryStage);
     Task<List<CountJobDTO>> ResetStatusByNumberAsync(List<string> numbers);
+    Task<CountJobDTO> GetByNumber2Async(string number);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/CountJobs/CountJobAppService.cs

@@ -11,6 +11,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Volo.Abp;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.ObjectMapping;
 using Volo.Abp.Validation;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Application.Contracts;
@@ -325,6 +326,14 @@ public class CountJobAppService
         }
         return entities;
     }
+
+    [HttpPost("get-by-number-2")]
+    public async Task<CountJobDTO> GetByNumber2Async(string number)
+    {
+        var entity = await _repository.FirstOrDefaultAsync(p => p.Number == number).ConfigureAwait(false);
+
+        return ObjectMapper.Map<CountJob, CountJobDTO>(entity);
+    }
     //[HttpPost("handle-count-job-async")]
     //public virtual async Task HandleCountJobAsync(Guid guid, CountJobDTO dto)
     //{