更新版本

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

@@ -1,4 +1,4 @@
-using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Core;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -21,7 +21,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
             /// <summary>
             ///结算单据
             /// </summary>
-            [Display(Name = "发票分组号")]
+            [Display(Name = "发票号")]
             public string BillNum { get; set; }
             /// <summary>
             ///关联结算单号
@@ -40,7 +40,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
             public string Site { get; set; }
 
         }
-        public class BBAC_PD_EXPORT
+        public class BBAC_PD_EXP_DTO
         {
             /// <summary>
             ///期间
@@ -50,7 +50,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
             /// <summary>
             ///结算单据
             /// </summary>
-            [ExporterHeader(DisplayName = "结算单据")]
+            [ExporterHeader(DisplayName = "发票号")]
             public string BillNum { get; set; }
             /// <summary>
             ///关联结算单号
@@ -73,7 +73,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         {
             [Display(Name = "期间")]
             public int Version { get; set; }
-            [Display(Name = "结算单据")]
+            [Display(Name = "发票号")]
             public string BillNum { get; set; }
             [Display(Name = "关联结算单号")]
             public string SettleBillNum { get; set; }
@@ -162,12 +162,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
         {
 
-            /// <summary>
-            ///工厂地点
-            /// </summary>
-            [ExporterHeader(DisplayName = "工厂地点")]
-            public string Site { get; set; }
-
             /// <summary>
             /// 版本
             /// </summary>
@@ -176,18 +170,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
             /// <summary>
             /// 发票分组号
             /// </summary>
-            [ExporterHeader(DisplayName = "发票分组号")]
+            [ExporterHeader(DisplayName = "发票号")]
             public string BillNum { get; set; }
             /// <summary>
             /// 数量
             /// </summary>
             [ExporterHeader(DisplayName = "数量")]
             public decimal Qty { get; set; }
-            /// <summary>
+            ///// <summary>
-            /// 价格
+            ///// 价格
-            /// </summary>
+            ///// </summary>
-            [ExporterHeader(DisplayName = "单价")]
+            //[ExporterHeader(DisplayName = "单价")]
-            public decimal Price { get; set; }
+            //public decimal Price { get; set; }
             /// <summary>
             /// 发票分组号
             /// </summary>
@@ -206,7 +200,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
             /// <summary>
             /// 零件LU
             /// </summary>
-            [ExporterHeader(DisplayName = "LU")]
+            [ExporterHeader(DisplayName = "零件号LU")]
             public string LU { get; set; }
             /// <summary>
             /// 生产码

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs

@@ -212,44 +212,7 @@ namespace Win.Sfs.SettleAccount.Bases
         [UnitOfWork(false)]
         public virtual async Task<string> ReceivedAsync(List<string> p_ins)
         {
-
             await _invMng.ReceivedAsync(p_ins);
-
-
-
-
-            //var entity = await _invMng.GetMainAsync(input.InvbillNum);
-            //if (entity.InvoiceState == InvoiceBillState.报废)
-            //{
-            //    throw new BusinessException("8989", $"发票号{entity.InvbillNum}为报废状态, 不能提交!");
-            //}
-            //if (entity.InvoiceState == InvoiceBillState.提交 )
-            //{
-            //    throw new BusinessException("8989", $"发票号{entity.InvbillNum}所在发票分组{entity.InvGroupNum}现在为提交状态!");
-            //}
-            //if (entity.State != SettleBillState.财务已审核)
-            //{
-            //    throw new BusinessException("8989", $"发票号{entity.InvbillNum}所在发票分组{entity.InvGroupNum}不是财务已审核状态,不能收票!");
-            //}
-            //if (entity != null)
-            //{
-            //    List<CustomCondition> customConditionList = new List<CustomCondition>();
-            //    customConditionList.Add(new CustomCondition() { Name = "InvGroupNum", Value = entity.InvGroupNum?? string.Empty });
-            //    var invlist= _repository.Where(p => p.InvGroupNum == entity.InvGroupNum).ToList();
-            //    foreach (var inv in invlist) {
-
-            //        if (inv.InvoiceState != InvoiceBillState.报废)
-            //        {
-            //            inv.InvoiceState = InvoiceBillState.提交;
-            //        }
-            //    }
-            //    await _repository.DbContext.BulkUpdateAsync(invlist);
-            //    var _taskid = await _service.ExportEnqueueAsync($"发票分组{entity.InvGroupNum}收票任务", ExportExtentsion.Excel, DateTime.Now.ToString("yyyymm"), string.Empty, CurrentUser, typeof(PD_SERVICE), customConditionList, (rs) =>
-            //    {
-
-            //    });
-            //    return _taskid;      
-            //}
             return ApplicationConsts.SuccessStr;
         }
         protected virtual async Task<List<INVOICE_MAP_GROUP_DTO>> GetMapGroupAsync(INVOICE_GRP_REQ_DTO input)

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs

@@ -1,11 +1,14 @@
 using AutoMapper;
 using DocumentFormat.OpenXml.Bibliography;
 using DocumentFormat.OpenXml.Drawing.Charts;
+using DocumentFormat.OpenXml.Office2010.Excel;
 using Magicodes.ExporterAndImporter.Core;
 using Magicodes.ExporterAndImporter.Csv;
 using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using NPOI.HPSF;
+using NPOI.OpenXmlFormats.Spreadsheet;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
 using SettleAccount.Bases;
 using Shouldly;
@@ -25,7 +28,10 @@ using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.CommonManagers;
 using Win.Sfs.SettleAccount.Constant;
+using Win.Sfs.SettleAccount.Entities.BQ;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.SettleAccount.Entities.BQ.Syncs;
+using Win.Sfs.SettleAccount.Entities.BQ.Vmi;
 using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
 using Win.Sfs.Shared.RepositoryBase;
@@ -41,19 +47,22 @@ namespace Win.Sfs.SettleAccount.Bases
         where TRequestDetailInput : RequestInputBase
         where TEntityDetailExportDto : class, new()
     {
-
+        private readonly VmiAppService _vimservice;
         private readonly INormalEfCoreRepository<TEntity, Guid> _repository;
         private readonly INormalEfCoreRepository<TEntityDetail, Guid> _detailRepository;
 
         public PD_SERVICE(
+
+            
             IExcelImportAppService excelImportService,
             ISnowflakeIdGenerator snowflakeIdGenerator,
             ICommonManager commonManager,
             INormalEfCoreRepository<TEntity, Guid> repository,
-
+            VmiAppService vimservice,
             INormalEfCoreRepository<TEntityDetail, Guid> detailRepository
             ) : base(excelImportService, snowflakeIdGenerator, commonManager)
         {
+            _vimservice = vimservice;   
             _repository = repository;
             _detailRepository = detailRepository;
         }
@@ -116,11 +125,205 @@ namespace Win.Sfs.SettleAccount.Bases
         }
         [HttpPost]
         //[Route("generateinvoice")]
-        public virtual async Task<string> ApprovalPassed(TRequestMainInput input)
+        public virtual async Task<string> ApprovalPassed(List<string> p_list)
         {
+            //_repository.Where(p => p_list.Contains(p.BillNum));
+            var detailist=_detailRepository.Where(p => p_list.Contains(p.BillNum)).ToList();
+            if (detailist != null && detailist.Count > 0)
+            {
+                foreach (var itm in detailist)
+                {
+                   await _vimservice.Out(Entities.BQ.Vmi.VmiLogType.Type200, "1", new Entities.BQ.Vmi.VmiLog()
+                    {
+                        BillTime=itm.CreationTime,
+                        ChangedTime=DateTime.Now,
+                        Qty = itm.Qty,
+                        DeliverTime = itm.CreationTime,
+                        LogType= Entities.BQ.Vmi.VmiLogType.Type200,
+                        ChangedQty=itm.Qty,
+                        ChangedType=VmiType.Out,
+                        SubBillType=EnumDeliverSubBillType.小件BBAC,
+                        BillType=EnumDeliverBjBmpBillType.JIS件,
+                        PartCode=itm.LU,
+                        SettlementVinCode = itm.PN,
+                        PartCode2 = itm.LU,
+                        CustomerPartCode=itm.LU,
+                        VinCode=itm.PN,
+                        OrderNum=itm.GroupNum,
+                        ErpToLoc="C0001"
+                    }) ;
+                }  
+            }
+
+            //public VmiLog()
+            //{
+            //}
+
+            //public VmiLog(Guid id)
+            //{
+            //    this.Id = id;
+            //}
+
+            ///// <summary>
+            ///// 分组编号
+            ///// </summary>
+            //public string GroupId { get; set; }
+
+            //    /// <summary>
+            //    /// 库存事务分类
+            //    /// </summary>
+            //    public VmiLogType LogType { get; set; }
+
+            //    [Display(Name = "库存变动")]
+            //    public decimal ChangedQty { get; set; }
+
+            //    [Display(Name = "变动单号")]
+            //    public string ChangedNumber { get; set; }
+
+            //    [Display(Name = "变动时间")]
+            //    public DateTime ChangedTime { get; set; } = DateTime.Now;
+
+            //    [Display(Name = "变动类型")]
+            //    public VmiType ChangedType { get; set; }
+
+            //    [Display(Name = "便动人")]
+            //    public string ChangedBy { get; set; }
+
+            //    [Display(Name = "是否补货")]
+            //    public bool? IsReplenished { get; set; }
+
+            //    #region 附加信息
+
+            //    //[Display(Name = "实扣厂内零件号")]
+            //    //public string PartCode { get; set; }
+
+            //    [Display(Name = "结算厂内零件号")]
+            //    public string PartCode2 { get; set; }
+
+            //    //[Display(Name = "结算客户零件号")]
+            //    //public string CustomerPartCode { get; set; }
+
+            //    //[Display(Name = "EDI订单生产码")]
+            //    //public string VinCode { get; set; }
+
+            //    [Display(Name = "结算生产码")]
+            //    public string SettlementVinCode { get; set; }
+
+            //    #endregion 附加信息
+
+            //    #region 库存备份
+
+            //    /// <summary>
+            //    /// LU零件号
+            //    /// </summary>
+            //    [Display(Name = "LU零件号")]
+            //    public string PartCode { get; set; }
+
+            //    [Display(Name = "生产码")]
+            //    public string VinCode { get; set; }
+
+            //    /// <summary>
+            //    /// 根据零件关系表匹配
+            //    /// </summary>
+            //    [Display(Name = "客户零件号")]
+            //    public string CustomerPartCode { get; set; }
+
+            //    [Display(Name = "生产码类型")]
+            //    public string CodeType { get; set; }
+
+            //    [Display(Name = "发货类型")]
+            //    public EnumDeliverBjBmpBillType BillType { get; set; }
+
+            //    [Display(Name = "数量")]
+            //    public decimal Qty { get; set; }
+
+            //    [Display(Name = "发运日期")]
+            //    public DateTime BillTime { get; set; }
+
+            //    [Display(Name = "订单日期")]
+            //    public DateTime DeliverTime { get; set; }
+
+            //    /// <summary>
+            //    /// ERP库位
+            //    /// </summary>
+            //    [Display(Name = "ERP库位")]
+            //    public string ErpToLoc { get; set; }
+
+            //    [Display(Name = "EDI顺序号")]
+            //    public string Seq { get; set; }
+
+            //    [Display(Name = "客户订单号")]
+            //    public string OrderNum { get; set; }
+
+            //    [Display(Name = "塑件唯一码")]
+            //    public string UniqueCode { get; set; }
+
+            //    [Display(Name = "EDI总成号")]
+            //    public string MatchNumber { get; set; }
+
+            //    [Display(Name = "PJIS生产顺序号")]
+            //    public string PjsNum { get; set; }
+
+            //    [Display(Name = "配置码")]
+            //    public string Configcode { get; set; }
+
+            //    [Display(Name = "工厂")]
+            //    public string factory { get; set; }
+
+            //    [Display(Name = "发货子类型")]
+            //    public EnumDeliverSubBillType SubBillType { get; set; }
+
+            //    [Display(Name = "WMS实发生产码")]
+            //    public string RealCode { get; set; }
+
+            //    [Display(Name = "备注")]
+            //    public string ReMark { get; set; }
+
+            //     #endregion 库存备份
+
+
+
+
+
+
+            //   public enum VmiLogType
+            //{
+            //    /// <summary>
+            //    /// 发运入库
+            //    /// </summary>
+            //    [Display(Name = "发运入库")]
+            //    Type100 = 100,
+
+            //    /// <summary>
+            //    /// 结算出库
+            //    /// </summary>
+            //    [Display(Name = "结算出库")]
+            //    Type200 = 200,
+
+            //    /// <summary>
+            //    /// 反结入库
+            //    /// </summary>
+            //    [Display(Name = "反结入库")]
+            //    Type300 = 300,
 
+            //    /// <summary>
+            //    /// 退货出库
+            //    /// </summary>
+            //    [Display(Name = "退货出库")]
+            //    Type400 = 400,
 
+            //    /// <summary>
+            //    /// 调整入库
+            //    /// </summary>
+            //    [Display(Name = "调整入库")]
+            //    Type500 = 500,
 
+            //    /// <summary>
+            //    /// 调整出库
+            //    /// </summary>
+            //    [Display(Name = "调整出库")]
+            //    Type600 = 600,
+            //}
 
 
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs

@@ -93,11 +93,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     var groupNumList = entitys.Select(p => p.GroupNum).Distinct().ToList();
                     //var groupNumList = entitys.Select(p => new { p.GroupNum).Distinct().ToList();
                     var notQuery = _notRepository.Where(p => groupNumList.Contains(p.InvGroupNum)).ToList();//不能结算
-                 
-
                     var priceList = _priceRepository.ToList();//价格单
                     var errorList = await CheckInvoiceGenerationRules(entitys, priceList,main.BusinessType);//校验生成规则
-
                     if (errorList.Count() > 0)
                     {
                         return await ExportErrorReportAsync(errorList);
@@ -147,7 +144,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                                 SettleDate = p.SettleDate,
                                 GroupNum = p.GroupNum,
                                 ContractDocID = string.Empty
-
                             }).ToList();//不能结算
                             await FirstInvoice(entitys,new List<PUB_ADJ_DETAIL>(),dtos, notlist, main.Version, main.InvGroupNum, string.Empty, main.BusinessType);
                         }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs

@@ -50,8 +50,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             
             var entitys = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount);
             await _bbacNotMng.GenerateSettlementOrder(entitys);
-
-
             return ApplicationConsts.SuccessStr;
         }
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs

@@ -25,16 +25,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         BBAC_PD_DETAIL, BBAC_PD_DETAIL_DTO, BBAC_PD_REQ_DTO,
         BBAC_PD_DETAIL_REQ_DTO, BBAC_PD_DETAIL_EXP_DTO>
     {
-        public BBAC_PD_SERVICE(IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<BBAC_PD, Guid> repository, INormalEfCoreRepository<BBAC_PD_DETAIL, Guid> detailRepository) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, detailRepository)
+        public BBAC_PD_SERVICE(IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<BBAC_PD, Guid> repository, VmiAppService vimservice, INormalEfCoreRepository<BBAC_PD_DETAIL, Guid> detailRepository) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository)
         {
-
-
-
-
-
-
-
         }
-
     }
 }                                          

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs

@@ -26,35 +26,40 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         HBPO_PD_DETAIL, HBPO_PD_DETAIL_DTO, HBPO_PD_REQ_DTO,
         HBPO_PD_DETAIL_REQ_DTO, HBPO_PD_DETAIL_EXP_DTO>
     {
-        public HBPO_PD_SERVICE(IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<HBPO_PD, Guid> repository, INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> detailRepository) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, detailRepository)
-        {
-            //List<CustomCondition> customConditionList = new List<CustomCondition>();
-            //customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty });
-            //customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode ?? string.Empty });
-            //customConditionList.Add(new CustomCondition() { Name = "Year", Value = year ?? string.Empty });
-            //customConditionList.Add(new CustomCondition() { Name = "Period", Value = period ?? string.Empty });
-            //customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory ?? string.Empty });
-            //var _versionQuery = _versionRepository.Where(p => p.Version == version);
-            //if (_versionQuery.Count() > 0)
-            //{
-            //    _versionQuery.BatchDelete();
-            //}
 
-            //var _query = _repository.Where(p => p.Version == version);
-            //if (_query.Count() > 0)
-            //{
-            //    await _query.BatchDeleteAsync();
-            //}
-            //var _taskid = await _service.ImportEnqueueAsync<ImportTaskArgs>(files, "结算数据", CurrentUser, typeof(SettleAccountImportService), customConditionList, (rs) =>
-            //{
 
+        //public HBPO_PD_SERVICE(IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<HBPO_PD, Guid> repository, INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> detailRepository) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, detailRepository)
+        //{
+        //    //List<CustomCondition> customConditionList = new List<CustomCondition>();
+        //    //customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty });
+        //    //customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode ?? string.Empty });
+        //    //customConditionList.Add(new CustomCondition() { Name = "Year", Value = year ?? string.Empty });
+        //    //customConditionList.Add(new CustomCondition() { Name = "Period", Value = period ?? string.Empty });
+        //    //customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory ?? string.Empty });
+        //    //var _versionQuery = _versionRepository.Where(p => p.Version == version);
+        //    //if (_versionQuery.Count() > 0)
+        //    //{
+        //    //    _versionQuery.BatchDelete();
+        //    //}
+
+        //    //var _query = _repository.Where(p => p.Version == version);
+        //    //if (_query.Count() > 0)
+        //    //{
+        //    //    await _query.BatchDeleteAsync();
+        //    //}
+        //    //var _taskid = await _service.ImportEnqueueAsync<ImportTaskArgs>(files, "结算数据", CurrentUser, typeof(SettleAccountImportService), customConditionList, (rs) =>
+        //    //{
 
 
 
-            //});
 
+        //    //});
 
 
+
+        //}
+        public HBPO_PD_SERVICE(IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<HBPO_PD, Guid> repository, VmiAppService vimservice, INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> detailRepository) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository)
+        {
         }
     }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs

@@ -23,7 +23,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         PUB_PD_DETAIL, PUB_PD_DETAIL_DTO, PUB_PD_REQ_DTO,
         PUB_PD_DETAIL_REQ_DTO, PUB_PD_DETAIL_EXP_DTO>
     {
-        public PUB_PD_SERVICE(IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<PUB_PD, Guid> repository, INormalEfCoreRepository<PUB_PD_DETAIL, Guid> detailRepository) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, detailRepository)
+        public PUB_PD_SERVICE(IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<PUB_PD, Guid> repository, VmiAppService vimservice, INormalEfCoreRepository<PUB_PD_DETAIL, Guid> detailRepository) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository)
         {
         }
     }

code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs

@@ -59,6 +59,7 @@ using SettleAccount.Domain.BQ;
 using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 using Win.Sfs.SettleAccount.Entities.BQ.Syncs;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos.SettleAccount.Domain.BQ;
 
 namespace Win.Sfs.SettleAccount
 {
@@ -319,6 +320,22 @@ namespace Win.Sfs.SettleAccount
             CreateMap<PUB_ADJ_DETAIL, PUB_ADJ_DETAIL_IMP_DTO>().ReverseMap();
             CreateMap<PUB_ADJ_DETAIL, PUB_ADJ_DETAIL_EXP_DTO>().ReverseMap();
         }
+        private void CreateMapBBAC_PD()
+
+        {
+            CreateMap<BBAC_PD, BBAC_PD_DTO>().ReverseMap();
+            CreateMap<BBAC_PD, BBAC_PD_REQ_DTO>().ReverseMap();
+            //CreateMap<BBAC_PD, BBAC_PDImportDto>().ReverseMap();
+            CreateMap<BBAC_PD, BBAC_PD_EXP_DTO>().ReverseMap();
+        }
+        private void CreateMapBBAC_PD_DETAIL()
+
+        {
+            CreateMap<BBAC_PD_DETAIL, BBAC_PD_DETAIL_DTO>().ReverseMap();
+            CreateMap<BBAC_PD_DETAIL, BBAC_PD_DETAIL_REQ_DTO>().ReverseMap();
+            //CreateMap<BBAC_PD_DETAIL, BBAC_PD_DETAILImportDto>().ReverseMap();
+            CreateMap<BBAC_PD_DETAIL, BBAC_PD_DETAIL_EXP_DTO>().ReverseMap();
+        }
 
 
 

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_CAN_SA_MNG.cs

@@ -261,7 +261,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
         /// <returns></returns>
         public virtual async Task<List<BBAC_CAN_SA_DETAIL>> GetDetailByInbillNumAsync(List<string> p_invs)
         {
-            return await _detailRepository.Where(p =>p_invs.Contains(p.BillNum)).ToListAsync();
+            return await _detailRepository.Where(p =>p_invs.Contains(p.InvbillNum)).ToListAsync();
         }
 
 

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

@@ -47,10 +47,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
         PUB_CAN_SA_MNG pubMng,
         BBAC_CAN_SA_MNG bbacMng,
         HBPO_CAN_SA_MNG hbpoMng,
-      INormalEfCoreRepository<BBAC_PD, Guid> pdbbacRepository,
+       INormalEfCoreRepository<BBAC_PD, Guid> pdbbacRepository,
-      INormalEfCoreRepository<HBPO_PD, Guid> pdhbpoRepository,
+       INormalEfCoreRepository<HBPO_PD, Guid> pdhbpoRepository,
-         INormalEfCoreRepository<PUB_PD, Guid> pdpubRepository,
+       INormalEfCoreRepository<PUB_PD, Guid> pdpubRepository,
-        INormalEfCoreRepository<INVOICE_GRP, Guid> repository,
+       INormalEfCoreRepository<INVOICE_GRP, Guid> repository,
        INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> groupRepository,
        INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> detailRepository,
        INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> notRepository,
@@ -446,7 +446,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                         guid: itm.Id,
                         keyCode: itm.KeyCode,
                         version: itm.Version,
-                        billNum: itm.BillNum,
+                        billNum: itm.InvbillNum,
                         lU: itm.LU,
                         rELU: string.Empty,
                         pN: itm.PN,

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiLog.cs

@@ -29,20 +29,39 @@ public class VmiLog : BasicAggregateRoot<Guid>
     /// </summary>
     public VmiLogType LogType { get; set; }
 
+    /// <summary>
+    /// 库存变动
+    /// </summary>
     [Display(Name = "库存变动")]
+    
     public decimal ChangedQty { get; set; }
+    /// <summary>
+    /// 变动单号
+    /// </summary>
 
     [Display(Name = "变动单号")]
     public string ChangedNumber { get; set; }
+    /// <summary>
+    /// 变动时间
+    /// </summary>
 
     [Display(Name = "变动时间")]
     public DateTime ChangedTime { get; set; } = DateTime.Now;
+    /// <summary>
+    /// 变动类型
+    /// </summary>
 
     [Display(Name = "变动类型")]
     public VmiType ChangedType { get; set; }
+    /// <summary>
+    /// 变动人
+    /// </summary>
 
     [Display(Name = "便动人")]
     public string ChangedBy { get; set; }
+    /// <summary>
+    /// 是否补货
+    /// </summary>
 
     [Display(Name = "是否补货")]
     public bool? IsReplenished { get; set; }
@@ -51,6 +70,9 @@ public class VmiLog : BasicAggregateRoot<Guid>
 
     //[Display(Name = "实扣厂内零件号")]
     //public string PartCode { get; set; }
+    /// <summary>
+    /// 结算厂内零件号
+    /// </summary>
 
     [Display(Name = "结算厂内零件号")]
     public string PartCode2 { get; set; }
@@ -60,6 +82,9 @@ public class VmiLog : BasicAggregateRoot<Guid>
 
     //[Display(Name = "EDI订单生产码")]
     //public string VinCode { get; set; }
+    /// <summary>
+    /// 结算生产码
+    /// </summary>
 
     [Display(Name = "结算生产码")]
     public string SettlementVinCode { get; set; }
@@ -88,7 +113,9 @@ public class VmiLog : BasicAggregateRoot<Guid>
 
     [Display(Name = "发货类型")]
     public EnumDeliverBjBmpBillType BillType { get; set; }
-
+    /// <summary>
+    /// 数量
+    /// </summary>
     [Display(Name = "数量")]
     public decimal Qty { get; set; }