PUB发运数据

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs

@@ -53,10 +53,10 @@ public class Startup
         {
             //scheduler.Schedule<HBPOSeSyncAppService>().EveryMinute();
             //scheduler.Schedule<BBACSeSyncAppService>().EveryMinute();
-            //scheduler.Schedule<ZhiGongBBACSeSyncAppService>().EveryMinute();
+            scheduler.Schedule<ZhiGongBBACSeSyncAppService>().EveryMinute();
-            //scheduler.Schedule<ZhiGongHBPOSeSyncAppService>().EveryMinute();
+            scheduler.Schedule<ZhiGongHBPOSeSyncAppService>().EveryMinute();
-            //scheduler.Schedule<BeiSeSyncAppService>().EveryMinute();
+            scheduler.Schedule<BeiSeSyncAppService>().EveryMinute();
-            //scheduler.Schedule<YinDuSeSyncAppService>().EveryMinute();
+            scheduler.Schedule<YinDuSeSyncAppService>().EveryMinute();
         });
         var contentTypeProvider = new FileExtensionContentTypeProvider();
         contentTypeProvider.Mappings.Add(".mjs", "text/javascript");

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Magicodes.ExporterAndImporter.Core;
 using Volo.Abp.Application.Dtos;
@@ -11,70 +12,112 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 public class PUB_SE_DETAIL_DTO : EntityDto<Guid>
 {
     /// <summary>
-    /// 期间
+    /// 发货单号
     /// </summary>
-    [Display(Name = "期间")]
+    [Display(Name = "发货单号")]
-    public int Version { set; get; }
+    public string WmsBillNum { get; set; }
 
     /// <summary>
-    /// 发货时间 
+    /// 发货时间
     /// </summary>
-    [Display(Name = "发货时间")]
+    [DisplayName("发货时间")]
-    public DateTime ShippingDate { set; get; }
+    public DateTime BillTime { get; set; }
 
     /// <summary>
-    /// 发运单号
+    /// 零件号
     /// </summary>
-    [Display(Name = "发运单号")]
+    [DisplayName("零件号")]
-    public string WmsBillNum { set; get; }
+    public string PartCode { get; set; }
 
     /// <summary>
-    /// 零件号
+    /// 批次
+    /// </summary>
+    [DisplayName("批次")]
+    public string Batch { get; set; }
+
+    /// <summary>
+    /// 发货人
+    /// </summary>
+    [DisplayName("发货人")]
+    public string Oper { get; set; }
+
+    /// <summary>
+    /// DN单据号
+    /// </summary>
+    [DisplayName("DN单据号")]
+    public string DnBillNum { get; set; }
+
+    /// <summary>
+    /// DN单据时间
+    /// </summary>
+    [DisplayName("DN单据时间")]
+    public DateTime DnBillTime { get; set; }
+
+    /// <summary>
+    /// DN单添加人
+    /// </summary>
+    [DisplayName("DN单添加人")]
+    public string DnOper { get; set; }
+
+    /// <summary>
+    /// 交付索引
+    /// </summary>
+    [DisplayName("交付索引")]
+    public string DeliveryIndex { get; set; }
+
+    /// <summary>
+    /// 客户
+    /// </summary>
+    [DisplayName("客户")]
+    public string CustId { get; set; }
+
+    /// <summary>
+    /// 发货仓库
     /// </summary>
-    [Display(Name = "零件号")]
+    [DisplayName("发货仓库")]
-    public string LU { get; set; }
+    public string DeliveryHose { get; set; }
 
     /// <summary>
-    /// 生产号
+    /// 来源库位
     /// </summary>
-    [Display(Name = "生产号")]
+    [DisplayName("来源库位")]
-    public string PN { get; set; }
+    public string FromLocCode { get; set; }
 
     /// <summary>
-    /// 组合键值（LU+PN）
+    /// 来源仓库
     /// </summary>
-    [Display(Name = "组合键值（LU+PN）")]
+    [DisplayName("来源仓库")]
-    public string KeyCode { get; set; }
+    public string FromHose { get; set; }
 
     /// <summary>
-    /// 数量
+    /// 来源ERP库存
     /// </summary>
-    [Display(Name = "数量")]
+    [DisplayName("来源ERP库存")]
-    public decimal Qty { get; set; }
+    public string FromErpLocCode { get; set; }
 
     /// <summary>
-    /// 日顺序号
+    /// 目标库位
     /// </summary>
-    [Display(Name = "日顺序号")]
+    [DisplayName("目标库位")]
-    public string SeqNumber { get; set; }
+    public string ToLocCode { get; set; }
 
     /// <summary>
-    /// 小总成号
+    /// 目标Erp库位
     /// </summary>
-    [Display(Name = "小总成号")]
+    [DisplayName("目标Erp库位")]
-    public string AssemblyCode { get; set; }
+    public string ToErpLocCode { get; set; }
 
     /// <summary>
-    /// 注塑码
+    /// 目标仓库
     /// </summary>
-    [Display(Name = "注塑码")]
+    [DisplayName("目标仓库")]
-    public string InjectionCode { get; set; }
+    public string ToHose { get; set; }
 
     /// <summary>
-    /// 订单时间
+    /// 备注
     /// </summary>
-    [Display(Name = "订单时间")]
+    [DisplayName("备注")]
-    public DateTime BeginDate { get; set; }
+    public string Remark { get; set; }
 }
 
 /// <summary>
@@ -94,72 +137,128 @@ public class PUB_SE_DETAIL_RequestDto : RequestDto
 public class PUB_SE_DETAIL_EXPORT_DTO
 {
     /// <summary>
-    /// 期间
+    /// 发货单号
     /// </summary>
-    [ExporterHeader(DisplayName = "日顺序号")]
+    [Display(Name = "发货单号")]
-    public int Version { set; get; }
+    [ExporterHeader(DisplayName = "发货单号")]
+    public string WmsBillNum { get; set; }
 
     /// <summary>
-    /// 发货时间 
+    /// 发货时间
     /// </summary>
-    [ExporterHeader(DisplayName = "日顺序号")]
+    [DisplayName("发货时间")]
-    public DateTime ShippingDate { set; get; }
+    [ExporterHeader(DisplayName = "发货时间")]
+    public DateTime BillTime { get; set; }
 
     /// <summary>
-    /// 发运单号
+    /// 零件号
     /// </summary>
-    [ExporterHeader(DisplayName = "日顺序号")]
+    [DisplayName("零件号")]
-    public string WmsBillNum { set; get; }
+    [ExporterHeader(DisplayName = "零件号")]
+    public string PartCode { get; set; }
 
     /// <summary>
-    /// 零件号
+    /// 批次
+    /// </summary>
+    [DisplayName("批次")]
+    [ExporterHeader(DisplayName = "批次")]
+    public string Batch { get; set; }
+
+    /// <summary>
+    /// 发货人
+    /// </summary>
+    [DisplayName("发货人")]
+    [ExporterHeader(DisplayName = "发货人")]
+    public string Oper { get; set; }
+
+    /// <summary>
+    /// DN单据号
+    /// </summary>
+    [DisplayName("DN单据号")]
+    [ExporterHeader(DisplayName = "DN单据号")]
+    public string DnBillNum { get; set; }
+
+    /// <summary>
+    /// DN单据时间
+    /// </summary>
+    [DisplayName("DN单据时间")]
+    [ExporterHeader(DisplayName = "DN单据时间")]
+    public DateTime DnBillTime { get; set; }
+
+    /// <summary>
+    /// DN单添加人
+    /// </summary>
+    [DisplayName("DN单添加人")]
+    [ExporterHeader(DisplayName = "DN单添加人")]
+    public string DnOper { get; set; }
+
+    /// <summary>
+    /// 交付索引
+    /// </summary>
+    [DisplayName("交付索引")]
+    [ExporterHeader(DisplayName = "交付索引")]
+    public string DeliveryIndex { get; set; }
+
+    /// <summary>
+    /// 客户
+    /// </summary>
+    [DisplayName("客户")]
+    [ExporterHeader(DisplayName = "客户")]
+    public string CustId { get; set; }
+
+    /// <summary>
+    /// 发货仓库
     /// </summary>
-    [ExporterHeader(DisplayName = "日顺序号")]
+    [DisplayName("发货仓库")]
-    public string LU { get; set; }
+    [ExporterHeader(DisplayName = "发货仓库")]
+    public string DeliveryHose { get; set; }
 
     /// <summary>
-    /// 生产号
+    /// 来源库位
     /// </summary>
-    [ExporterHeader(DisplayName = "日顺序号")]
+    [DisplayName("来源库位")]
-    public string PN { get; set; }
+    [ExporterHeader(DisplayName = "来源库位")]
+    public string FromLocCode { get; set; }
 
     /// <summary>
-    /// 组合键值（LU+PN）
+    /// 来源仓库
     /// </summary>
-    [ExporterHeader(DisplayName = "日顺序号")]
+    [DisplayName("来源仓库")]
-    public string KeyCode { get; set; }
+    [ExporterHeader(DisplayName = "来源仓库")]
+    public string FromHose { get; set; }
 
     /// <summary>
-    /// 数量
+    /// 来源ERP库存
     /// </summary>
-    [ExporterHeader(DisplayName = "日顺序号")]
+    [DisplayName("来源ERP库存")]
-    public decimal Qty { get; set; }
+    [ExporterHeader(DisplayName = "来源ERP库存")]
+    public string FromErpLocCode { get; set; }
 
     /// <summary>
-    /// 日顺序号
+    /// 目标库位
     /// </summary>
-    [Display(Name = "日顺序号")]
+    [DisplayName("目标库位")]
-    [ExporterHeader(DisplayName = "日顺序号")]
+    [ExporterHeader(DisplayName = "目标库位")]
-    public string SeqNumber { get; set; }
+    public string ToLocCode { get; set; }
 
     /// <summary>
-    /// 小总成号
+    /// 目标Erp库位
     /// </summary>
-    [Display(Name = "小总成号")]
+    [DisplayName("目标Erp库位")]
-    [ExporterHeader(DisplayName = "小总成号")]
+    [ExporterHeader(DisplayName = "目标Erp库位")]
-    public string AssemblyCode { get; set; }
+    public string ToErpLocCode { get; set; }
 
     /// <summary>
-    /// 注塑码
+    /// 目标仓库
     /// </summary>
-    [Display(Name = "注塑码")]
+    [DisplayName("目标仓库")]
-    [ExporterHeader(DisplayName = "注塑码")]
+    [ExporterHeader(DisplayName = "目标仓库")]
-    public string InjectionCode { get; set; }
+    public string ToHose { get; set; }
 
     /// <summary>
-    /// 订单时间
+    /// 备注
     /// </summary>
-    [Display(Name = "订单时间")]
+    [DisplayName("备注")]
-    [ExporterHeader(DisplayName = "订单时间")]
+    [ExporterHeader(DisplayName = "备注")]
-    public DateTime BeginDate { get; set; }
+    public string Remark { get; set; }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JitSeSyncAppService.cs

@@ -75,7 +75,11 @@ public class JitSeSyncAppService : ApplicationService, IInvocable
         var pubSeDetails = ObjectMapper.Map<List<TM_BJBMPT_OTHER_RECORD>, List<PUB_SE_DETAIL>>(wmsSeRecords);
         if (pubSeDetails.Any())
         {
-            pubSeDetails.ForEach(t => t.BusinessType = businessType);
+            pubSeDetails.ForEach(t =>
+            {
+                t.BusinessType = businessType;
+                t.KeyCode = t.PN + t.LU;
+            });
             await _pubSeDetailRepository.InsertManyAsync(pubSeDetails);
 
             if (syncPositionFlag != null)

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs

@@ -54,6 +54,9 @@ public class PUB_SE_DETAIL :SE_BASE
     [DisplayName("发货时间")]
     public DateTime BillTime { get; set; }
 
+    /// <summary>
+    /// PartCode
+    /// </summary>
     [DisplayName("零件号")]
     public string PartCode { get; set; }
 
@@ -94,7 +97,7 @@ public class PUB_SE_DETAIL :SE_BASE
     public string DeliveryIndex { get; set; }
 
     /// <summary>
-    /// CustId
+    /// 客户
     /// </summary>
     [DisplayName("客户")]
     public string CustId { get; set; }
@@ -105,6 +108,9 @@ public class PUB_SE_DETAIL :SE_BASE
     [DisplayName("发货仓库")]
     public string DeliveryHose { get; set; }
 
+    /// <summary>
+    /// 来源库位
+    /// </summary>
     [DisplayName("来源库位")]
     public string FromLocCode { get; set; }