线边仓调拨、客户调拨修改

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/FawtygAutoMapperProfile.cs

@@ -12,6 +12,8 @@ using Win_in.Sfs.Wms.DataExchange.WMS.CustomerReturnNote;
 using Win_in.Sfs.Wms.DataExchange.WMS.DeliverNote;
 using Win_in.Sfs.Wms.DataExchange.WMS.Deparment;
 using Win_in.Sfs.Wms.DataExchange.WMS.Dict;
+using Win_in.Sfs.Wms.DataExchange.WMS.ErpLocation;
+using Win_in.Sfs.Wms.DataExchange.WMS.ErpLocationItem;
 using Win_in.Sfs.Wms.DataExchange.WMS.InterfaceCalendar;
 using Win_in.Sfs.Wms.DataExchange.WMS.ItemBasic;
 using Win_in.Sfs.Wms.DataExchange.WMS.ItemTransformNote;
@@ -123,5 +125,7 @@ public class FawtygAutoMapperProfile : Profile
         CreateMap<ProductRecycleMaterialDetailDTO, ProductRecycleMaterialDetailExchangeDto>();
         CreateMap<BackFlushNoteExchangeDto, BackFlushNoteEditInput>();
         CreateMap<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>();
+        CreateMap<ErpLocationExchangeDto, ErpLocationEditInput>();
+        CreateMap<ErpLocationItemExchangeDto, ErpLocationItemEditInput>();
     }
 }

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

@@ -1,13 +1,13 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
-    "DataExchange": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_DataExchange_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
-    "TYRP": "Server=dev.ccwin-in.com,13319;Database=TYRP_CC;Uid=ccwin-in;Pwd=Microsoft@2022;TrustServerCertificate=True",
+    "Default": "Server=10.164.233.6;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
+    "DataExchange": "Server=10.164.233.6;Database=WMS_DongYang_DataExchange_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
+    "TYRP": "Server=10.164.233.6;Database=TYRP_CC;Uid=ccwin-in;Pwd=Microsoft@2022;TrustServerCertificate=True",
     "SYBASE_TYRP": "Data Source=10.164.233.4; Port=5000; Database=mesdb; Uid=sa; Pwd=dawning;Charset=cp850;" //iso_1
   },
 
   "AuthServer": {
-    "Authority": "http://dev.ccwin-in.com:60083/",
+    "Authority": "http://10.164.233.5:60083/",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "admin",
     "SwaggerClientSecret": "1q2w3E*",
@@ -26,16 +26,16 @@
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      "BaseUrl": "http://10.164.233.5:60084/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:60085/"
+      "BaseUrl": "http://10.164.233.5:60085/"
     },
     "Label": {
-      "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      "BaseUrl": "http://10.164.233.5:60082/"
     },
     "Auth": {
-      "BaseUrl": "http://dev.ccwin-in.com:60083/"
+      "BaseUrl": "http://10.164.233.5:60083/"
     }
   },
   "TyrpOptions": {

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>();
     }
 }

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

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

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs

@@ -69,13 +69,13 @@ public class TransferRequestImportInput : SfsStoreImportInputBase
     [Display(Name = "箱码")]
     public string PackingCode { get; set; }
 
-    /// <summary>
-    /// 状态
-    /// </summary>
-    [Display(Name = "状态")]
-    [Required(ErrorMessage = "{0}是必填项")]
-    [ValueMapping("合格", EnumInventoryStatus.OK)]
-    public string Status { get; set; }
+    ///// <summary>
+    ///// 状态
+    ///// </summary>
+    //[Display(Name = "状态")]
+    //[Required(ErrorMessage = "{0}是必填项")]
+    //[ValueMapping("合格", EnumInventoryStatus.OK)]
+    //public EnumInventoryStatus Status { get; set; }
 
     #region 回调服务相关
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs

@@ -103,7 +103,7 @@ public class PutawayNoteAppService :
                 var isClosed = await _purchaseOrderManager.CheckIsCloseAsync(inputSplit.Number, inputSplit.SupplierCode, detail.ItemCode).ConfigureAwait(false);
                 if (isClosed)
                 {
-                    throw new UserFriendlyException($"物品名称【{detail.ItemCode}】的订单明细行以关闭无法执行采购上架！");
+                    throw new UserFriendlyException($"箱码为【{detail.ToPackingCode}】的订单明细行已关闭，无法执行采购上架！"); 
                 }
                 var item = await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
                 if (!item.CanMake)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferRequests/TransferRequestAppService.cs

@@ -94,14 +94,14 @@ public class TransferRequestAppService : SfsStoreRequestAppServiceBase
             {
                 transferRequest.Type = EnumTransSubType.Transfer_Customer.ToString(); //重点 需要转换
                 enumTransSubType = EnumTransSubType.Transfer_Customer;
-                transferRequest.UseOnTheWayLocation = true;
+                transferRequest.UseOnTheWayLocation = false;
             }
             //线边调拨
             if (transferRequest.Type == EnumTransSubType.Transfer_WIP.GetDisplayName()) 
             {
                 transferRequest.Type = EnumTransSubType.Transfer_WIP.ToString(); //重点 需要转换
                 enumTransSubType = EnumTransSubType.Transfer_WIP;
-                transferRequest.UseOnTheWayLocation = true;
+                transferRequest.UseOnTheWayLocation = false;
             }
 
             foreach (var detail in transferRequest.Details)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferRequests/TransferRequestMapperProfile.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 
@@ -39,8 +40,8 @@ public partial class StoreApplicationAutoMapperProfile : Profile
             .IgnoreAuditedObjectProperties()
             .ForMember(x => x.ToPackingCode, y => y.MapFrom(d => d.PackingCode ?? string.Empty))
             .ForMember(x => x.FromPackingCode, y => y.MapFrom(d => d.PackingCode ?? string.Empty))
-            .ForMember(x => x.FromStatus, y => y.MapFrom(d => d.Status))
-            .ForMember(x => x.ToStatus, y => y.MapFrom(d => d.Status))
+            .ForMember(x => x.FromStatus, y => y.MapFrom(t => EnumInventoryStatus.OK))
+            .ForMember(x => x.ToStatus, y => y.MapFrom(t => EnumInventoryStatus.OK))
             .Ignore(x => x.FromLocationGroup)
             .Ignore(x => x.FromLocationArea)
             .Ignore(x => x.FromLocationErpCode)