成品发运添加车牌号

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

@@ -250,7 +250,6 @@ public class FawtygAutoMapperProfile : Profile
            .Ignore(x => x.StdPackQty);
 
         CreateMap<DeliverRequestExchangeDto, DeliverRequestEditInput>()
-          .Ignore(x => x.DeliverPlanNumber)
           .Ignore(x => x.ExtraProperties)
           .Ignore(x => x.Details)
           .Ignore(x => x.CustomerAddressCode)

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/DeliveryReader.cs

@@ -98,11 +98,13 @@ public class DeliveryReader : IReader
         var mesRequest = new DeliverRequestExchangeDto()
         {
             DeliverRequestType = Delivery.mesout_delivery_type == "0" ? EnumDeliverRequestType.FIS : EnumDeliverRequestType.Normal,
+            DeliverPlanNumber= Delivery.mesout_delivery_type == "0" ? Delivery.mesout_delivery_no : Delivery.mesout_delivery_plan,
             CustomerCode = Delivery.mesout_delivery_customer,
             Number = Delivery.mesout_delivery_no,
             Worker = "MESFY",
             ActiveDate = DateTime.TryParse(Delivery.mesout_delivery_wt, out DateTime dateTime) ? dateTime : DateTime.Now,
-            DeliverTime = DateTime.TryParse(Delivery.mesout_delivery_wt, out DateTime dateTime1) ? dateTime1 : DateTime.Now
+            DeliverTime = DateTime.TryParse(Delivery.mesout_delivery_wt, out DateTime dateTime1) ? dateTime1 : DateTime.Now,
+            MesTruckNumber=Delivery.mesout_delivery_carno,
         };
         var mesRequestDetail = new DeliverRequestDetailExchangeDto()
         {

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CustomerReturnNoteConverter.cs

@@ -41,7 +41,7 @@ public class CustomerReturnNoteConverter : IOutgoingConverter
     {
         var outgoingToExternalList = new List<OutgoingToExternal>();
         //获取要同步得数据
-        var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.UnplannedReceipt, EnumSystemType.ERP).ConfigureAwait(false);
+        var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.CustomerReturn, EnumSystemType.ERP).ConfigureAwait(false);
         foreach (var outgoingFromWms in outgoingFromWmsList)
         {
             #region 主表

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs

@@ -156,12 +156,12 @@ public class TyrpOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         }
         #endregion
 
-        #region --接口以关闭-- 退货单 UnplannedReceipt wmsoutm
+        #region --接口以关闭-- 退货单 CustomerReturn wmsoutm
         //暂无此接口
-        //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);
         #endregion
 
         #region  非生产领料单 UnplannedIssue wmsoutm

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

@@ -26,10 +26,10 @@
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://localhost:59094/"
+      "BaseUrl": "http://dev.ccwin-in.com:60084/"
     },
     "Store": {
-      "BaseUrl": "http://localhost:59095/"
+      "BaseUrl": "http://dev.ccwin-in.com:60085/"
     },
     "Label": {
       "BaseUrl": "http://dev.ccwin-in.com:60082/"

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverRequest/DeliverRequestExchangeDto.cs

@@ -27,7 +27,14 @@ public class DeliverRequestExchangeDto
     /// 发货类型
     /// </summary>
     public EnumDeliverRequestType DeliverRequestType { get; set; }
-
+    /// <summary>
+    /// 看板件发货计划单号/JIS发货单号
+    /// </summary>
+    public string DeliverPlanNumber { get; set; }
+    /// <summary>
+    /// Mes车牌号
+    /// </summary>
+    public string MesTruckNumber { get; set; }
     /// <summary>
     /// 客户
     /// </summary>

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml

@@ -626,6 +626,16 @@
             发货类型
             </summary>
         </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.DeliverRequest.DeliverRequestExchangeDto.DeliverPlanNumber">
+            <summary>
+            看板件发货计划单号/JIS发货单号
+            </summary>
+        </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.DeliverRequest.DeliverRequestExchangeDto.MesTruckNumber">
+            <summary>
+            Mes车牌号
+            </summary>
+        </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.DeliverRequest.DeliverRequestExchangeDto.CustomerCode">
             <summary>
             客户

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/DeliverJobs/DTOs/DeliverJobDTO.cs

@@ -38,5 +38,10 @@ public class DeliverJobDTO : SfsJobDTOBase<DeliverJobDetailDTO>
     /// </summary>
     [Display(Name = "发货请求单号")]
     public string DeliverRequestNumber { get; set; }
+    /// <summary>
+    /// Mes车牌号
+    /// </summary>
+    [Display(Name = "Mes车牌号")]
+    public string MesTruckNumber { get; set; }
 
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/DeliverJobs/Inputs/DeliverJobEditInput.cs

@@ -73,5 +73,10 @@ public class DeliverJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInp
     /// </summary>
     [Display(Name = "发货计划单号")]
     public string DeliverPlanNumber { get; set; }
+    /// <summary>
+    /// Mes车牌号
+    /// </summary>
+    [Display(Name = "Mes车牌号")]
+    public string MesTruckNumber { get; set; }
     #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/DeliverNotes/DTOs/DeliverNoteDTO.cs

@@ -54,6 +54,11 @@ public class DeliverNoteDTO : SfsStoreDTOBase<DeliverNoteDetailDTO>
     /// <returns></returns>
     [Display(Name = "打印次数")]
     public int CountPrint { get; set; }
+    /// <summary>
+    /// Mes车牌号
+    /// </summary>
+    [Display(Name = "Mes车牌号")]
+    public string MesTruckNumber { get; set; }
 
     /// <summary>
     /// 发货类型

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/DeliverNotes/Inputs/DeliverNoteEditInput.cs

@@ -57,7 +57,11 @@ public class DeliverNoteEditInput : SfsStoreCreateOrUpdateInputBase
     /// </summary>
     [Display(Name = "发货类型")]
     public EnumDeliverRequestType DeliverRequestType { get; set; }
-
+    /// <summary>
+    /// Mes车牌号
+    /// </summary>
+    [Display(Name = "Mes车牌号")]
+    public string MesTruckNumber { get; set; }
     /// <summary>
     /// 明细列表
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/DTOs/DeliverRequestDTO.cs

@@ -31,4 +31,8 @@ public class DeliverRequestDTO : SfsStoreRequestDTOBase<DeliverRequestDetailDTO>
     /// </summary>
     [Display(Name = "客户地址")]
     public string CustomerAddressCode { get; set; }
+    /// <summary>
+    /// Mes车牌号
+    /// </summary>
+    public string MesTruckNumber { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestEditInput.cs

@@ -33,6 +33,8 @@ public class DeliverRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
 
     [Display(Name = "发货类型")]
     public EnumDeliverRequestType DeliverRequestType { get; set; }
+    [Display(Name = "Mes车牌号")]
+    public string MesTruckNumber { get; set; }
 
     [Display(Name = "明细列表")]
     public List<DeliverRequestDetailInput> Details { get; set; }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestImportInput.cs

@@ -69,6 +69,11 @@ public class DeliverRequestImportInput : SfsStoreImportInputBase
     [Display(Name = "Mes发货计划号")]
     public string MesDeliveryPlan { get; set; }
     /// <summary>
+    /// Mes车牌号
+    /// </summary>
+    [Display(Name = "Mes车牌号")]
+    public string MesTruckNumber { get; set; }
+    /// <summary>
     /// 底盘号
     /// </summary>
     [Display(Name = "底盘号")]

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs

@@ -72,6 +72,14 @@ IItemBasicAppService itemBasicAppService)
             {
                 throw new UserFriendlyException($"同一发货类型、发货时间、客户的存在相同零件号！");
             }
+            if(request.DeliverRequestType== EnumDeliverRequestType.FIS)
+            {
+                request.DeliverPlanNumber = request.Details.First().MesDeliveryNo;
+            }
+            else if (request.DeliverRequestType == EnumDeliverRequestType.Normal)
+            {
+                request.DeliverPlanNumber = request.Details.First().MesDeliveryPlan;
+            }
             foreach (var detail in request.Details)
             {
                 var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/DeliverJobs/DeliverJob.cs

@@ -41,6 +41,10 @@ public class DeliverJob : SfsJobAggregateRootBase<DeliverJobDetail>
     /// </summary>
     [IgnoreUpdate]
     public string DeliverPlanNumber { get; set; }
+    /// <summary>
+    /// Mes车牌号
+    /// </summary>
+    public string MesTruckNumber { get; set; }
 
     /// <summary>
     /// 任务明细

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/DeliverNotes/DeliverNote.cs

@@ -60,7 +60,10 @@ public class DeliverNote : SfsStoreAggregateRootBase<DeliverNoteDetail>, IHasJob
     /// <returns></returns>
     [Display(Name = "打印次数")]
     public int CountPrint { get; set; }
-
+    /// <summary>
+    /// Mes车牌号
+    /// </summary>
+    public string MesTruckNumber { get; set; }
     /// <summary>
     /// 明细列表
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/DeliverRequests/DeliverRequest.cs

@@ -20,7 +20,6 @@ public class DeliverRequest : SfsStoreRequestAggregateRootBase<DeliverRequestDet
     /// <summary>
     /// 发货计划单号
     /// </summary>
-    [IgnoreUpdate]
     public string DeliverPlanNumber { get; set; }
 
     /// <summary>
@@ -39,6 +38,10 @@ public class DeliverRequest : SfsStoreRequestAggregateRootBase<DeliverRequestDet
     /// 发货类型
     /// </summary>
     public EnumDeliverRequestType DeliverRequestType { get; set; }
+    /// <summary>
+    /// Mes车牌号
+    /// </summary>
+    public string MesTruckNumber { get; set; }
 
     /// <summary>
     /// 任务明细

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/DeliverJobs/DeliverJobDbContextModelCreatingExtensions.cs

@@ -24,6 +24,7 @@ public static class DeliverJobDbContextModelCreatingExtensions
             b.Property(q => q.DeliverRequestNumber).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.CustomerCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.CustomerAddressCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.MesTruckNumber).HasMaxLength(SfsPropertyConst.CodeLength);
             //Relations
             b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();
             //Indexes

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/DeliverNotes/DeliverNoteDbContextModelCreatingExtensions.cs

@@ -22,7 +22,7 @@ public static class DeliverNoteDbContextModelCreatingExtensions
             b.Property(q => q.CustomerCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.CustomerAddressCode).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.DeliverRequestType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
-
+            b.Property(q => q.MesTruckNumber).HasMaxLength(SfsPropertyConst.CodeLength);
             //Relations
             b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/DeliverRequests/DeliverRequestDbContextModelCreatingExtensions.cs

@@ -24,7 +24,7 @@ public static class DeliverRequestDbContextModelCreatingExtensions
             b.Property(q => q.DeliverRequestType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
             b.Property(q => q.DeliverPlanNumber).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.RequestStatus).IsRequired().HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
-
+            b.Property(q => q.MesTruckNumber).HasMaxLength(SfsPropertyConst.CodeLength);
             //Relations
             b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();