金蝶物料数据-开始使用

2023-11-08 10:39:23 +08:00
parent 9099b68cad
commit 2ec6103f11
8 changed files with 315 additions and 72 deletions
--- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs
+++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs
@@ -234,8 +234,11 @@ namespace WMS.Web.Repositories.DependencyInjection
            Services.AddTransient<ISingleDataService, SingleDataService>();
            Services.AddTransient<IErpService, ErpService>();
            Services.AddTransient<IBackRecordService, BackRecordService>();
+            Services.AddTransient<IErpBasicDataExtendService, ErpBasicDataExtendService>();
            

+
+
            Services.AddTransient<IChangeMoveBoxService, ChangeMoveBoxService>();
            Services.AddTransient<ITakeStockService, TakeStockService>();
            Services.AddTransient<IOutStockService, OutStockService>();
--- a/src/WMS.Web.Repositories/InStockRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockRepositories.cs
@@ -27,19 +27,25 @@ namespace WMS.Web.Repositories
        private readonly ILoginRepositories _loginRepositories;
        private readonly RepositoryDbContext _context;
        private readonly ISingleDataService _singleDataService;
+        private readonly IErpService _erpService;
+        private readonly IErpBasicDataExtendService _erpBasicDataExtendService;


        public InStockRepositories(RepositoryDbContext context, 
            IMapper mapper,
+            IErpService erpService,
            ILoginRepositories loginRepositories,
            IServiceProvider serviceProvider,
-            ISingleDataService singleDataService)
+            ISingleDataService singleDataService,
+            IErpBasicDataExtendService erpBasicDataExtendService)
        {
            _context = context;
            _mapper = mapper;
+            _erpService = erpService;
            _serviceProvider = serviceProvider;
            _loginRepositories = loginRepositories;
            _singleDataService = singleDataService;
+            _erpBasicDataExtendService = erpBasicDataExtendService;
        }

        /// <summary>
@@ -49,6 +55,16 @@ namespace WMS.Web.Repositories
        /// <returns></returns>
        public async Task<ResultPagedList<InStockQueryResponse>> GetPagedList(InStockQueryRequest dto) 
        {
+            //1.获取物料集合
+            var materials_result = await _erpService.BillQueryForMaterial();
+            if (!materials_result.IsSuccess)
+                return ResultPagedList<InStockQueryResponse>.ReFailure(materials_result);
+            var materials = materials_result.Data.ToList();
+
+            //物料集合；模糊查询后的物料集合
+            if (!string.IsNullOrEmpty(dto.MaterialNumber))
+                materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
+
            var query=_context.InStockDetails
                .GroupJoin(_context.Instock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
                .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
@@ -57,10 +73,14 @@ namespace WMS.Web.Repositories
            if (!string.IsNullOrEmpty(dto.SourceBillNo))
                query = query.Where(w => EF.Functions.Like(w.detail.SourceBillNo, "%" + dto.SourceBillNo + "%"));

-            //if (!string.IsNullOrEmpty(dto.MaterialNumber))
-            //    query = query.Where(w => EF.Functions.Like(w.detail.BillNo, "%" + dto.BillNo + "%"));
+            //物料ID在模糊后的物料
+            if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
+            {
+                var mids = materials.Select(x => x.MaterialId).ToList();
+                query = query.Where(w => mids.Contains(w.detail.MaterialId));
+            }

-            if(dto.SupplierId.HasValue)
+            if (dto.SupplierId.HasValue)
                query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);

            if (dto.OrgId.HasValue)
@@ -90,10 +110,10 @@ namespace WMS.Web.Repositories
                SourceBillNo=s.detail.SourceBillNo,
                Supplier="",
                Org="",
-                MaterialName="",
-                MaterialNumber="",
-                Specifications="",
-                Stock= _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
+                MaterialName= _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
+                MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
+                Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
+                Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
                Qty =s.detail.Qty,
                Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
                CreateTime =s.order.CreateTime,
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using WMS.Web.Core;
 using WMS.Web.Core.Dto;
+using WMS.Web.Core.Dto.Erp;
 using WMS.Web.Core.Dto.InStockTask;
 using WMS.Web.Core.Help;
 using WMS.Web.Core.Internal.Results;
@@ -31,19 +32,25 @@ namespace WMS.Web.Repositories
        private readonly RepositoryDbContext _context;
        private readonly ISingleDataService _singleDataService;
        private readonly ILoginRepositories _loginRepositories;
+        private readonly IErpService _erpService;
+        private readonly IErpBasicDataExtendService _erpBasicDataExtendService;


        public InStockTaskRepositories(RepositoryDbContext context,
            IMapper mapper,
+            IErpService erpService,
            IServiceProvider serviceProvider,
            ISingleDataService singleDataService,
-            ILoginRepositories loginRepositories)
+            ILoginRepositories loginRepositories,
+            IErpBasicDataExtendService erpBasicDataExtendService)
        {
            _context = context;
            _mapper = mapper;
+            _erpService = erpService;
            _serviceProvider = serviceProvider;
            _singleDataService = singleDataService;
            _loginRepositories = loginRepositories;
+            _erpBasicDataExtendService = erpBasicDataExtendService;
        }

        /// <summary>
@@ -53,16 +60,31 @@ namespace WMS.Web.Repositories
        /// <returns></returns>
        public async Task<ResultPagedList<InStockTaskQueryResponse>> GetPagedList(InStockTaskQueryRequest dto)
        {
+            //1.获取物料集合
+            var materials_result = await _erpService.BillQueryForMaterial();
+            if (!materials_result.IsSuccess)
+                return ResultPagedList<InStockTaskQueryResponse>.ReFailure(materials_result);
+            var materials = materials_result.Data.ToList();
+
+            //物料集合；模糊查询后的物料集合
+            if (!string.IsNullOrEmpty(dto.MaterialNumber))
+                materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
+
            var query = _context.InStockTaskDetails
                .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
-                .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
+                .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })                
                .Where(adv => 1 == 1);

            if (!string.IsNullOrEmpty(dto.SourceBillNo))
                query = query.Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%"));

-            //if (!string.IsNullOrEmpty(dto.MaterialNumber))
-            //    query = query.Where(w => EF.Functions.Like(w.detail.BillNo, "%" + dto.BillNo + "%"));
+            //物料ID在模糊后的物料
+            if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
+            {
+                var mids = materials.Select(x => x.MaterialId).ToList();
+                query = query.Where(w => mids.Contains(w.detail.MaterialId));
+            }
+               

            if (dto.SupplierId.HasValue)
                query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);
@@ -88,7 +110,7 @@ namespace WMS.Web.Repositories
            int total = await query.CountAsync();
            response.TotalCount = total;

-            var list = await query.Select(s => new InStockTaskQueryResponse()
+            var list =await  query.Select(s => new InStockTaskQueryResponse()
            {
                Id = s.order.Id,
                DetailsId = s.detail.Id,
@@ -98,19 +120,17 @@ namespace WMS.Web.Repositories
                SourceBillNo = s.order.SourceBillNo,
                Supplier = "",
                Org = "",
-                MaterialName = "",
-                MaterialNumber = "",
-                Specifications = "",
+                MaterialName = _erpBasicDataExtendService.GetMaterialName(materials,s.detail.MaterialId),
+                MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
+                Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),               
                FactoryPrice = s.detail.FactoryPrice,
                Stock = "",
                AccruedQty = s.detail.AccruedQty,
                ReceiveQty = s.detail.ReceiveQty,
                RealityQty = s.detail.RealityQty,
                Receiver = "",
-                //ReceiveTime= s.order.ReceiveTime.ToString("yyyy-MM-dd HH:mm:ss.fff"),
                ReceiveTime = s.order.ReceiveTime.HasValue ? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                Shelfer = "",
-                //ShelfTime= s.order.ShelfTime.ToString("yyyy-MM-dd HH:mm:ss.fff"),
                ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                CreateTime = s.detail.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
            }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
@@ -199,6 +219,12 @@ namespace WMS.Web.Repositories
        /// <returns></returns>
        public async Task<List<InStockTaskBillNoQueryResponse>> GetListBy(string sourceBillNo, InstockType? type=null)
        {
+            //1.获取物料集合
+            var materials_result = await _erpService.BillQueryForMaterial();
+            var materials = new List<ErpMaterialDto>();
+            if (materials_result.IsSuccess)
+                materials = materials_result.Data.ToList();
+
            var query = _context.InStockTaskDetails
                 .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
                 .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
@@ -215,10 +241,10 @@ namespace WMS.Web.Repositories
                MaterialId=s.detail.MaterialId,
                StockCode=s.detail.StockCode,
                StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
-                MaterialName = "",
-                MaterialNumber = "",
-                Specifications = "",
-                Qty=s.detail.AccruedQty,
+                MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
+                MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
+                Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
+                Qty =s.detail.AccruedQty,
                DeliveredQty=s.detail.DeliveredQty,
                Remark = s.detail.Remark
            }).ToListAsync();