From c68b9f826bb1631fbbf327ca6b46245815ef7115 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 11 Apr 2023 10:11:10 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=92=8C=E9=83=A8=E7=BD=B2=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 44 +++++++++++++-------------------------------
 1 file changed, 13 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index ef6723d02..f0cd9bf14 100644
--- a/README.md
+++ b/README.md
@@ -1,42 +1,23 @@
 # 开发和部署方式
 
-## windows x64 下本地开发
+## 开发环境配置
 
-当前项目基于 .net 6 sdk，安装 visual studio 2022 时通常会自带
+### 软件安装
 
-### supervisor 方式开发
+1. visual studio 2022(.net 6 sdk)
+1. Docker Desktop(wsl2)
 
-1. 根据项目需求，安装 SQL Server 或 MySQL
-2. 使用 build/src/win-x64/publish/ 目录下的 dev.start.cmd 和 dev.stop.cmd 管理非数据库依赖
+### 配置文件
 
-配置文件：
+配置文件存储在build\src\docker\publish\conf 目录下，settings 目录存放程序配置文件，其他目录存放依赖配置文件
 
-1. supervisor: `build\src\win-x64\publish\supervisord\supervisor.dev.conf`
-1. nginx: `build\src\win-x64\publish\nginx\conf\nginx.conf`
-1. gateway: `build\src\win-x64\publish\gateway\appsettings.json`
-1. config: `build\src\win-x64\publish\gateway\wwwroot\settings\appsettings.json`
-1. config: `build\src\win-x64\publish\gateway\wwwroot\settings\appsettings.Development.json`
+### 依赖管理
 
-```mermaid
-flowchart LR
-nginx --localhost:21093--> gateway--localhost:59092--> api:59092
-api:59092 --localhost:6379--> redis:6379
-api:59092 --localhost:13319--> database:13319
-gateway --localhost:8086--> influxdb:8086
-```
-
-### Docker Desktop 方式开发
-
-1. 无需按照数据库
-2. 使用 build/src/docker/publish/ 目录下的 dev.start.cmd 和 dev.stop.cmd 管理依赖
+使用 build/src/docker/publish/ 目录下的 dev.start.cmd 和 dev.stop.cmd 管理依赖的停止启动，可以在Docker Desktop中查看和管理启动的服务
 
 ## 部署
 
-### windows x64 supervisor 方式部署
-
-1. 执行： `build\src\win-x64\build.cmd`
-2. 上传： `build\dist\win-x64\publish` 目录到服务器
-3. 修改配置，执行 publish 目录下的 start.cmd
+Docker 和 Windows 部署两种方式只需要按需修改配置文件中的主机名和端口，windows单机部署时使用localhost作为主机名，docker compose单机部署时使用service name 作为主机名
 
 ### docker compose 方式部署
 
@@ -44,7 +25,8 @@ gateway --localhost:8086--> influxdb:8086
 2. 上传： `build\dist\win-x64\publish` 目录到服务器
 3. 修改配置，执行 publish 目录下的 start.sh 或 start.cmd
 
-构建时的处理：
+### windows x64 方式部署
 
-1. 复制并重命名 build\src\win-x64\publish\nginx\conf 到 build\dist\docker\publish\conf\nginx，保持nginx的配置文件统一在 build\src\win-x64\publish\nginx\conf 目录维护
-1. 复制 build\src\win-x64\publish\gateway 到 build\dist\docker\publish\gateway，保持网关的配置和应用的配置统一在 build\src\win-x64\publish\gateway 目录维护
+1. 执行： `build\src\win-x64\build.cmd`
+2. 上传： `build\dist\win-x64\publish` 目录到服务器
+3. 修改配置，执行 publish 目录下的 start.cmd

From 0c8be74969d35ea471d485d7e656ecdc80d455db Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Sun, 23 Apr 2023 17:03:41 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0api/abp/application-con?=
 =?UTF-8?q?figuration=E7=9A=84api=E5=8C=85=E8=A3=85=EF=BC=9Aapi/auth/token?=
 =?UTF-8?q?/application-configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TokenService.cs                           | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/TokenService.cs b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/TokenService.cs
index c22fde641..56945a228 100644
--- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/TokenService.cs
+++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/TokenService.cs
@@ -1,9 +1,10 @@
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using IdentityModel.Client;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -11,35 +12,31 @@ using Volo.Abp.Application.Services;
 
 namespace Win_in.Sfs.Auth.Tokens;
 
-[Route($"api/token")]
+[Route($"api")]
+[Authorize]
 public class TokenService : ApplicationService
 {
+    private readonly IHttpContextAccessor _httpContextAccessor;
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly ILogger<TokenService> _logger;
     private readonly IConfiguration _configuration;
-    
 
-    public TokenService(IHttpClientFactory httpClientFactory, IConfiguration configuration, ILogger<TokenService> logger)
+    public TokenService(IHttpContextAccessor httpContextAccessor, IHttpClientFactory httpClientFactory, IConfiguration configuration, ILogger<TokenService> logger)
     {
+        this._httpContextAccessor = httpContextAccessor;
         this._httpClientFactory = httpClientFactory;
         this._configuration = configuration;
         this._logger = logger;
     }
 
-    [HttpPost]
+    [HttpPost("token")]
     [AllowAnonymous]
     public async Task<IActionResult> CreateAsync(LoginModel model)
     {
         var address = _configuration["AuthServer:Authority"];
-        var request = new DiscoveryDocumentRequest
-        {
-            Address = address,
-            Policy = new DiscoveryPolicy { RequireHttps = false }
-        };
-        var discovery = await _httpClientFactory.CreateClient().GetDiscoveryDocumentAsync(request).ConfigureAwait(false);
         var clientId = _configuration["AuthServer:ClientId"];
         var clientSecret = _configuration["AuthServer:ClientSecret"];
-        this._logger.LogInformation($"address:{address},TokenEndpoint:{discovery.TokenEndpoint},clientId:{clientId},clientSecret:{clientSecret}");
+
         var result = await _httpClientFactory.CreateClient().RequestPasswordTokenAsync(new PasswordTokenRequest
         {
             Address = $"{address.TrimEnd('/')}/connect/token",
@@ -49,11 +46,6 @@ public class TokenService : ApplicationService
             UserName = model.UserName,
             Password = model.Password
         }).ConfigureAwait(false);
-        Console.WriteLine($"Result:${(result.IsError ? result.ErrorDescription : result.AccessToken)}");
-        //if (result.RefreshToken == null)
-        //{
-        //    throw new UserFriendlyException("用户名或密码错误");
-        //}
 
         return new JsonResult(new
         {
@@ -72,18 +64,26 @@ public class TokenService : ApplicationService
         });
     }
 
-    [HttpGet("[action]")]
-    [AllowAnonymous]
-    public string Test()
+    [HttpGet("token/application-configuration")]
+    public async Task<IActionResult> ApplicationConfiguration()
     {
-        return "Test";
+        var address = _configuration["AuthServer:Authority"];
+        var url = $"{address.TrimEnd('/')}/api/abp/application-configuration";
+        var httpClient = _httpClientFactory.CreateClient();
+        var token = this._httpContextAccessor.HttpContext.Request.Headers.Authorization.ToString();
+        httpClient.DefaultRequestHeaders.Authorization = AuthenticationHeaderValue.Parse(token);
+        var response = await httpClient.GetAsync(url).ConfigureAwait(false);
+        var result = new ContentResult();
+        result.ContentType = "application/json";
+        result.Content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+        return result;
     }
 
-    [HttpGet("/token/test")]
+    [HttpGet("token/test")]
     [AllowAnonymous]
-    public string Test1()
+    public string Test()
     {
-        return "Test";
+        return "test";
     }
 }
 

From 59b1bd356cd11f1acbe6cbf1dbf37255c7fa65a3 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Sun, 23 Apr 2023 17:31:34 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dnginx=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/src/docker/publish/conf/nginx/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/src/docker/publish/conf/nginx/nginx.conf b/build/src/docker/publish/conf/nginx/nginx.conf
index ab34c37d0..09667bbbc 100644
--- a/build/src/docker/publish/conf/nginx/nginx.conf
+++ b/build/src/docker/publish/conf/nginx/nginx.conf
@@ -59,7 +59,7 @@ http {
             index index.html;
         }
 
-        location ^/api/ {
+        location ~* ^/api/ {
             proxy_pass http://proxy;
             if ($http_upgrade ~* "close") {
                 break;
@@ -81,7 +81,7 @@ http {
             index index.html;
         }
 
-        location ^/api/ {
+        location ~* ^/api/ {
             proxy_pass http://proxy;
             if ($http_upgrade ~* "close") {
                 break;

From db8189a6bcc30bb82fbbfe2c512e0a1f287e460d Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Mon, 24 Apr 2023 09:07:06 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IncomingToWmsExtensions.cs                |  1 +
 .../BackFlushNotes/BackFlushNoteAppService.cs |  1 -
 .../ItemTransformRequestAppService.cs         |  9 ++++----
 .../MaterialRequestManager.cs                 | 21 ++++++++++++-------
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs
index bc9666215..ff543a74f 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs
@@ -157,6 +157,7 @@ public static class IncomingToWmsExtensions
         var backFlush = JsonSerializer.Deserialize<BackFlushNoteEditInput>(incomingConverted.DataContent);
 
         var balanceAppService = workerContext.ServiceProvider.GetRequiredService<IBalanceAppService>();
+        
         var balanceDtos = await balanceAppService.GetRecommendBalancesAsync(new RecommendBalanceRequestInput()
         {
             Qty = backFlush.Qty,
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs
index ff86c9f94..90f9f8fd1 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs
@@ -43,5 +43,4 @@ public class BackFlushNoteAppService :
 
         return ObjectMapper.Map<List<BackFlushNote>, List<BackFlushNoteDTO>>(entities);
     }
-
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs
index ec2059cc0..c2e79752c 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ItemTransformRequests/ItemTransformRequestAppService.cs
@@ -79,6 +79,7 @@ public class ItemTransformRequestAppService :
                 var toItemBasicDto = await ItemBasicAclService.GetByCodeAsync(detail.ToItemCode).ConfigureAwait(false);
                 var balanceDto= await _balanceAppService.GetByItemLocationAndPackingAsync(detail.FromPackingCode, detail.ItemCode,
                     detail.FromLocationCode).ConfigureAwait(false);
+                var inventoryLabelDto= await _inventoryLabelAppService.GetByCodeAsync(detail.ToPackingCode).ConfigureAwait(false);
 
                 detail.FromLocationArea = fromLocationDto.AreaCode;
                 detail.FromLocationErpCode = fromLocationDto.ErpLocationCode;
@@ -90,7 +91,7 @@ public class ItemTransformRequestAppService :
                 detail.FromStatus = balanceDto.Status;
 
                 detail.ToSupplierBatch = string.Empty;
-                detail.ToLot = balanceDto.Lot;
+                detail.ToLot = inventoryLabelDto.Lot;
                 detail.ToStatus = balanceDto.Status;
 
                 detail.ToLocationArea = toLocationDto.AreaCode;
@@ -104,9 +105,9 @@ public class ItemTransformRequestAppService :
                 detail.Uom = fromItemBasicDto.BasicUom;
 
                 detail.ToItemCode = toItemBasicDto.Code;
-                detail.ToItemDesc1 = toItemBasicDto.Desc2;
-                detail.ToItemDesc2 = toItemBasicDto.Name;
-                detail.ItemName = toItemBasicDto.BasicUom;
+                detail.ToItemDesc1 = toItemBasicDto.Desc1;
+                detail.ToItemDesc2 = toItemBasicDto.Desc2;
+                detail.ToItemName = toItemBasicDto.Name;
             }
         }
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs
index 9150c5461..5d0666e85 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs
@@ -76,14 +76,25 @@ public class MaterialRequestManager
 
     private async Task SetMaterialRequestStatus(MaterialRequest materialRequest)
     {
-        if (!materialRequest.Details.All(p => p.Status == EnumStatus.Close))
+        if (materialRequest.Details.All(p => p.Status == EnumStatus.Close))
+        {
+            materialRequest.RequestStatus = EnumRequestStatus.Completed;
+        }
+        else
         {
             var issueJobs = await _issueJobRepository.GetListAsync(t => t.MaterialRequestNumber == materialRequest.Number).ConfigureAwait(false);
             if (issueJobs.Count > 0)
             {
-                if (issueJobs.All(t => t.JobStatus == EnumJobStatus.Done||t.JobStatus==EnumJobStatus.Closed||t.JobStatus==EnumJobStatus.Cancelled))
+                if (issueJobs.All(t => t.JobStatus == EnumJobStatus.Done || t.JobStatus == EnumJobStatus.Closed || t.JobStatus == EnumJobStatus.Cancelled))
                 {
-                    materialRequest.RequestStatus = EnumRequestStatus.Completed;
+                    if (materialRequest.Details.All(p => p.ReceivedQty >= p.Qty))
+                    {
+                        materialRequest.RequestStatus = EnumRequestStatus.Completed;
+                    }
+                    else
+                    {
+                        materialRequest.RequestStatus = EnumRequestStatus.Partial;
+                    }
                 }
                 else
                 {
@@ -95,10 +106,6 @@ public class MaterialRequestManager
                 materialRequest.RequestStatus = EnumRequestStatus.Partial;
             }
         }
-        else
-        {
-            materialRequest.RequestStatus = EnumRequestStatus.Completed;
-        }
     }
 
     public virtual async Task CompleteAsync(string number)

From 90514962df6a58fdb4199ecb72295c6dd60cf186 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Mon, 24 Apr 2023 09:13:18 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EosAgentModule.cs                         |  2 +-
 .../Incoming/EosIncomingBackgroundWorker.cs   | 28 ++++++++--------
 .../Incoming/ShipConverter.cs                 | 20 +++++++++---
 .../Outgoing/ArriveConverter.cs               |  6 +++-
 .../appsettings.json                          | 12 +++----
 .../Incoming/BackFluReader.cs                 |  2 +-
 .../appsettings.json                          |  6 ++--
 .../Incoming/TyrpIncomingBackgroundWorker.cs  | 29 +++++++++--------
 .../Outgoing/ProductReceiptNoteConverter.cs   |  4 +--
 .../Outgoing/TyrpOutgoingBackgroundWorker.cs  |  9 +++---
 .../TyrpAgentModule.cs                        |  2 +-
 .../appsettings.json                          |  6 ++--
 .../AgentModule.cs                            |  2 +-
 .../IncomingToWmsWorker.cs                    | 32 +++++++++----------
 .../appsettings.json                          |  4 +--
 15 files changed, 91 insertions(+), 73 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/EosAgentModule.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/EosAgentModule.cs
index 20a68644a..43fc043db 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/EosAgentModule.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/EosAgentModule.cs
@@ -165,7 +165,7 @@ public class EosAgentModule : AbpModule
     ApplicationInitializationContext context)
     {
 
-      //  context.AddBackgroundWorkerAsync<EosIncomingBackgroundWorker>();
+        context.AddBackgroundWorkerAsync<EosIncomingBackgroundWorker>();
         context.AddBackgroundWorkerAsync<EosOutgoingBackgroundWorker>();
     }
 
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs
index fb385c471..8b13c38dd 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs
@@ -43,21 +43,21 @@ public class EosIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         //转换Plan
         await planConverter.ConvertAsync(plansFromExternalList).ConfigureAwait(false);
 
-       // Logger.LogInformation($"Read Ship");
-       // var shipHandleService = workerContext.ServiceProvider.GetRequiredService<ShipReader>();
-       // var shipConverter = workerContext.ServiceProvider.GetRequiredService<ShipConverter>();
-       // //读取并保持Ship
-       // var shipsFromExternalList = await shipHandleService.ReadAsync().ConfigureAwait(false);
-       // //转换Ship
-       // await shipConverter.ConvertAsync(shipsFromExternalList).ConfigureAwait(false);
+        Logger.LogInformation($"Read Ship");
+        var shipHandleService = workerContext.ServiceProvider.GetRequiredService<ShipReader>();
+        var shipConverter = workerContext.ServiceProvider.GetRequiredService<ShipConverter>();
+        //读取并保持Ship
+        var shipsFromExternalList = await shipHandleService.ReadAsync().ConfigureAwait(false);
+        //转换Ship
+        await shipConverter.ConvertAsync(shipsFromExternalList).ConfigureAwait(false);
 
-       // Logger.LogInformation($"Read Product");
-       // var productHandleService = workerContext.ServiceProvider.GetRequiredService<ProductReader>();
-       // var productConverter = workerContext.ServiceProvider.GetRequiredService<ProductConverter>();
-       // //读取并保持Product
-       // var productsFromExternalList = await productHandleService.ReadAsync().ConfigureAwait(false);
-       //// 转换Product
-       // await productConverter.ConvertAsync(productsFromExternalList).ConfigureAwait(false);
+        Logger.LogInformation($"Read Product");
+        var productHandleService = workerContext.ServiceProvider.GetRequiredService<ProductReader>();
+        var productConverter = workerContext.ServiceProvider.GetRequiredService<ProductConverter>();
+        //读取并保持Product
+        var productsFromExternalList = await productHandleService.ReadAsync().ConfigureAwait(false);
+        // 转换Product
+        await productConverter.ConvertAsync(productsFromExternalList).ConfigureAwait(false);
 
         Logger.LogInformation($"Completed: Handling {Incoming}");
     }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs
index 433898ac7..599879719 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs
@@ -55,13 +55,13 @@ public class ShipConverter : IIncomingConverter
         var supplierAsnList = await BuildIncomingToWmsOfSupplierAsnAsync(incomingFromExternalList).ConfigureAwait(false);
         await _incomingToWmsManager.CreateManyAsync(supplierAsnList).ConfigureAwait(false);
 
-        var purchaseLabelList = BuildIncomingToWmsOfPurchaseLabelAsync(incomingFromExternalList);
+        var purchaseLabelList = await BuildIncomingToWmsOfPurchaseLabelAsync(incomingFromExternalList).ConfigureAwait(false);
         await _incomingToWmsManager.CreateManyAsync(purchaseLabelList).ConfigureAwait(false);
         //归档
         await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
     }
 
-    private List<IncomingToWms> BuildIncomingToWmsOfPurchaseLabelAsync(List<IncomingFromExternal> incomingFromExternalList)
+    private async Task<List<IncomingToWms>> BuildIncomingToWmsOfPurchaseLabelAsync(List<IncomingFromExternal> incomingFromExternalList)
     {
         var incomingToWmsList = new List<IncomingToWms>();
 
@@ -76,7 +76,7 @@ public class ShipConverter : IIncomingConverter
             };
             incomingToWms.SetEffectiveDate(incomingFromExternal.EffectiveDate);
             var exchangeAsn = JsonSerializer.Deserialize<SupplierAsnExchangeDto>(incomingFromExternal.DestinationDataContent);
-            var purchaseLabel = BuildPurchaseLabelCreateDto(exchangeAsn);
+            var purchaseLabel = await BuildPurchaseLabelCreateDto(exchangeAsn).ConfigureAwait(false);
             incomingToWms.DataContent = JsonSerializer.Serialize(purchaseLabel);
             incomingToWmsList.Add(incomingToWms);
 
@@ -85,11 +85,23 @@ public class ShipConverter : IIncomingConverter
         return incomingToWmsList;
     }
 
-    private InventoryLabelEditInput BuildPurchaseLabelCreateDto(SupplierAsnExchangeDto exchangeAsn)
+    private async Task<InventoryLabelEditInput> BuildPurchaseLabelCreateDto(SupplierAsnExchangeDto exchangeAsn)
     {
         var purchaseLabel = _objectMapper.Map<SupplierAsnDetailExchangeDto, InventoryLabelEditInput>(exchangeAsn.Detail);
         purchaseLabel.AsnNumber = exchangeAsn.Number;
         purchaseLabel.RpNumber = "";
+        var item = await _itemBasicAppService.GetByCodeAsync(purchaseLabel.ItemCode).ConfigureAwait(false);
+        if (item != null)
+        {
+            purchaseLabel.ItemName = item.Name;
+            purchaseLabel.ItemDesc1 = item.Desc1;
+
+        }
+        else
+        {
+            purchaseLabel.ItemName = "";
+            purchaseLabel.ItemDesc1 = "";
+        }
         return purchaseLabel;
     }
 
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/ArriveConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/ArriveConverter.cs
index e79c43aeb..f66228193 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/ArriveConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/ArriveConverter.cs
@@ -6,7 +6,6 @@ using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Wms.DataExchange.Domain;
 using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.EOS;
 using Win_in.Sfs.Wms.DataExchange.Domain.Shared;
-using Win_in.Sfs.Wms.DataExchange.WMS.PurchaseReceipt;
 using Win_in.Sfs.Wms.DataExchange.WMS.PutawayNote;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -76,6 +75,11 @@ public class ArriveConverter : IOutgoingConverter
     private ArriveNote BuildArrive(PutawayNoteExchangeDto exchangeReceipt)
     {
         var detail = exchangeReceipt.Detail;
+        var nulltime = Convert.ToDateTime("0001/01/01 00:00:00");
+        if (detail.ShipDate == nulltime)
+        {
+            detail.ShipDate = null;
+        }
         var arrive = new ArriveNote()
         {
             PlanBillNo = detail.PoNumber,
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json
index 2848d243d..87fb22fe9 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json
+++ b/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_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True",
-    "DataExchange": "Server=dev.ccwin-in.com,13319;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True",
+    "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
     "EOS": "Server=61.139.155.47;Database=EOSSH;Uid=wms;Pwd=1;TrustServerCertificate=True"
   },
 
   "AuthServer": {
-    "Authority": "http://dev.ccwin-in.com:60083/",
+    "Authority": "http://10.164.113.31:60083/",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "admin",
     "SwaggerClientSecret": "1q2w3E*",
@@ -25,13 +25,13 @@
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      "BaseUrl": "http://10.164.113.31:60084/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:60085/"
+      "BaseUrl": "http://10.164.113.31:60085/"
     },
     "Label": {
-      "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      "BaseUrl": "http://10.164.113.31:60082/"
     }
   },
   "EosOptions": {
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
index ce937c504..2aee237ce 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
@@ -59,7 +59,7 @@ public class BackFluReader : IReader
             try
             {
                 var bm = BuildScrapNoteOrderExchangeMes(backflu);
-                incomingData.DestinationDataContent = JsonSerializer.Serialize(backflu);
+                incomingData.DestinationDataContent = JsonSerializer.Serialize(bm);
             }
             catch (Exception ex)
             {
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/appsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/appsettings.json
index bc19028cb..16f13d97c 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/appsettings.json
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/appsettings.json
@@ -1,8 +1,8 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True",
-    "DataExchange": "Server=dev.ccwin-in.com,13319;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True",
-    "MES": "Server=10.164.1.12;Port=3306;Database=erp;Uid=wms;Pwd=123456;"
+    "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "MES": "Server=10.164.113.32,1818\\SHDB;Database=MES_SH;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True"
   },
 
   "AuthServer": {
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs
index f2b44243d..3e8197b79 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs
@@ -59,13 +59,13 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
                 common.updatedt = DateTime.Now;
                 common.isupdate = false;
 
-                //Logger.LogInformation($"Read ItemBasic");//零件
-                //var itemBasicReader = workerContext.ServiceProvider.GetRequiredService<ItemBasicReader>();
-                //var itemBasicConverter = workerContext.ServiceProvider.GetRequiredService<ItemBasicConverter>();
-                ////读取并保存itemBasic
-                //var itemBasicOutsFromExternalList = await itemBasicReader.ReadAsync().ConfigureAwait(false);
-                ////转换itemBasic
-                //await itemBasicConverter.ConvertAsync(itemBasicOutsFromExternalList).ConfigureAwait(false);
+                Logger.LogInformation($"Read ItemBasic");//零件
+                var itemBasicReader = workerContext.ServiceProvider.GetRequiredService<ItemBasicReader>();
+                var itemBasicConverter = workerContext.ServiceProvider.GetRequiredService<ItemBasicConverter>();
+                //读取并保存itemBasic
+                var itemBasicOutsFromExternalList = await itemBasicReader.ReadAsync().ConfigureAwait(false);
+                //转换itemBasic
+                await itemBasicConverter.ConvertAsync(itemBasicOutsFromExternalList).ConfigureAwait(false);
 
                 Logger.LogInformation($"Read User");//用户和部门
                 var userReader = workerContext.ServiceProvider.GetRequiredService<UserReader>();
@@ -96,13 +96,13 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
                 //转换Dict
                 await dictConverter.ConvertAsync(dictOutsFromExternalList).ConfigureAwait(false);
 
-                //Logger.LogInformation($"Read Bom");
-                //var BomReader = workerContext.ServiceProvider.GetRequiredService<BomReader>();
-                //var BomConverter = workerContext.ServiceProvider.GetRequiredService<BomConverter>();
-                ////读取并保存Bom
-                //var bomsFromExternalList = await BomReader.ReadAsync().ConfigureAwait(false);
-                ////转换Bom
-                //await BomConverter.ConvertAsync(bomsFromExternalList).ConfigureAwait(false);
+                Logger.LogInformation($"Read Bom");
+                var BomReader = workerContext.ServiceProvider.GetRequiredService<BomReader>();
+                var BomConverter = workerContext.ServiceProvider.GetRequiredService<BomConverter>();
+                //读取并保存Bom
+                var bomsFromExternalList = await BomReader.ReadAsync().ConfigureAwait(false);
+                //转换Bom
+                await BomConverter.ConvertAsync(bomsFromExternalList).ConfigureAwait(false);
 
                 Logger.LogInformation($"Read Supplier");//供应商
                 var SupplierReader = workerContext.ServiceProvider.GetRequiredService<SupplierReader>();
@@ -132,6 +132,7 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
                 common.isupdate = true;
             }
         }
+        //已经挪至MES接口，tyrp暂不启动这个接口20230424（上海东阳改）
         //Logger.LogInformation($"Read BackFlush");//耗用单
         //var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
         //var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs
index 4782151d0..9bd4316d2 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs
@@ -75,7 +75,7 @@ public class ProductReceiptNoteConverter : IOutgoingConverter
         var ret = new ProductReceiptNote()
         {
             mesout_ref_nbr = exchangeProductReceiptNote.Number,
-            mesout_id = detail.RawLocationCode,
+            mesout_id = string.IsNullOrEmpty(detail.RawLocationCode)?"": detail.RawLocationCode,
             mesout_patr = detail.ItemCode,
             mesout_date = exchangeProductReceiptNote.ActiveDate.ToString("yyyyMMdd"),
             mesout_bad = detail.ReturnQty,
@@ -83,7 +83,7 @@ public class ProductReceiptNoteConverter : IOutgoingConverter
             mesout_unable = 0,
             mesout_loc = detail.LocationErpCode,
             mesout_dt = exchangeProductReceiptNote.ActiveDate.ToString("yyyyMMdd"),
-            memo = detail.Remark,
+            memo = string.IsNullOrEmpty(detail.Remark)?"": detail.Remark,
             refno = "",
 
         };
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs
index c28ee032a..7154286ad 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs
@@ -85,10 +85,11 @@ public class TyrpOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         var deliverNoteList = await deliverNoteConvert.ConvertAsync().ConfigureAwait(false);
         await wmsoutmWriter.WriteAsync(deliverNoteList).ConfigureAwait(false);
 
-        Logger.LogInformation($"Write CustomerReturnNote");//退货单
-        var customerReturnNoteConvert = workerContext.ServiceProvider.GetRequiredService<CustomerReturnNoteConverter>();
-        var customerReturnNoteList = await customerReturnNoteConvert.ConvertAsync().ConfigureAwait(false);
-        await wmsoutmWriter.WriteAsync(customerReturnNoteList).ConfigureAwait(false);
+        //暂无此接口
+        //Logger.LogInformation($"Write CustomerReturnNote");//退货单
+        //var customerReturnNoteConvert = workerContext.ServiceProvider.GetRequiredService<CustomerReturnNoteConverter>();
+        //var customerReturnNoteList = await customerReturnNoteConvert.ConvertAsync().ConfigureAwait(false);
+        //await wmsoutmWriter.WriteAsync(customerReturnNoteList).ConfigureAwait(false);
 
         Logger.LogInformation($"Write UnplannedIssueNote");//非生产领料单
         var unplannedIssueNoteConvert = workerContext.ServiceProvider.GetRequiredService<UnplannedIssueNoteConverter>();
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/TyrpAgentModule.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/TyrpAgentModule.cs
index 215ea8659..7903cbfe5 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/TyrpAgentModule.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/TyrpAgentModule.cs
@@ -172,7 +172,7 @@ public class TyrpAgentModule : AbpModule
         ApplicationInitializationContext context)
     {
 
-        // context.AddBackgroundWorkerAsync<TyrpIncomingBackgroundWorker>();
+        context.AddBackgroundWorkerAsync<TyrpIncomingBackgroundWorker>();
         context.AddBackgroundWorkerAsync<TyrpOutgoingBackgroundWorker>();
     }
 
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json
index 4735fc6e1..aeba77ac9 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json
@@ -1,8 +1,8 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=dev.ccwin-in.com,13319;Database=Wms_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True",
-    "DataExchange": "Server=dev.ccwin-in.com,13319;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True",
-    "TYRP": "Server=dev.ccwin-in.com,13319;Database=Wms_TYRP_Dy_ShangHai;Uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True",
+    "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "TYRP": "Server=10.164.113.32,1818\\SHDB;Database=TYRP;Uid=ShWmsUser;Pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
     "SYBASE_TYRP": "Data Source=10.164.115.137; Port=5000; Database=mesdb; Uid=mesuser; Pwd=mesuser1234;Charset=cp850;" //iso_1
   },
 
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs
index 692eb9497..31b6599f3 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs
@@ -149,7 +149,7 @@ public class AgentModule : AbpModule
     public override void OnApplicationInitialization(
              ApplicationInitializationContext context)
     {
-       // context.AddBackgroundWorkerAsync<IncomingToWmsWorker>();
+        context.AddBackgroundWorkerAsync<IncomingToWmsWorker>();
         context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>();
     }
 }
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs
index e90cc02d7..907622f56 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs
@@ -79,49 +79,49 @@ public class IncomingToWmsWorker : AsyncPeriodicBackgroundWorkerBase
         switch (dataType)
         {
             case EnumIncomingDataType.Department:
-                //await incomingToWms.HandleDepartmentsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleDepartmentsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.User:
-                //await incomingToWms.HandleUsersAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleUsersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Item:
-                //await incomingToWms.HandleItemsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleItemsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Location:
                 await incomingToWms.HandleErpLocationsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Bom:
-                //await incomingToWms.HandleBomsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleBomsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Dict:
                 await incomingToWms.HandleDictsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Supplier:
-                //await incomingToWms.HandleSuppliersAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleSuppliersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.SupplierItem:
-                //await incomingToWms.HandleSupplierItemsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleSupplierItemsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.ItemPack:
-                //await incomingToWms.HandleItemPacksAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleItemPacksAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Customer:
-                //await incomingToWms.HandleCustomersAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleCustomersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.CustomerItem:
-                //await incomingToWms.HandleCustomerItemsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleCustomerItemsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.InterfaceCalendar:
-                //await incomingToWms.HandleInterfaceCalendarsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleInterfaceCalendarsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.PurchaseOrder:
-                //await incomingToWms.HandlePurchaseOrdersAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandlePurchaseOrdersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.SaleOrder:
-                //await incomingToWms.HandleSaleOrdersAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleSaleOrdersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.SupplierAsn:
-                //await incomingToWms.HandleAsnsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleAsnsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.ProductReceipt:
                 await incomingToWms.HandleProductReceiptsAsync(workerContext).ConfigureAwait(false);
@@ -130,13 +130,13 @@ public class IncomingToWmsWorker : AsyncPeriodicBackgroundWorkerBase
                 await incomingToWms.HandleMaterialRequestsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Scrap:
-                //await incomingToWms.HandleScrapsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleScrapsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.IssueConfirm:
-                //await incomingToWms.HandleIssueNoteConfirmAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleIssueNoteConfirmAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.PurchaseLabel:
-                //await incomingToWms.HandleInventoryLabelsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleInventoryLabelsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.BackFlush:
                 await incomingToWms.HandleBackFlushsAsync(workerContext).ConfigureAwait(false);
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json
index be14f7d44..f42f6248d 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json
@@ -1,7 +1,7 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=dev.ccwin-in.com,13319;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True",
-    "DataExchange": "Server=dev.ccwin-in.com,13319;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True"
+    "Default": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True"
   },
 
 

From 9abba2c941431c8f0af3f03579149625dd81f1d3 Mon Sep 17 00:00:00 2001
From: "mingliang.tang" <mingliang.tang@ccwin-in.com>
Date: Mon, 24 Apr 2023 09:57:42 +0800
Subject: [PATCH 06/13] =?UTF-8?q?MES=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Backflus/Backflu.cs                       |  9 ++--
 .../Backflus/BackfluManager.cs                |  2 +-
 .../MesOut/MesOut.cs                          |  3 +-
 .../Scraps/IScrapRepository.cs                |  2 +-
 .../Scraps/Scrap.cs                           | 15 +++++--
 .../Scraps/ScrapManager.cs                    |  4 +-
 .../ProductReceiptNotes/ProductReceiptNote.cs |  4 +-
 ...ackflusDbContextModelCreatingExtensions.cs |  4 +-
 .../MesOutDbContextModelCreatingExtensions.cs |  4 +-
 .../ScrapDbContextModelCreatingExtensions.cs  |  6 +--
 .../Scrap/ScrapEfCoreRepository.cs            |  2 +-
 ...iptNoteDbContextModelCreatingExtensions.cs |  4 +-
 .../Incoming/BackFluConverter.cs              | 39 +++++++++++++++--
 .../Incoming/BackFluReader.cs                 |  3 +-
 .../Incoming/MesIncomingBackgroundWorker.cs   | 42 +++++++++----------
 .../Incoming/MesOutConverter.cs               |  3 +-
 .../Incoming/ScrapConverter.cs                |  3 +-
 .../MesAgentModule.cs                         |  2 +-
 .../Outgoing/ProductReceiptNoteConverter.cs   |  2 +-
 19 files changed, 99 insertions(+), 54 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/Backflu.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/Backflu.cs
index ef57f4aff..ba7f8d84d 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/Backflu.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/Backflu.cs
@@ -1,6 +1,6 @@
+
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Domain.Entities;
-
 namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes;
 public class Backflu : Entity
 {
@@ -12,11 +12,12 @@ public class Backflu : Entity
     /// <summary>
     /// 单据类型
     /// </summary>
+    
     public string scmout_type { get; set; }
     /// <summary>
     /// TYRP单号
     /// </summary>
-    [Key]
+   
     public string scmout_nbr { get; set; }
     /// <summary>
     /// 料号
@@ -50,9 +51,11 @@ public class Backflu : Entity
     /// 有效码
     /// </summary>
     public string scmout_stat { get; set; }
+    //Bom版本
+    public string BOMVer { get; set; }
 
     public override object[] GetKeys()
     {
-        return new object[] {  scmout_nbr };
+        return new object[] { scmout_type + scmout_nbr + scmout_part + scmout_no };
     }
 }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/BackfluManager.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/BackfluManager.cs
index aa2e1a195..125d97b3b 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/BackfluManager.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Backflus/BackfluManager.cs
@@ -13,7 +13,7 @@ public class BackfluManager : DomainService, IBackfluManager
     }
     public async Task<List<Backflu>> GetToBeProcessedListAsync()
     {
-        var Backflu = await _repository.GetListAsync().ConfigureAwait(false);
+        var Backflu = await _repository.GetListAsync(p=>p.scmout_stat=="Y").ConfigureAwait(false);
 
         return Backflu.ToList();
     }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/MesOut/MesOut.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/MesOut/MesOut.cs
index dcb439048..34a5aee52 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/MesOut/MesOut.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/MesOut/MesOut.cs
@@ -50,6 +50,7 @@ public class MesOut : Entity
     /// 返线数量
     /// </summary>
     public decimal Mesout_bad { get; set; }
+    //public  string Mes_Barcode { get; set; }
 
     public override object[] GetKeys()
     {
@@ -59,5 +60,5 @@ public class MesOut : Entity
     /// <summary>
     /// 是否读取(0,1)
     /// </summary>
-    public int Yl1 { get; set; }
+    public long Yl1 { get; set; }
 }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/IScrapRepository.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/IScrapRepository.cs
index f8190ecff..0bdc30bd2 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/IScrapRepository.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/IScrapRepository.cs
@@ -2,7 +2,7 @@ using Volo.Abp.Domain.Repositories;
 
 namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes;
 
-public interface IScrapRepository : IRepository<Scrap, long>
+public interface IScrapRepository : IRepository<Scrap>
 {
 
 }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/Scrap.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/Scrap.cs
index a0797cd5c..26fe1e76f 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/Scrap.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/Scrap.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Domain.Entities;
 
 namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes;
@@ -5,12 +6,14 @@ namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes;
 /// <summary>
 /// 报废补缴(mesout_asd)
 /// </summary>
-public class Scrap : Entity<long>
+public class Scrap : Entity
 {
+    [Key]
+    public decimal mesout_asd_id { get; set; }
     /// <summary>
     /// ERP接收时间
     /// </summary>
-    public string mesout_asd_dt_w { get; set; }
+    public decimal mesout_asd_dt_w { get; set; }
     /// <summary>
     /// 类型
     /// </summary>
@@ -59,6 +62,12 @@ public class Scrap : Entity<long>
     /// <summary>
     /// 是否读取(0,1)
     /// </summary>
-    public int Yl1 { get; set; }
+    public long Yl1 { get; set; }
+
+    public string Mes_Barcode { get; set; }
+    public override object[] GetKeys()
+    {
+        return new object[] { mesout_asd_id };
+    }
 
 }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/ScrapManager.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/ScrapManager.cs
index add6577ca..b4e952ed5 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/ScrapManager.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/ScrapManager.cs
@@ -23,8 +23,8 @@ public class ScrapManager : DomainService, IScrapManager
 
     public virtual async Task UpdateProcessedListAsync(List<Scrap> entities)
     {
-        var ids = entities.Select(p => p.Id);
-        var plans = await _repository.GetListAsync(p => ids.Contains(p.Id)).ConfigureAwait(false);
+        var ids = entities.Select(p => p.mesout_asd_id);
+        var plans = await _repository.GetListAsync(p => ids.Contains(p.mesout_asd_id)).ConfigureAwait(false);
         plans.ForEach(p =>
         {
             p.Yl1 = 1;
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ProductReceiptNotes/ProductReceiptNote.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ProductReceiptNotes/ProductReceiptNote.cs
index 5875d3582..3e63ec887 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ProductReceiptNotes/ProductReceiptNote.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ProductReceiptNotes/ProductReceiptNote.cs
@@ -15,7 +15,7 @@ public class ProductReceiptNote : Entity
     /// <summary>
     /// 物料
     /// </summary>
-    public string mesout_patr { get; set; }
+    public string mesout_part { get; set; }
     /// <summary>
     /// 日期
     /// </summary>
@@ -51,6 +51,6 @@ public class ProductReceiptNote : Entity
 
     public override object[] GetKeys()
     {
-        return new object[] { mesout_ref_nbr + mesout_patr };
+        return new object[] { mesout_ref_nbr + mesout_part };
     }
 }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Backflus/BackflusDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Backflus/BackflusDbContextModelCreatingExtensions.cs
index 46b15138e..c8f89e671 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Backflus/BackflusDbContextModelCreatingExtensions.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Backflus/BackflusDbContextModelCreatingExtensions.cs
@@ -16,7 +16,7 @@ public static class BackfluDbContextModelCreatingExtensions
             b.ConfigureByConvention();
             b.Property(q => q.scmout_dt_w).HasMaxLength(20);
             b.Property(q => q.scmout_type).HasMaxLength(6);
-            b.Property(q => q.scmout_nbr).HasMaxLength(12);
+            b.Property(q => q.scmout_nbr).HasMaxLength(20);
             b.Property(q => q.scmout_part).HasMaxLength(20);
             b.Property(q => q.scmout_no).HasMaxLength(10);
             b.Property(q => q.scmout_loc).HasMaxLength(10);
@@ -25,6 +25,8 @@ public static class BackfluDbContextModelCreatingExtensions
             b.Property(q => q.scmout_qty).HasPrecision(10, 2);
             b.Property(q => q.scmout_in_loc).HasMaxLength(10);
             b.Property(q => q.scmout_stat).HasMaxLength(1);
+            b.Property(q => q.BOMVer).HasMaxLength(50);
+            b.HasKey(x => new { x.scmout_type,x.scmout_nbr,x.scmout_part,x.scmout_no });
         });
 
     }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/MesOut/MesOutDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/MesOut/MesOutDbContextModelCreatingExtensions.cs
index 3da75beb5..789241308 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/MesOut/MesOutDbContextModelCreatingExtensions.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/MesOut/MesOutDbContextModelCreatingExtensions.cs
@@ -11,7 +11,7 @@ public static class MesOutDbContextModelCreatingExtensions
         builder.Entity<MesOut>(b =>
         {
             //Configure table & schema Name
-            b.ToTable(options.TablePrefix + "mesout", options.Schema);
+            b.ToTable(options.TablePrefix + "mesout_wms", options.Schema);
             //Configure ABP properties
             b.ConfigureByConvention();
 
@@ -28,7 +28,7 @@ public static class MesOutDbContextModelCreatingExtensions
             b.Property(q => q.refno).HasMaxLength(45);
             b.Property(q => q.Mesout_bad).HasPrecision(18, 2);
             b.Property(q => q.Yl1);
-
+            //b.Property(q => q.Mes_Barcode).HasMaxLength(50);
         });
 
     }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapDbContextModelCreatingExtensions.cs
index b3f7c7aac..2463c3f6d 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapDbContextModelCreatingExtensions.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapDbContextModelCreatingExtensions.cs
@@ -11,12 +11,12 @@ public static class ScrapDbContextModelCreatingExtensions
         builder.Entity<Scrap>(b =>
         {
             //Configure table & schema Name
-            b.ToTable(options.TablePrefix + "mesout_asdwms", options.Schema);
+            b.ToTable(options.TablePrefix + "mesout_asd", options.Schema);
             //Configure ABP properties
             b.ConfigureByConvention();
 
             //Properties
-            b.Property(q => q.Id).UseMySqlIdentityColumn().ValueGeneratedOnAdd().HasColumnName("mesout_asd_id");
+            b.Property(q => q.mesout_asd_id).HasPrecision(20);
             b.Property(q => q.mesout_asd_dt_w).HasMaxLength(20);
             b.Property(q => q.mesout_asd_type).HasMaxLength(5);
             b.Property(q => q.Mesout_asd_part).HasMaxLength(20);
@@ -30,7 +30,7 @@ public static class ScrapDbContextModelCreatingExtensions
             b.Property(q => q.mesout_asd_stat).HasMaxLength(1);
             b.Property(q => q.SCN).HasMaxLength(45);
             b.Property(q => q.Yl1);
-
+            b.Property(q => q.Mes_Barcode).HasMaxLength(50);
         });
 
     }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapEfCoreRepository.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapEfCoreRepository.cs
index 491960842..6477e7d3a 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapEfCoreRepository.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapEfCoreRepository.cs
@@ -4,7 +4,7 @@ using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes;
 
 namespace Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes;
 
-public class ScrapEfCoreRepository : EfCoreRepository<MesDbContext, Scrap, long>, IScrapRepository
+public class ScrapEfCoreRepository : EfCoreRepository<MesDbContext, Scrap>, IScrapRepository
 {
     public ScrapEfCoreRepository(IDbContextProvider<MesDbContext> dbContextProvider)
         : base(dbContextProvider)
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ProductReceiptNote/ProductReceiptNoteDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ProductReceiptNote/ProductReceiptNoteDbContextModelCreatingExtensions.cs
index 6f9adcb1b..9a925a8ac 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ProductReceiptNote/ProductReceiptNoteDbContextModelCreatingExtensions.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/ProductReceiptNote/ProductReceiptNoteDbContextModelCreatingExtensions.cs
@@ -19,7 +19,7 @@ public static class ProductReceiptNoteDbContextModelCreatingExtensions
             //b.Property(q => q.Id).HasColumnName("Mesout_ref_nbr").HasMaxLength(20);
             b.Property(q => q.mesout_ref_nbr).HasMaxLength(20);
             b.Property(q => q.mesout_id).HasMaxLength(1);
-            b.Property(q => q.mesout_patr).HasMaxLength(20);
+            b.Property(q => q.mesout_part).HasMaxLength(20);
             b.Property(q => q.mesout_date).HasMaxLength(8);
             b.Property(q => q.mesout_move).HasPrecision(18, 2);
             b.Property(q => q.mesout_unable).HasPrecision(18, 2);
@@ -28,7 +28,7 @@ public static class ProductReceiptNoteDbContextModelCreatingExtensions
             b.Property(q => q.memo).HasMaxLength(45);
             b.Property(q => q.refno).HasMaxLength(45);
             b.Property(q => q.mesout_bad).HasPrecision(18, 2);
-            b.HasKey(x => new { x.mesout_ref_nbr, x.mesout_patr });
+            b.HasKey(x => new { x.mesout_ref_nbr, x.mesout_part });
         });
 
     }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
index 87a025842..29850a294 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
@@ -2,9 +2,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Castle.Components.DictionaryAdapter;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.DataExchange.Domain;
 using Win_in.Sfs.Wms.DataExchange.WMS.BackFlushNote;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
@@ -18,13 +20,14 @@ public class BackFluConverter : IIncomingConverter
     private readonly IItemBasicAppService _itemBasicAppService;
     private readonly IObjectMapper _objectMapper;
     private readonly ILogger<BackFluConverter> _logger;
+    private readonly ILocationAppService _locationAppService;
     public BackFluConverter(
     IIncomingToWmsManager incomingToWmsManager,
     IItemBasicAppService itemBasicAppService,
     IObjectMapper objectMapper,
-    ILogger<BackFluConverter> logger
-,
-    IIncomingFromExternalManager incomingFromExternalManager
+    ILogger<BackFluConverter> logger,
+    IIncomingFromExternalManager incomingFromExternalManager,
+    ILocationAppService locationAppService
 
 )
     {
@@ -33,6 +36,7 @@ public class BackFluConverter : IIncomingConverter
         _objectMapper = objectMapper;
         _logger = logger;
         _incomingFromExternalManager = incomingFromExternalManager;
+        _locationAppService = locationAppService;
     }
     public virtual async Task ConvertAsync(List<IncomingFromExternal> incomingFromExternalList)
     {
@@ -66,12 +70,41 @@ public class BackFluConverter : IIncomingConverter
             incomingToWms.SetEffectiveDate(first.EffectiveDate);
             var exchangeBack = JsonSerializer.Deserialize<BackFlushNoteExchangeDto>(first.DestinationDataContent);
             var wmsBack = _objectMapper.Map<BackFlushNoteExchangeDto, BackFlushNoteEditInput>(exchangeBack);
+            var item1 = await _itemBasicAppService.GetByCodeAsync(wmsBack.ItemCode).ConfigureAwait(false);
+            if (item1 != null)
+            {
+                wmsBack.ItemName = item1.Name;
+                wmsBack.Uom = item1.BasicUom;
+            }
+            else
+            {
+                wmsBack.ItemName = "";
+                wmsBack.Uom = "";
+            }          
             wmsBack.Details = new List<BackFlushNoteDetailInput>();
             foreach (var incomingFromExternal in group.ToList())
             {
                 var back = JsonSerializer.Deserialize<BackFlushNoteExchangeDto>(incomingFromExternal.DestinationDataContent);
                 var wmsBackDetail = _objectMapper.Map<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>(back.Detail);
+                wmsBackDetail.Lot = "";
+                var item = await _itemBasicAppService.GetByCodeAsync(wmsBackDetail.ItemCode).ConfigureAwait(false);
 
+                if (item != null)
+                {
+                    wmsBackDetail.ItemName = item.Name;
+                    wmsBackDetail.Uom = item.BasicUom;
+                }
+                else
+                {
+                    wmsBackDetail.ItemName = "";
+                    wmsBackDetail.Uom = "";
+                }
+                var typesAndErpCodeAsync = await _locationAppService.GetListByTypesAndErpCodeAsync(new EditableList<EnumLocationType>() { EnumLocationType.WIP }, wmsBackDetail.LocationErpCode).ConfigureAwait(false);
+                var loctioncode = typesAndErpCodeAsync.First();
+                wmsBackDetail.LocationCode = loctioncode.Code;
+                wmsBackDetail.WarehouseCode = loctioncode.WarehouseCode;
+                wmsBackDetail.LocationArea = loctioncode.AreaCode;
+                wmsBackDetail.LocationGroup = loctioncode.LocationGroupCode;
                 wmsBack.Details.Add(wmsBackDetail);
             }
             incomingToWms.DataContent = JsonSerializer.Serialize(wmsBack);
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
index f479fed59..15064ea0d 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
@@ -34,8 +34,7 @@ public class BackFluReader : IReader
     public virtual async Task<List<IncomingFromExternal>> ReadAsync()
     {
         //从Tyrp读取待处理bom
-        var BackFull = await _ibackfluManager.GetToBeProcessedListAsync().ConfigureAwait(false);
-        var toBeProcessedBack = BackFull.Where(p => p.scmout_stat == "Y").ToList();
+        var toBeProcessedBack = await _ibackfluManager.GetToBeProcessedListAsync().ConfigureAwait(false);    
         if (!toBeProcessedBack.Any())
         {
             _logger.LogInformation("no backflus");
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs
index 750af9290..4c9fc8910 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs
@@ -34,13 +34,13 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
             Logger.LogInformation($"{Incoming} is not active!");
             return;
         }
-        //Logger.LogInformation($"Read MesOut");//缴库
-        //var mesOutReader = workerContext.ServiceProvider.GetRequiredService<MesOutReader>();
-        //var mesOutConverter = workerContext.ServiceProvider.GetRequiredService<MesOutConverter>();
-        ////读取并保存MesOut
-        //var mesOutsFromExternalList = await mesOutReader.ReadAsync().ConfigureAwait(false);
-        ////转换MesOut
-        //await mesOutConverter.ConvertAsync(mesOutsFromExternalList).ConfigureAwait(false);
+        Logger.LogInformation($"Read MesOut");//缴库
+        var mesOutReader = workerContext.ServiceProvider.GetRequiredService<MesOutReader>();
+        var mesOutConverter = workerContext.ServiceProvider.GetRequiredService<MesOutConverter>();
+        //读取并保存MesOut
+        var mesOutsFromExternalList = await mesOutReader.ReadAsync().ConfigureAwait(false);
+        //转换MesOut
+        await mesOutConverter.ConvertAsync(mesOutsFromExternalList).ConfigureAwait(false);
 
         //Logger.LogInformation($"Read PullTask");//拉动任务
         //var pullTaskReader = workerContext.ServiceProvider.GetRequiredService<PullTaskReader>();
@@ -49,14 +49,14 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         //var pullTaskFromExternalList = await pullTaskReader.ReadAsync().ConfigureAwait(false);
         ////转换PullTask
         //await pullTaskConverter.ConvertAsync(pullTaskFromExternalList).ConfigureAwait(false);
-        Logger.LogInformation($"Read Scrap");
+        //Logger.LogInformation($"Read Scrap");
 
-        var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
-        var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
-        //读取并保存Scrap
-        var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
-        //转换Scrap
-        await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
+        //var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
+        //var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
+        ////读取并保存Scrap
+        //var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
+        ////转换Scrap
+        //await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
 
         //Logger.LogInformation($"Read Issue");
         //var pckHandleService = workerContext.ServiceProvider.GetRequiredService<IssueReader>();
@@ -66,13 +66,13 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         ////转换Pck
         //await pckConverter.ConvertAsync(pcksFromExternalList).ConfigureAwait(false);
 
-        //Logger.LogInformation($"Read BackFlush");//耗用单
-        //var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
-        //var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
-        ////读取并保存Customer
-        //var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false);
-        ////转换Customer
-        //await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false);
+        Logger.LogInformation($"Read BackFlush");//耗用单
+        var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
+        var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
+        //读取并保存BackFlush
+        var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false);
+        //转换BackFlush
+        await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false);
         Logger.LogInformation($"Completed: Handling {Incoming}");
     }
 
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs
index 097550573..f527cafe8 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs
@@ -75,10 +75,9 @@ public class MesOutConverter : IIncomingConverter
             incomingToWms.SetEffectiveDate(first.EffectiveDate);
             var exchangeProductReceiptNote = JsonSerializer.Deserialize<ProductReceiptNoteExchangeDto>(first.DestinationDataContent);
             var wmsProductReceiptNote = _objectMapper.Map<ProductReceiptNoteExchangeDto, ProductReceiptNoteEditInput>(exchangeProductReceiptNote);
-            wmsProductReceiptNote.WorkShop = "";//车间
+            wmsProductReceiptNote.WorkShop = "";//车间           
             wmsProductReceiptNote.Worker = _configuration["Authentication:username"];//操作人
             wmsProductReceiptNote.ReceiptType = EnumReceiptType.MesScanReceipt;//完工收货方式
-            wmsProductReceiptNote.WarehouseCode = "";         
             wmsProductReceiptNote.Details = new List<ProductReceiptNoteDetailInput>();
 
             foreach (var incomingFromExternal in group.ToList())
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapConverter.cs
index 4a096d624..4ffe9f041 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapConverter.cs
@@ -80,8 +80,7 @@ public class ScrapConverter : IIncomingConverter
                 var scrap = JsonSerializer.Deserialize<ScrapNoteExchangeDto>(incomingFromExternal.DestinationDataContent);
                 var wmsScrapDetail = _objectMapper.Map<ScrapNoteDetailExchangeDto, ScrapNoteDetailInput>(scrap.Detail);
                 wmsScrapDetail.ToPackingCode = "";
-                wmsScrapDetail.ToLot = "";
-                //wmsScrapDetail.ToStatus = EnumInventoryStatus.OK;
+                wmsScrapDetail.ToLot = "";              
                 wmsScrapDetail.FromPackingCode = "";
                 wmsScrapDetail.FromLot = "";
                 wmsScrapDetail.FromWarehouseCode = "";
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/MesAgentModule.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/MesAgentModule.cs
index 2a845ffc5..62c920660 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/MesAgentModule.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/MesAgentModule.cs
@@ -100,7 +100,7 @@ public class MesAgentModule : AbpModule
         Configure<AbpDbContextOptions>(options =>
         {
             options.UseSqlServer();
-            options.UseMySQL<MesDbContext>();
+            options.UseSqlServer<MesDbContext>();
         });
     }
 
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs
index 3289b919f..88aa3f294 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs
@@ -74,7 +74,7 @@ public class ProductReceiptNoteConverter : IOutgoingConverter
         {
             mesout_ref_nbr = exchangeProductReceiptNote.Number,
             mesout_id = detail.RawLocationCode,
-            mesout_patr = detail.ItemCode,
+            mesout_part = detail.ItemCode,
             mesout_date = exchangeProductReceiptNote.ActiveDate.ToString("yyyyMMdd"),
             mesout_bad = detail.ReturnQty,
             mesout_move = detail.ReturnQty != 0 ? 0 : detail.Qty,

From ea40bfc0e6f65670a83a313012b0ae91734bbf66 Mon Sep 17 00:00:00 2001
From: "mingliang.tang" <mingliang.tang@ccwin-in.com>
Date: Mon, 24 Apr 2023 10:08:17 +0800
Subject: [PATCH 07/13] =?UTF-8?q?mes=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Incoming/ScrapReader.cs                                   | 4 ++--
 .../Outgoing/ProductReceiptNoteConverter.cs                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapReader.cs
index f01b1ab02..a497d4102 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapReader.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapReader.cs
@@ -80,8 +80,8 @@ public class ScrapReader : IReader
             DataType = EnumIncomingDataType.Scrap.ToString(),
             DataAction = EnumExchangeDataAction.Add,
             SourceSystem = EnumSystemType.MES.ToString(),
-            SourceDataId = scrap.Id.ToString(),
-            SourceDataGroupCode = scrap.Id.ToString(),
+            SourceDataId = scrap.mesout_asd_id.ToString(),
+            SourceDataGroupCode = scrap.mesout_asd_id.ToString(),
             SourceDataDetailCode = scrap.Mesout_asd_part,
             SourceDataContent = JsonSerializer.Serialize(scrap),
             WriteTime = DateTime.Now,
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs
index 9bd4316d2..22d3cd377 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs
@@ -76,7 +76,7 @@ public class ProductReceiptNoteConverter : IOutgoingConverter
         {
             mesout_ref_nbr = exchangeProductReceiptNote.Number,
             mesout_id = string.IsNullOrEmpty(detail.RawLocationCode)?"": detail.RawLocationCode,
-            mesout_patr = detail.ItemCode,
+            mesout_part = detail.ItemCode,
             mesout_date = exchangeProductReceiptNote.ActiveDate.ToString("yyyyMMdd"),
             mesout_bad = detail.ReturnQty,
             mesout_move = detail.ReturnQty != 0 ? 0 : detail.Qty,

From dc082d4e7a704dd571f9194733a82a1a1f26d79a Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Mon, 24 Apr 2023 15:25:49 +0800
Subject: [PATCH 08/13] =?UTF-8?q?tyrp=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Plans/PlanManager.cs                           |  4 +++-
 .../Incoming/ProductReader.cs                      |  2 +-
 .../appsettings.json                               |  2 +-
 .../Incoming/DictConverter.cs                      |  4 ++++
 .../Incoming/SupplierConverter.cs                  |  1 +
 .../Incoming/TyrpIncomingBackgroundWorker.cs       |  2 +-
 .../appsettings.json                               | 14 +++++++-------
 .../appsettings.json                               | 14 +++++++-------
 8 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Plans/PlanManager.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Plans/PlanManager.cs
index eaceb8c69..b9a3f91ba 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Plans/PlanManager.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Plans/PlanManager.cs
@@ -32,6 +32,8 @@ public class PlanManager : DomainService, IPlanManager
             p.WmsState = 1;
             p.WmsDate = Clock.Now;
         });
-        await _repository.BulkUpdateAsync(plans).ConfigureAwait(false);
+        //await _repository.BulkUpdateAsync(plans).ConfigureAwait(false);
+
+        await _repository.UpdateManyAsync(plans).ConfigureAwait(false);
     }
 }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ProductReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ProductReader.cs
index 45e9c53a1..aea4041b4 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ProductReader.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ProductReader.cs
@@ -45,7 +45,7 @@ public class ProductReader : IReader
             return new List<IncomingFromExternal>();
         }
         //Product逐一转换为ItemPack
-        var incomingDataList = BuildIncomingFromExternalFromProductAsync(toBeProcessedProducts.Where(r => string.IsNullOrWhiteSpace(r.Code)).ToList());
+        var incomingDataList = BuildIncomingFromExternalFromProductAsync(toBeProcessedProducts.Where(r => !string.IsNullOrWhiteSpace(r.Code)).ToList());
         await _incomingFromExternalManager.CreateBulkAsync(incomingDataList).ConfigureAwait(false);
 
         return incomingDataList;
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json
index 87fb22fe9..a00c200c9 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json
@@ -1,7 +1,7 @@
 {
   "ConnectionStrings": {
     "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
-    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
     "EOS": "Server=61.139.155.47;Database=EOSSH;Uid=wms;Pwd=1;TrustServerCertificate=True"
   },
 
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictConverter.cs
index be7906816..0499c7eae 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictConverter.cs
@@ -8,6 +8,7 @@ using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Wms.DataExchange.Domain;
 using Win_in.Sfs.Wms.DataExchange.WMS.Dict;
+using static StackExchange.Redis.Role;
 
 namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Incoming;
 
@@ -68,10 +69,13 @@ public class DictConverter : IIncomingConverter
             var exchangeDictRequest = JsonSerializer.Deserialize<DictExchangeDto>(first.DestinationDataContent);
             var wmsDictRequest = _objectMapper.Map<DictExchangeDto, DictEditInput>(exchangeDictRequest);
             wmsDictRequest.Items = new List<DictItemInput>();
+          var  masterId = _guidGenerator.Create();
             foreach (var incomingFromExternal in group.ToList())
             {
                 var dictlRequest = JsonSerializer.Deserialize<DictExchangeDto>(incomingFromExternal.DestinationDataContent);
                 var wmsDictItemRequest = _objectMapper.Map<DictItemExchangeDto, DictItemInput>(exchangeDictRequest.Detail);
+                wmsDictItemRequest.Id = _guidGenerator.Create();
+                wmsDictItemRequest.MasterId = masterId;
                 wmsDictItemRequest.Enabled = true;
                 wmsDictRequest.Items.Add(wmsDictItemRequest);
             }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/SupplierConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/SupplierConverter.cs
index 49bbf2cc4..59155ccd0 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/SupplierConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/SupplierConverter.cs
@@ -27,6 +27,7 @@ public class SupplierConverter : IIncomingConverter
 
 )
     {
+        _incomingFromExternalManager = incomingFromExternalManage;
         _incomingToWmsManager = incomingToWmsManager;
         _objectMapper = objectMapper;
         _logger = logger;
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs
index 3e8197b79..81dc7c649 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs
@@ -117,7 +117,7 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
                 //读取并保存Dictpj
                 var dictpjOutsFromExternalList = await DictpjReader.ReadAsync().ConfigureAwait(false);
                 //转换Dictpj
-                await dictConverter.ConvertAsync(dictOutsFromExternalList).ConfigureAwait(false);
+                await dictConverter.ConvertAsync(dictpjOutsFromExternalList).ConfigureAwait(false);
 
                 Logger.LogInformation($"Read Customer");//客户资料
                 var CustomerReader = workerContext.ServiceProvider.GetRequiredService<CustomerReader>();
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json
index aeba77ac9..263acf7e6 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json
@@ -1,13 +1,13 @@
 {
   "ConnectionStrings": {
     "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
-    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
     "TYRP": "Server=10.164.113.32,1818\\SHDB;Database=TYRP;Uid=ShWmsUser;Pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
-    "SYBASE_TYRP": "Data Source=10.164.115.137; Port=5000; Database=mesdb; Uid=mesuser; Pwd=mesuser1234;Charset=cp850;" //iso_1
+    "SYBASE_TYRP": "Data Source=10.164.115.137; Port=5000; Database=mesdb; Uid=sa; Pwd=dawning;Charset=cp850;" //iso_1
   },
 
   "AuthServer": {
-    "Authority": "http://dev.ccwin-in.com:60083/",
+    "Authority": "http://10.164.113.31:60083/",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "admin",
     "SwaggerClientSecret": "1q2w3E*",
@@ -26,16 +26,16 @@
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      "BaseUrl": "http://10.164.113.31:60084/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:60085/"
+      "BaseUrl": "http://10.164.113.31:60085/"
     },
     "Label": {
-      "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      "BaseUrl": "http://10.164.113.31:60082/"
     },
     "Auth": {
-      "BaseUrl": "http://dev.ccwin-in.com:60083/"
+      "BaseUrl": "http://10.164.113.31:60083/"
     }
   },
   "TyrpOptions": {
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json
index f42f6248d..f4e3a4d33 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json
@@ -1,13 +1,13 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
-    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True"
+    "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True"
   },
 
 
 
   "AuthServer": {
-    "Authority": "http://dev.ccwin-in.com:60083/",
+    "Authority": "http://10.164.113.31:60083/",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "admin",
     "SwaggerClientSecret": "1q2w3E*",
@@ -26,16 +26,16 @@
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      "BaseUrl": "http://10.164.113.31:60084/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:60085/"
+      "BaseUrl": "http://10.164.113.31:60085/"
     },
     "Label": {
-      "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      "BaseUrl": "http://10.164.113.31:60082/"
     },
     "Auth": {
-      "BaseUrl": "http://dev.ccwin-in.com:60083/"
+      "BaseUrl": "http://10.164.113.31:60083/"
     }
   },
   "DataExchangeOptions": {

From 098c500945efd0c574657ae0019cc2e10a294118 Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Mon, 24 Apr 2023 15:37:55 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseOrders/PurchaseOrderAppService.cs | 75 +++++++++++++++++--
 .../StoreDataExchangeEventHandlerBase.cs      |  7 +-
 .../Transactions/BackFlushNoteEventHandler.cs |  5 ++
 3 files changed, 77 insertions(+), 10 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
index c66e42ebc..af8b2d953 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp;
+using Volo.Abp.Domain.Entities;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -53,32 +54,90 @@ public class PurchaseOrderAppService :
     protected override async Task<Dictionary<PurchaseOrder, EntityState>> ImportProcessingEntityAsync(
         Dictionary<PurchaseOrder, EntityState> dictionary)
     {
-        var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key);
+        var ImportData = dictionary.Select(p => p.Key);
 
-        foreach (var purchaseOrder in addList)
+        var supplierDtos = new List<SupplierDTO>();
+        #region 校验供应商
+
+        var allSupplierCode = ImportData.Select(p => p.SupplierCode).ToList();//所有供应商编号
+        supplierDtos = await CheckSupplierCodeAsync(allSupplierCode).ConfigureAwait(false);
+
+        #endregion
+
+        var itemBasicDtos = new List<ItemBasicDTO>();
+        #region 校验物品
+
+        var allTempItemCode = ImportData.Select(p => p.Details.Select(p => p.ItemCode).ToList()).ToList();
+        var allItemCode = new List<string>();
+        allTempItemCode.ForEach(p => { allItemCode.AddRange(p); });
+        itemBasicDtos = await CheckItemCodeAsync(allItemCode).ConfigureAwait(false);
+
+        #endregion
+
+        foreach (var purchaseOrder in ImportData)
         {
             purchaseOrder.CreatorId = CurrentUser.Id;
             purchaseOrder.Worker = CurrentUser.GetName();
 
-            var supplierDto =
-                await _supplierAppService.GetByCodeAsync(purchaseOrder.SupplierCode).ConfigureAwait(false);
+            var supplierDto = supplierDtos.First(p => p.Code == purchaseOrder.SupplierCode);
             purchaseOrder.SupplierCode = supplierDto.Code;
             purchaseOrder.SupplierAddress = supplierDto.Address;
             purchaseOrder.SupplierName = supplierDto.Name;
 
             foreach (var detail in purchaseOrder.Details)
             {
-                var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
+                var itemBasicDto = itemBasicDtos.First(p => p.Code == detail.ItemCode);
 
                 detail.ItemName = itemBasicDto.Name;
                 detail.ItemDesc1 = itemBasicDto.Desc1;
                 detail.ItemDesc2 = itemBasicDto.Desc2;
+                detail.StdPackQty=itemBasicDto.StdPackQty;
             }
         }
 
         return dictionary;
     }
 
+    #region 校验
+
+    /// <summary>
+    ///     校验所有供应商是否存在
+    /// </summary>
+    /// <returns></returns>
+    private async Task<List<SupplierDTO>> CheckSupplierCodeAsync(List<string> supplierCodes)
+    {
+        supplierCodes = supplierCodes.Distinct().ToList();
+        var result = await _supplierAppService.GetByCodesAsync(supplierCodes).ConfigureAwait(false);
+
+        foreach (var supplierCode in supplierCodes)
+        {
+            if (result.All(p => p.Code != supplierCode))
+            {
+                throw new UserFriendlyException($"供应商代码【{supplierCode}】不存在");
+            }
+        }
+
+        return result;
+    }
+
+    private async Task<List<ItemBasicDTO>> CheckItemCodeAsync(List<string> itemCodes)
+    {
+        itemCodes = itemCodes.Distinct().ToList();
+        var result = await _itemBasicAppService.GetByCodesAsync(itemCodes).ConfigureAwait(false);
+
+        foreach (var itemCode in itemCodes)
+        {
+            if (result.All(p => p.Code != itemCode))
+            {
+                throw new UserFriendlyException($"供应商代码【{itemCode}】不存在");
+            }
+        }
+
+        return result;
+    }
+
+    #endregion
+
     #endregion
 
     /// <summary>
@@ -237,12 +296,12 @@ public class PurchaseOrderAppService :
     [HttpGet("get-list-by-supplier-code-and-item-code")]
     public virtual async Task<List<PurchaseOrderDTO>> GetListBySupplierCodeAsync(string supplierCode, string itemCode)
     {
-        var entitys = await _repository.GetListAsync(p => p.Details.Any(y => y.ItemCode == itemCode) && p.SupplierCode == supplierCode).ConfigureAwait(false);
+        var entitys = await _repository
+            .GetListAsync(p => p.Details.Any(y => y.ItemCode == itemCode) && p.SupplierCode == supplierCode)
+            .ConfigureAwait(false);
 
         var dtos = ObjectMapper.Map<List<PurchaseOrder>, List<PurchaseOrderDTO>>(entitys);
 
         return dtos;
     }
-
-  
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Bases/StoreDataExchangeEventHandlerBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Bases/StoreDataExchangeEventHandlerBase.cs
index c0675f55b..c57663924 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Bases/StoreDataExchangeEventHandlerBase.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Bases/StoreDataExchangeEventHandlerBase.cs
@@ -24,8 +24,11 @@ public abstract class StoreDataExchangeEventHandlerBase<T> : StoreEventHandlerBa
 
     protected async Task<DateTime> GetActiveDateAsync()
     {
-        var activeDate = await InterfaceCalendarAppService.GetActiveDateAsync(Clock.Now).ConfigureAwait(false);
-        return activeDate;
+        //todo 报错
+        //var activeDate = await InterfaceCalendarAppService.GetActiveDateAsync(Clock.Now).ConfigureAwait(false);
+        //return activeDate;
+
+        return DateTime.Now;
     }
 
     protected async Task<List<ExchangeData>> BuildExchangeDataAsync<TEntity>(string sourceSystem,
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/BackFlushNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/BackFlushNoteEventHandler.cs
index 67737017d..00d45ab6a 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/BackFlushNoteEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/BackFlushNoteEventHandler.cs
@@ -68,6 +68,11 @@ public class BackFlushNoteEventHandler
             transaction.DocNumber = backFlushNote.Number;
             transaction.JobNumber = backFlushNote.JobNumber;
             transaction.Status = detail.Status;
+            transaction.LocationArea = detail.LocationArea;
+            transaction.LocationGroup=detail.LocationGroup;
+            transaction.LocationCode=detail.LocationCode;
+            transaction.LocationErpCode=detail.LocationErpCode;
+            transaction.WarehouseCode=detail.WarehouseCode;
 
             transactions.Add(transaction);
         }

From e69183ab07fd4dd9f9e66ec5e3f0f325349e38a7 Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Mon, 24 Apr 2023 16:15:10 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseOrders/PurchaseOrderAppService.cs | 42 +++++++++----------
 .../PurchaseOrders/PurchaseOrderManager.cs    |  2 +-
 .../Orders/PurchaseOrderEventHandler.cs       | 25 ++++++-----
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
index af8b2d953..6620567aa 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
@@ -98,6 +98,27 @@ public class PurchaseOrderAppService :
         return dictionary;
     }
 
+    /// <summary>
+    ///     【创建】采购订单
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost("")]
+    public override async Task<PurchaseOrderDTO> CreateAsync(PurchaseOrderEditInput input)
+    {
+        if (string.IsNullOrWhiteSpace(input.Number))
+        {
+            input.Number = await _purchaseOrderManager
+                .GenerateNumberAsync(nameof(PurchaseOrder), Clock.Normalize(input.ActiveDate)).ConfigureAwait(false);
+        }
+
+        var entity = ObjectMapper.Map<PurchaseOrderEditInput, PurchaseOrder>(input);
+
+        await _purchaseOrderManager.CreateAsync(entity).ConfigureAwait(false);
+
+        return ObjectMapper.Map<PurchaseOrder, PurchaseOrderDTO>(entity);
+    }
+
     #region 校验
 
     /// <summary>
@@ -140,27 +161,6 @@ public class PurchaseOrderAppService :
 
     #endregion
 
-    /// <summary>
-    ///     【创建】采购订单
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPost("")]
-    public override async Task<PurchaseOrderDTO> CreateAsync(PurchaseOrderEditInput input)
-    {
-        if (string.IsNullOrWhiteSpace(input.Number))
-        {
-            input.Number = await _purchaseOrderManager
-                .GenerateNumberAsync(nameof(PurchaseOrder), Clock.Normalize(input.ActiveDate)).ConfigureAwait(false);
-        }
-
-        var entity = ObjectMapper.Map<PurchaseOrderEditInput, PurchaseOrder>(input);
-
-        await _purchaseOrderManager.CreateAsync(entity).ConfigureAwait(false);
-
-        return ObjectMapper.Map<PurchaseOrder, PurchaseOrderDTO>(entity);
-    }
-
     /// <summary>
     ///     【批量创建】采购订单
     /// </summary>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderManager.cs
index c87e0fc62..721b1c17c 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderManager.cs
@@ -54,8 +54,8 @@ public class PurchaseOrderManager : SfsStoreManagerBase<PurchaseOrder, PurchaseO
         purchaseOrder.SetIdAndNumberWithDetails(GuidGenerator, purchaseOrder.Number);
         //await PublishCreatedAsync(purchaseOrder).ConfigureAwait(false);
         //不要用base.create 要不会把number覆盖
+        await PublishCreatedAsync(purchaseOrder).ConfigureAwait(false);
         return await Repository.InsertAsync(purchaseOrder).ConfigureAwait(false);
-
     }
 
     /// <summary>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Orders/PurchaseOrderEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Orders/PurchaseOrderEventHandler.cs
index 5b8074599..143c43909 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Orders/PurchaseOrderEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Orders/PurchaseOrderEventHandler.cs
@@ -107,6 +107,10 @@ public class PurchaseOrderEventHandler
 
         //供应商窗口
         var supplierTimeWindowDtos = await _supplierTimeWindowAppService.GetListBySupplierCodeAsync(purchaseOrder.SupplierCode).ConfigureAwait(false);
+        if (!supplierTimeWindowDtos.Any())
+        {
+            throw new UserFriendlyException($"供应商窗口【{purchaseOrder.SupplierCode}】没设置");
+        }
 
         //一次性返回所有物品信息
         var itemBasicDtos = await _itemBasicAppService.GetByCodesAsync(itemCodes).ConfigureAwait(false);
@@ -173,13 +177,13 @@ public class PurchaseOrderEventHandler
 
             //todo 一个物品多个包装?怎么取值
             //标包数
-            var itemPackDto=ItemPacks.First(p => p.ItemCode == purchaseOrderDetaildetail.ItemCode);
+            var itemPackDto = itemBasicDtos.First(p=>p.Code== purchaseOrderDetaildetail.ItemCode).StdPackQty;
 
             //总箱数
-            var itemPackingCount = (int)(itemQty / itemPackDto.Qty);
-            if (itemQty > itemPackDto.Qty)
+            var itemPackingCount = (int)(itemQty / itemPackDto);
+            if (itemQty > itemPackDto)
             {
-                if (itemQty % itemPackDto.Qty != 0)
+                if (itemQty % itemPackDto != 0)
                 {
                     itemPackingCount++;
                 }
@@ -214,7 +218,7 @@ public class PurchaseOrderEventHandler
                 supplierAsnDetailInput.ItemDesc2 = itemBasicDto.Desc2;
 
                 //标包
-                supplierAsnDetailInput.StdPackQty = itemPackDto.Qty;
+                supplierAsnDetailInput.StdPackQty = itemPackDto;
 
                 supplierAsnDetailInput.SupplierPackQty = supplierItemDto.SupplierPackQty;
                 supplierAsnDetailInput.SupplierPackUom = supplierItemDto.SupplierPackUom;
@@ -228,11 +232,11 @@ public class PurchaseOrderEventHandler
                 supplierAsnDetailInput.RecommendErpCode = purchaseOrderDetaildetail.LocationErpCode;
 
                 supplierAsnDetailInput.PoNumber = purchaseOrder.Number;
-                supplierAsnDetailInput.Qty = itemQty>itemPackDto.Qty ? itemPackDto.Qty : itemQty;
+                supplierAsnDetailInput.Qty = itemQty>itemPackDto ? itemPackDto : itemQty;
 
-                itemQty-=itemPackDto.Qty;
+                itemQty-=itemPackDto;
 
-                var InventoryLabelEditInput = await BuildInventoryLabelEditInputAsync(supplierAsnEditInput, supplierAsnDetailInput, supplierDto, itemBasicDto, supplierItemDto, itemPackDto).ConfigureAwait(false);
+                var InventoryLabelEditInput = await BuildInventoryLabelEditInputAsync(supplierAsnEditInput, supplierAsnDetailInput, supplierDto, itemBasicDto, supplierItemDto).ConfigureAwait(false);
                 inventoryLabelEditInputs.Add(InventoryLabelEditInput);
 
                 supplierAsnEditInput.Details.Add(supplierAsnDetailInput);
@@ -260,8 +264,7 @@ public class PurchaseOrderEventHandler
         SupplierAsnDetailInput supplierAsnDetail,
         SupplierDTO supplierDto,
         ItemBasicDTO itemBasicDto,
-        SupplierItemDTO supplierItemDto,
-        ItemPackDTO itemPackDto)
+        SupplierItemDTO supplierItemDto)
     {
         if (itemBasicDto == null)
 
@@ -308,7 +311,7 @@ public class PurchaseOrderEventHandler
         inputLabel.LabelStatus = LabelStatus.Enable;
         
         inputLabel.Specifications = itemBasicDto.Color;
-        inputLabel.StdPackQty = itemPackDto.Qty;
+        inputLabel.StdPackQty = itemBasicDto.StdPackQty;
         
         inputLabel.SupplierItemCode = supplierItemDto.SupplierItemCode;
         inputLabel.SupplierItemName = supplierItemDto.ItemName;

From 634b0a6dc9ced39f82a9dd2a0731e003438c990a Mon Sep 17 00:00:00 2001
From: "mingliang.tang" <mingliang.tang@ccwin-in.com>
Date: Mon, 24 Apr 2023 17:00:43 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scraps/Scrap.cs                           |  4 +-
 .../MesOutDbContextModelCreatingExtensions.cs |  4 +-
 .../ScrapDbContextModelCreatingExtensions.cs  |  1 -
 .../appsettings.json                          |  2 +-
 .../FawtygAutoMapperProfile.cs                |  4 +-
 .../Incoming/BackFluConverter.cs              | 19 ++++++++-
 .../Incoming/BackFluReader.cs                 |  7 ++--
 .../Incoming/MesIncomingBackgroundWorker.cs   | 14 +++----
 .../Incoming/MesOutConverter.cs               | 27 ++++++------
 .../Incoming/ScrapConverter.cs                |  9 +++-
 .../appsettings.json                          | 10 ++---
 .../appsettings.json                          | 12 +++---
 .../AgentModule.cs                            |  2 +-
 .../IncomingToWmsExtensions.cs                | 41 ++-----------------
 .../IncomingToWmsWorker.cs                    | 38 ++++++++---------
 .../appsettings.json                          | 14 +++----
 16 files changed, 96 insertions(+), 112 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/Scrap.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/Scrap.cs
index 26fe1e76f..5f5f1d4ce 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/Scrap.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Scraps/Scrap.cs
@@ -13,7 +13,7 @@ public class Scrap : Entity
     /// <summary>
     /// ERP接收时间
     /// </summary>
-    public decimal mesout_asd_dt_w { get; set; }
+    public string mesout_asd_dt_w { get; set; }
     /// <summary>
     /// 类型
     /// </summary>
@@ -64,10 +64,8 @@ public class Scrap : Entity
     /// </summary>
     public long Yl1 { get; set; }
 
-    public string Mes_Barcode { get; set; }
     public override object[] GetKeys()
     {
         return new object[] { mesout_asd_id };
     }
-
 }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/MesOut/MesOutDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/MesOut/MesOutDbContextModelCreatingExtensions.cs
index 789241308..61d77b269 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/MesOut/MesOutDbContextModelCreatingExtensions.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/MesOut/MesOutDbContextModelCreatingExtensions.cs
@@ -11,12 +11,12 @@ public static class MesOutDbContextModelCreatingExtensions
         builder.Entity<MesOut>(b =>
         {
             //Configure table & schema Name
-            b.ToTable(options.TablePrefix + "mesout_wms", options.Schema);
+            b.ToTable(options.TablePrefix + "mesout", options.Schema);
             //Configure ABP properties
             b.ConfigureByConvention();
 
             //Properties
-            b.Property(q => q.Mesout_ref_nbr).HasMaxLength(20);
+            b.Property(q => q.Mesout_ref_nbr).HasMaxLength(36);
             b.Property(q => q.Mesout_id).HasMaxLength(1);
             b.Property(q => q.Mesout_part).HasMaxLength(20);
             b.Property(q => q.Mesout_date).HasMaxLength(8);
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapDbContextModelCreatingExtensions.cs
index 2463c3f6d..16f29043e 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapDbContextModelCreatingExtensions.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Mes/Scrap/ScrapDbContextModelCreatingExtensions.cs
@@ -30,7 +30,6 @@ public static class ScrapDbContextModelCreatingExtensions
             b.Property(q => q.mesout_asd_stat).HasMaxLength(1);
             b.Property(q => q.SCN).HasMaxLength(45);
             b.Property(q => q.Yl1);
-            b.Property(q => q.Mes_Barcode).HasMaxLength(50);
         });
 
     }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json
index 87fb22fe9..a00c200c9 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json
@@ -1,7 +1,7 @@
 {
   "ConnectionStrings": {
     "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
-    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
     "EOS": "Server=61.139.155.47;Database=EOSSH;Uid=wms;Pwd=1;TrustServerCertificate=True"
   },
 
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/FawtygAutoMapperProfile.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/FawtygAutoMapperProfile.cs
index 8d181c4a1..0f32b55f7 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/FawtygAutoMapperProfile.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/FawtygAutoMapperProfile.cs
@@ -2,6 +2,7 @@ using AutoMapper;
 using Volo.Abp.AutoMapper;
 using Win_in.Sfs.Shared.Application;
 using Win_in.Sfs.Wms.DataExchange.Domain;
+using Win_in.Sfs.Wms.DataExchange.WMS.BackFlushNote;
 using Win_in.Sfs.Wms.DataExchange.WMS.MaterialRequest;
 using Win_in.Sfs.Wms.DataExchange.WMS.PCK;
 using Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote;
@@ -18,7 +19,8 @@ public class FawtygAutoMapperProfile : Profile
         CreateMap<IncomingFromExternal, ArchivedIncomingFromExternal>();
         CreateMap<OutgoingFromWms, ArchivedOutgoingFromWms>();
         CreateMap<OutgoingToExternal, ArchivedOutgoingToExternal>();
-
+        CreateMap<BackFlushNoteExchangeDto, BackFlushNoteEditInput>();
+        CreateMap<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>();
         CreateMap<ProductReceiptNoteExchangeDto, ProductReceiptNoteEditInput>()
 
             .Ignore(x => x.Number)
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
index 29850a294..e7102b08a 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
@@ -10,6 +11,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.DataExchange.Domain;
 using Win_in.Sfs.Wms.DataExchange.WMS.BackFlushNote;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
 
 namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent.Incoming;
 
@@ -70,7 +72,8 @@ public class BackFluConverter : IIncomingConverter
             incomingToWms.SetEffectiveDate(first.EffectiveDate);
             var exchangeBack = JsonSerializer.Deserialize<BackFlushNoteExchangeDto>(first.DestinationDataContent);
             var wmsBack = _objectMapper.Map<BackFlushNoteExchangeDto, BackFlushNoteEditInput>(exchangeBack);
-            var item1 = await _itemBasicAppService.GetByCodeAsync(wmsBack.ItemCode).ConfigureAwait(false);
+            var item1 = await _itemBasicAppService.GetByCodeAsync(wmsBack.ItemCode).ConfigureAwait(false);          
+            wmsBack.ProductReceiptNumber = DateTime.Now.ToShortDateString().Replace("/","").Trim();
             if (item1 != null)
             {
                 wmsBack.ItemName = item1.Name;
@@ -80,7 +83,18 @@ public class BackFluConverter : IIncomingConverter
             {
                 wmsBack.ItemName = "";
                 wmsBack.Uom = "";
-            }          
+            }
+            wmsBack.PackingCode = "jiekou";
+            wmsBack.LocationCode = "jiekou";
+            wmsBack.LocationArea = "jiekou";
+            wmsBack.LocationGroup = "jiekou";
+            wmsBack.LocationErpCode = "jiekou";
+            
+            wmsBack.ProductionPlanNumber = "jiekou";
+            wmsBack.Workshop = "jiekou";
+            wmsBack.ProdLine = "jiekou";
+            wmsBack.WarehouseCode = "jiekou";
+            wmsBack.Lot = "jiekou";
             wmsBack.Details = new List<BackFlushNoteDetailInput>();
             foreach (var incomingFromExternal in group.ToList())
             {
@@ -105,6 +119,7 @@ public class BackFluConverter : IIncomingConverter
                 wmsBackDetail.WarehouseCode = loctioncode.WarehouseCode;
                 wmsBackDetail.LocationArea = loctioncode.AreaCode;
                 wmsBackDetail.LocationGroup = loctioncode.LocationGroupCode;
+                wmsBackDetail.PackingCode = "jiekou";
                 wmsBack.Details.Add(wmsBackDetail);
             }
             incomingToWms.DataContent = JsonSerializer.Serialize(wmsBack);
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
index 65ab98fdc..ab8f9ad0d 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
@@ -76,14 +76,14 @@ public class BackFluReader : IReader
         {
             DataType = EnumIncomingDataType.BackFlush.ToString(),
             DataAction = EnumExchangeDataAction.Add,
-            SourceSystem = EnumSystemType.ERP.ToString(),
+            SourceSystem = EnumSystemType.MES.ToString(),
             SourceDataId = backflu.scmout_type,
             SourceDataGroupCode = backflu.scmout_nbr,
             SourceDataDetailCode = backflu.scmout_part,
             SourceDataContent = JsonSerializer.Serialize(backflu),
             WriteTime = DateTime.Now,
             Writer = nameof(MesIncomingBackgroundWorker),
-            DestinationSystem = EnumSystemType.ERP.ToString(),
+            DestinationSystem = EnumSystemType.MES.ToString(),
         };
         return incomingData;
     }
@@ -94,7 +94,8 @@ public class BackFluReader : IReader
         var back = new BackFlushNoteExchangeDto()
         {
 
-            ActiveDate = DateTime.ParseExact(backflu.scmout_dt_w, "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture),
+            // ActiveDate = DateTime.ParseExact(backflu.scmout_dt_w, "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture),
+            ActiveDate = Convert.ToDateTime(backflu.scmout_dt_w.Substring(0, 4) + "-" + backflu.scmout_dt_w.Substring(4, 2) + "-" + backflu.scmout_dt_w.Substring(6, 2)),
             ItemCode = backflu.scmout_part,
             Number = backflu.scmout_nbr
         };
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs
index 4c9fc8910..a4ba1f8e1 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs
@@ -49,14 +49,14 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         //var pullTaskFromExternalList = await pullTaskReader.ReadAsync().ConfigureAwait(false);
         ////转换PullTask
         //await pullTaskConverter.ConvertAsync(pullTaskFromExternalList).ConfigureAwait(false);
-        //Logger.LogInformation($"Read Scrap");
+        Logger.LogInformation($"Read Scrap");
 
-        //var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
-        //var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
-        ////读取并保存Scrap
-        //var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
-        ////转换Scrap
-        //await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
+        var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
+        var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
+        //读取并保存Scrap
+        var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
+        //转换Scrap
+        await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
 
         //Logger.LogInformation($"Read Issue");
         //var pckHandleService = workerContext.ServiceProvider.GetRequiredService<IssueReader>();
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs
index f527cafe8..330020dd0 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs
@@ -87,7 +87,7 @@ public class MesOutConverter : IIncomingConverter
                 wmsProductReceiptNoteDetail.Lot = ""; //排序批次
                 wmsProductReceiptNoteDetail.PackingCode = "";//箱标签
                 wmsProductReceiptNoteDetail.Status = EnumInventoryStatus.OK;
-                wmsProductReceiptNoteDetail.WarehouseCode = "";
+                wmsProductReceiptNoteDetail.WarehouseCode = "T8";             
                 wmsProductReceiptNoteDetail.LocationArea = "";
                 wmsProductReceiptNoteDetail.LocationGroup = "";
                 var loc = await _locationAppService.GetListByTypesAndErpCodeAsync(types, wmsProductReceiptNoteDetail.LocationErpCode).ConfigureAwait(false);
@@ -95,27 +95,24 @@ public class MesOutConverter : IIncomingConverter
                 {
                     wmsProductReceiptNoteDetail.LocationCode = loc[0].Code;
                 }
-               try
-                {
-                    var item = await _itemBasicAppService.GetByCodeAsync(wmsProductReceiptNoteDetail.ItemCode).ConfigureAwait(false);
+
+
+                var item = await _itemBasicAppService.GetByCodeAsync(wmsProductReceiptNoteDetail.ItemCode).ConfigureAwait(false);
                     if (item != null)
                     {
-                        wmsProductReceiptNoteDetail.ItemName = item.Name;
-                        wmsProductReceiptNoteDetail.ItemDesc1 = !string.IsNullOrEmpty(item.Desc1) ? item.Desc1 : "";
-                        wmsProductReceiptNoteDetail.ItemDesc2 = !string.IsNullOrEmpty(item.Desc2) ? item.Desc2 : "";
-                        wmsProductReceiptNoteDetail.Uom = !string.IsNullOrEmpty(item.BasicUom) ? item.BasicUom : "";
-
+                    wmsProductReceiptNoteDetail.ItemName = !string.IsNullOrEmpty(item.Name) ? item.Name : "";
+                    wmsProductReceiptNoteDetail.ItemDesc1 = !string.IsNullOrEmpty(item.Desc1) ? item.Desc1 : "";
+                    wmsProductReceiptNoteDetail.ItemDesc2 = !string.IsNullOrEmpty(item.Desc2) ? item.Desc2 : "";
+                    wmsProductReceiptNoteDetail.Uom = !string.IsNullOrEmpty(item.BasicUom) ? item.BasicUom : "";
                     }
-                }
-                catch (Exception)
-                {
+                    else
+                    {
                     wmsProductReceiptNoteDetail.ItemName = "";
                     wmsProductReceiptNoteDetail.ItemDesc1 = "";
                     wmsProductReceiptNoteDetail.ItemDesc2 = "";
                     wmsProductReceiptNoteDetail.Uom = "";
-
-                }
-                wmsProductReceiptNote.Details.Add(wmsProductReceiptNoteDetail);
+                    }
+                    wmsProductReceiptNote.Details.Add(wmsProductReceiptNoteDetail);
             }
             incomingToWms.DataContent = JsonSerializer.Serialize(wmsProductReceiptNote);
             incomingToWmsList.Add(incomingToWms);
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapConverter.cs
index 4ffe9f041..0a38100ec 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapConverter.cs
@@ -91,11 +91,18 @@ public class ScrapConverter : IIncomingConverter
                   var item = await _itemBasicAppService.GetByCodeAsync(wmsScrapDetail.ItemCode).ConfigureAwait(false);
                 if (item != null)
                 {
-                    wmsScrapDetail.ItemName = item.Name;               
+                    wmsScrapDetail.ItemName =!string.IsNullOrEmpty(item.Name) ? item.Name : "";              
                     wmsScrapDetail.ItemDesc1 = !string.IsNullOrEmpty(item.Desc1) ? item.Desc1 : "";
                     wmsScrapDetail.ItemDesc2 = !string.IsNullOrEmpty(item.Desc2) ? item.Desc2 : "";
                     wmsScrapDetail.Uom = !string.IsNullOrEmpty(item.BasicUom) ? item.BasicUom : "";
                 }
+                else
+                {
+                    wmsScrapDetail.ItemName = ""; 
+                    wmsScrapDetail.ItemDesc1 = "";
+                    wmsScrapDetail.ItemDesc2 = "";
+                    wmsScrapDetail.Uom ="";
+                }
 
                 wmsScarp.Details.Add(wmsScrapDetail);
             }
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/appsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/appsettings.json
index 16f13d97c..0ff65cdaa 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/appsettings.json
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/appsettings.json
@@ -1,12 +1,12 @@
 {
   "ConnectionStrings": {
     "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
-    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
     "MES": "Server=10.164.113.32,1818\\SHDB;Database=MES_SH;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True"
   },
 
   "AuthServer": {
-    "Authority": "http://dev.ccwin-in.com:60083/",
+    "Authority": "http://10.164.113.31:60083/",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "admin",
     "SwaggerClientSecret": "1q2w3E*",
@@ -24,13 +24,13 @@
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      "BaseUrl": "http://10.164.113.31:60084/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:60085/"
+      "BaseUrl": "http://10.164.113.31:60085/"
     },
     "Label": {
-      "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      "BaseUrl": "http://10.164.113.31:60082/"
     }
 
   },
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json
index aeba77ac9..dc2824ba5 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json
@@ -1,13 +1,13 @@
 {
   "ConnectionStrings": {
     "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
-    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
     "TYRP": "Server=10.164.113.32,1818\\SHDB;Database=TYRP;Uid=ShWmsUser;Pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
     "SYBASE_TYRP": "Data Source=10.164.115.137; Port=5000; Database=mesdb; Uid=mesuser; Pwd=mesuser1234;Charset=cp850;" //iso_1
   },
 
   "AuthServer": {
-    "Authority": "http://dev.ccwin-in.com:60083/",
+    "Authority": "http://10.164.113.31:60083/",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "admin",
     "SwaggerClientSecret": "1q2w3E*",
@@ -26,16 +26,16 @@
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      "BaseUrl": "http://10.164.113.31:60084/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:60085/"
+      "BaseUrl": "http://10.164.113.31:60085/"
     },
     "Label": {
-      "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      "BaseUrl": "http://10.164.113.31:60082/"
     },
     "Auth": {
-      "BaseUrl": "http://dev.ccwin-in.com:60083/"
+      "BaseUrl": "http://10.164.113.31:60083/"
     }
   },
   "TyrpOptions": {
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs
index 31b6599f3..3b5a3402e 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs
@@ -150,6 +150,6 @@ public class AgentModule : AbpModule
              ApplicationInitializationContext context)
     {
         context.AddBackgroundWorkerAsync<IncomingToWmsWorker>();
-        context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>();
+        //context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>();
     }
 }
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs
index ff543a74f..0448cbeec 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs
@@ -155,44 +155,9 @@ public static class IncomingToWmsExtensions
     public static async Task HandleBackFlushsAsync(this IncomingToWms incomingConverted, PeriodicBackgroundWorkerContext workerContext)
     {
         var backFlush = JsonSerializer.Deserialize<BackFlushNoteEditInput>(incomingConverted.DataContent);
-
-        var balanceAppService = workerContext.ServiceProvider.GetRequiredService<IBalanceAppService>();
-        
-        var balanceDtos = await balanceAppService.GetRecommendBalancesAsync(new RecommendBalanceRequestInput()
-        {
-            Qty = backFlush.Qty,
-            ItemCode = backFlush.ItemCode,
-            LocationAreas = new List<string>() { backFlush.LocationArea },
-            LocationTypes = new List<EnumLocationType>()
-            {
-                EnumLocationType.WIP,
-            },
-            Statuses = new List<EnumInventoryStatus>()
-            {
-                EnumInventoryStatus.OK,
-            }
-        }).ConfigureAwait(false);
-
-        foreach (var balanceDto in balanceDtos)
-        {
-            backFlush.Details.Add(new BackFlushNoteDetailInput()
-            {
-                Qty = balanceDto.Qty,
-                ItemCode = balanceDto.ItemCode,
-                ArriveDate = balanceDto.ArriveDate,
-                BomVersion = string.Empty,
-                ContainerCode = string.Empty,
-                ExpireDate = balanceDto.ExpireDate,
-                Lot = balanceDto.Lot,
-                LocationCode = balanceDto.LocationCode,
-                LocationErpCode = balanceDto.LocationErpCode,
-                LocationArea = balanceDto.LocationArea,
-                LocationGroup = balanceDto.LocationGroup
-
-            });
-        }
-
         var backFlushAppService = workerContext.ServiceProvider.GetRequiredService<IBackFlushNoteAppService>();
-       // await backFlushAppService.CreateAsync(backFlush);
+        List<BackFlushNoteEditInput> back = new List<BackFlushNoteEditInput>();
+        back.Add(backFlush);
+        await backFlushAppService.CreateManyAsync(back).ConfigureAwait(false);
     }
 }
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs
index 907622f56..6af3c0f18 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs
@@ -79,67 +79,67 @@ public class IncomingToWmsWorker : AsyncPeriodicBackgroundWorkerBase
         switch (dataType)
         {
             case EnumIncomingDataType.Department:
-                await incomingToWms.HandleDepartmentsAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleDepartmentsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.User:
-                await incomingToWms.HandleUsersAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleUsersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Item:
-                await incomingToWms.HandleItemsAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleItemsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Location:
-                await incomingToWms.HandleErpLocationsAsync(workerContext).ConfigureAwait(false);
+             /*   await incomingToWms.HandleErpLocationsAsync(workerContext).ConfigureAwait(false)*/;
                 break;
             case EnumIncomingDataType.Bom:
                 await incomingToWms.HandleBomsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Dict:
-                await incomingToWms.HandleDictsAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleDictsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Supplier:
-                await incomingToWms.HandleSuppliersAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleSuppliersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.SupplierItem:
-                await incomingToWms.HandleSupplierItemsAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleSupplierItemsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.ItemPack:
-                await incomingToWms.HandleItemPacksAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleItemPacksAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Customer:
-                await incomingToWms.HandleCustomersAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleCustomersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.CustomerItem:
-                await incomingToWms.HandleCustomerItemsAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleCustomerItemsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.InterfaceCalendar:
-                await incomingToWms.HandleInterfaceCalendarsAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleInterfaceCalendarsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.PurchaseOrder:
-                await incomingToWms.HandlePurchaseOrdersAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandlePurchaseOrdersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.SaleOrder:
-                await incomingToWms.HandleSaleOrdersAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleSaleOrdersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.SupplierAsn:
-                await incomingToWms.HandleAsnsAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleAsnsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.ProductReceipt:
                 await incomingToWms.HandleProductReceiptsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.MaterialRequest:
-                await incomingToWms.HandleMaterialRequestsAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleMaterialRequestsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Scrap:
-                await incomingToWms.HandleScrapsAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleScrapsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.IssueConfirm:
-                await incomingToWms.HandleIssueNoteConfirmAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleIssueNoteConfirmAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.PurchaseLabel:
-                await incomingToWms.HandleInventoryLabelsAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleInventoryLabelsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.BackFlush:
-                await incomingToWms.HandleBackFlushsAsync(workerContext).ConfigureAwait(false);
+                //await incomingToWms.HandleBackFlushsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.None:
             default:
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json
index f42f6248d..f4e3a4d33 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json
@@ -1,13 +1,13 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
-    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True"
+    "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True"
   },
 
 
 
   "AuthServer": {
-    "Authority": "http://dev.ccwin-in.com:60083/",
+    "Authority": "http://10.164.113.31:60083/",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "admin",
     "SwaggerClientSecret": "1q2w3E*",
@@ -26,16 +26,16 @@
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      "BaseUrl": "http://10.164.113.31:60084/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:60085/"
+      "BaseUrl": "http://10.164.113.31:60085/"
     },
     "Label": {
-      "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      "BaseUrl": "http://10.164.113.31:60082/"
     },
     "Auth": {
-      "BaseUrl": "http://dev.ccwin-in.com:60083/"
+      "BaseUrl": "http://10.164.113.31:60083/"
     }
   },
   "DataExchangeOptions": {

From 7822bc257636286804e2d58cd31f08050e025638 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Mon, 24 Apr 2023 19:08:29 +0800
Subject: [PATCH 12/13] =?UTF-8?q?EOR=E5=8F=91=E8=B4=A7=E5=8D=95mapping?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FawtygAutoMapperProfile.cs                                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/FawtygAutoMapperProfile.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/FawtygAutoMapperProfile.cs
index 5cdb32ef2..e526956e1 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/FawtygAutoMapperProfile.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/FawtygAutoMapperProfile.cs
@@ -60,7 +60,6 @@ public class FawtygAutoMapperProfile : Profile
             .Ignore(x => x.Details)
             .Ignore(x => x.ExtraProperties)
             .Ignore(x => x.Status)
-
             .Ignore(x => x.RpNumber)
             .Ignore(x => x.DockCode)
             .Ignore(x => x.Remark)
@@ -69,6 +68,7 @@ public class FawtygAutoMapperProfile : Profile
             ;
 
         CreateMap<SupplierAsnDetailExchangeDto, SupplierAsnDetailInput>()
+              .ForMember(x => x.RecommendErpCode, y => y.MapFrom(d => d.LocationErpCode))
             .Ignore(x => x.ItemName)
             .Ignore(x => x.ItemDesc1)
             .Ignore(x => x.ItemDesc2)

From 8fdd4a9eb25253f1efe1647ebd554d9b5fd05dbd Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Mon, 24 Apr 2023 19:09:43 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IncomingToWmsWorker.cs                    | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs
index 6af3c0f18..907622f56 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs
@@ -79,67 +79,67 @@ public class IncomingToWmsWorker : AsyncPeriodicBackgroundWorkerBase
         switch (dataType)
         {
             case EnumIncomingDataType.Department:
-                //await incomingToWms.HandleDepartmentsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleDepartmentsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.User:
-                //await incomingToWms.HandleUsersAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleUsersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Item:
-                //await incomingToWms.HandleItemsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleItemsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Location:
-             /*   await incomingToWms.HandleErpLocationsAsync(workerContext).ConfigureAwait(false)*/;
+                await incomingToWms.HandleErpLocationsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Bom:
                 await incomingToWms.HandleBomsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Dict:
-                //await incomingToWms.HandleDictsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleDictsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Supplier:
-                //await incomingToWms.HandleSuppliersAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleSuppliersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.SupplierItem:
-                //await incomingToWms.HandleSupplierItemsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleSupplierItemsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.ItemPack:
-                //await incomingToWms.HandleItemPacksAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleItemPacksAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Customer:
-                //await incomingToWms.HandleCustomersAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleCustomersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.CustomerItem:
-                //await incomingToWms.HandleCustomerItemsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleCustomerItemsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.InterfaceCalendar:
-                //await incomingToWms.HandleInterfaceCalendarsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleInterfaceCalendarsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.PurchaseOrder:
-                //await incomingToWms.HandlePurchaseOrdersAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandlePurchaseOrdersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.SaleOrder:
-                //await incomingToWms.HandleSaleOrdersAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleSaleOrdersAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.SupplierAsn:
-                //await incomingToWms.HandleAsnsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleAsnsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.ProductReceipt:
                 await incomingToWms.HandleProductReceiptsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.MaterialRequest:
-                //await incomingToWms.HandleMaterialRequestsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleMaterialRequestsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.Scrap:
-                //await incomingToWms.HandleScrapsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleScrapsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.IssueConfirm:
-                //await incomingToWms.HandleIssueNoteConfirmAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleIssueNoteConfirmAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.PurchaseLabel:
-                //await incomingToWms.HandleInventoryLabelsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleInventoryLabelsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.BackFlush:
-                //await incomingToWms.HandleBackFlushsAsync(workerContext).ConfigureAwait(false);
+                await incomingToWms.HandleBackFlushsAsync(workerContext).ConfigureAwait(false);
                 break;
             case EnumIncomingDataType.None:
             default: