Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

src/WMS.Web.Domain/IService/ITakeStockService.cs

@@ -6,6 +6,7 @@ using WMS.Web.Core.Dto;
 using WMS.Web.Core.Dto.Login;
 using WMS.Web.Core.Dto.TakeStock;
 using WMS.Web.Core.Internal.Results;
+using WMS.Web.Domain.Entitys;
 
 namespace WMS.Web.Domain.IService
 {
@@ -18,5 +19,10 @@ namespace WMS.Web.Domain.IService
         Task<Result> Save(List<SaveTakeStockRequest> dto, LoginInDto loginInfo);
         // 同步金蝶
         Task<Result> Sync(OperateRequest dto);
+        //
+        //盘盈
+        Task<Result> Profit(TakeStock entity);
+        //盘亏
+        Task<Result> Loss(TakeStock entity);
     }
 }

src/WMS.Web.Domain/Services/TakeStockService.cs

@@ -2,9 +2,11 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using WMS.Web.Core.Dto;
+using WMS.Web.Core.Dto.Erp.TakeStock;
 using WMS.Web.Core.Dto.Login;
 using WMS.Web.Core.Dto.TakeStock;
 using WMS.Web.Core.Internal.Results;
@@ -13,6 +15,7 @@ using WMS.Web.Domain.Infrastructure;
 using WMS.Web.Domain.IService;
 using WMS.Web.Domain.IService.Public;
 using WMS.Web.Domain.Values;
+using WMS.Web.Domain.Values.Single;
 
 namespace WMS.Web.Domain.Services
 {
@@ -25,14 +28,21 @@ namespace WMS.Web.Domain.Services
         private readonly ILoginService _loginService;
         public readonly ITransactionRepositories _transactionRepositories;
         private readonly ITakeStockRepositories _takeStockRepositories;
+        private readonly ILoginRepositories _loginRepositories;
+        private readonly ISingleDataService _singleDataService;
+        private readonly IErpService _erpService;
         public TakeStockService(IMapper mapper, ILoginService loginService,
              ITransactionRepositories transactionRepositories,
-            ITakeStockRepositories takeStockRepositories)
+            ITakeStockRepositories takeStockRepositories, ILoginRepositories loginRepositories,
+            ISingleDataService singleDataService, IErpService erpService)
         {
             _mapper = mapper;
             _loginService = loginService;
             _transactionRepositories = transactionRepositories;
             _takeStockRepositories = takeStockRepositories;
+            _loginRepositories = loginRepositories;
+            _singleDataService = singleDataService;
+            _erpService = erpService;
         }
         /// <summary>
         /// 保存
@@ -72,5 +82,91 @@ namespace WMS.Web.Domain.Services
         {
             return Task.FromResult(Result.ReSuccess());
         }
+        /// <summary>
+        /// 盘盈
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<Result> Profit(TakeStock entity)
+        {
+            //获取金蝶仓库仓位编码
+            var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
+            var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
+
+            var res = await _erpService.BillQueryForStock();
+            var stock = res.Data.FirstOrDefault(f => f.Code == stockCode);//需要根据单点code搜索
+            var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
+            if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
+            //组装dto
+            #region 组装dto
+            List<ErpTakeStockDetailsSaveDto> detils = new List<ErpTakeStockDetailsSaveDto>();
+            detils.Add(new ErpTakeStockDetailsSaveDto()
+            {
+                FOwnerid = stock.OrgId.ToString(),
+                FKeeperId = stock.OrgId.ToString(),
+                MaterialId = entity.MaterialId.ToString(),
+                UnitId = entity.UnitId.ToString(),
+                StockId = stock.Id.ToString(),
+                SubStockId = subStock.Id.ToString(),
+                BeforeQty = entity.BeforeQty,
+                AfterQty = entity.AfterQty,
+                FinalQty = entity.FinalQty,
+                Fnote = ""
+            });
+            ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()
+            {
+                BillNo = entity.BillNo,
+                StockOrgId = stock.OrgId.ToString(),
+                Type = "PY01_SYS",
+                Date = entity.Date,
+                Details = detils
+            };
+            #endregion
+
+            return Result.ReSuccess();
+        }
+        /// <summary>
+        /// 盘亏
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<Result> Loss(TakeStock entity)
+        {
+            //获取金蝶仓库仓位编码
+            var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
+            var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
+
+            var res = await _erpService.BillQueryForStock();
+            var stock = res.Data.FirstOrDefault(f => f.Code == stockCode);//需要根据单点code搜索
+            var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
+            if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
+            //组装dto
+            #region 组装dto
+            List<ErpTakeStockDetailsSaveDto> detils = new List<ErpTakeStockDetailsSaveDto>();
+            detils.Add(new ErpTakeStockDetailsSaveDto()
+            {
+                FOwnerid = stock.OrgId.ToString(),
+                FKeeperId = stock.OrgId.ToString(),
+                MaterialId = entity.MaterialId.ToString(),
+                UnitId = entity.UnitId.ToString(),
+                StockId = stock.Id.ToString(),
+                SubStockId = subStock.Id.ToString(),
+                BeforeQty = entity.BeforeQty,
+                AfterQty = entity.AfterQty,
+                FinalQty = entity.FinalQty,
+                Fnote = ""
+            });
+            ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()
+            {
+                BillNo = entity.BillNo,
+                StockOrgId = stock.OrgId.ToString(),
+                Type = "PK01_SYS",
+                Date = entity.Date,
+                Details = detils
+            };
+            #endregion
+
+            return Result.ReSuccess();
+        }
     }
 }