diff --git a/src/WMS.Web.Api/Controllers/ProductInventoryController.cs b/src/WMS.Web.Api/Controllers/ProductInventoryController.cs new file mode 100644 index 00000000..5eb31ea1 --- /dev/null +++ b/src/WMS.Web.Api/Controllers/ProductInventoryController.cs @@ -0,0 +1,122 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using System; +using System.Threading.Tasks; +using WMS.Web.Core.Dto.OutStock; +using WMS.Web.Core.Dto.ProductInventory; +using WMS.Web.Core.Dto.SingleData; +using WMS.Web.Core.Internal.Results; +using WMS.Web.Domain.Infrastructure; +using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Services.Public; +using WMS.Web.Domain.Values; +using WMS.Web.Repositories; +using WMS.Web.Core; +using WMS.Web.Domain.IService; +using WMS.Web.Domain.Options; +using Google.Protobuf.WellKnownTypes; +using WMS.Web.Domain.Services; +using Microsoft.Extensions.Options; +using System.Linq; +using WMS.Web.Core.Dto; + +namespace WMS.Web.Api.Controllers +{ + /// + /// 成品仓即时库存 + /// + [Route("api/[controller]")] + [ApiController] + public class ProductInventoryController : ControllerBase + { + private readonly ILoginService _loginService; + private readonly IBasicsRepositories _basicsRepositories; + private readonly IProductInventoryRepositories _repositories; + private readonly QiniuOptions _option; + private readonly IExportExcelService _exportExcelService; + private readonly IProductInventoryService _productInventoryService; + public ProductInventoryController(ILoginService loginService, IBasicsRepositories basicsRepositories, + IProductInventoryRepositories repositories, IOptions option, + IExportExcelService exportExcelServic, IProductInventoryService productInventoryService) { + _loginService = loginService; + _basicsRepositories = basicsRepositories; + _repositories = repositories; + _option = option?.Value; + _exportExcelService = exportExcelServic; + _productInventoryService = productInventoryService; + } + + /// + /// 获取仓库 + /// + /// 仓库模糊匹配 不必填 + /// + [HttpGet] + [Route("GetUcStock")] + public async Task> GetUcStock([FromQuery] string name) + { + //var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + //if (loginInfo == null || loginInfo.UserInfo == null) + // return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); + var r = await _basicsRepositories.GetUcStockByHeadOfficeAsync(name, 1); + var response = r.Where(w => w.ManagementSystem == 1 || w.ManagementSystem == 4 + || (w.ManagementSystem == 2 && !string.IsNullOrEmpty(w.WarehouseCodeOfJushuitan)) + ||(w.ManagementSystem == 3 && !string.IsNullOrEmpty(w.WarehouseCodeOfLingxing))).ToList(); + return ResultList.ReSuccess(r); + } + + /// + /// 列表 + /// + /// + /// + [HttpPost] + [Route("GetList")] + public async Task> GetPagedList([FromBody] ProductInventoryQueryRequest dto) + { + //var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + //if (loginInfo == null || loginInfo.UserInfo == null) + // return ResultPagedNumber2List.ReFailure(ResultCodes.Token_Invalid_Error); + + var (list, count, details) = await _repositories.GetListAsync(dto); + var result = ResultPagedNumber2List.ReSuccess(list,count,details); + return result; + } + /// + /// 导出 + /// + /// + /// + [HttpPost] + [Route("Export")] + public Task> Export([FromBody] ProductInventoryQueryRequest dto) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null) + return Task.FromResult(Result.ReFailure(ResultCodes.Token_Invalid_Error)); + string fileName = FileDownLoadOrderType.ProductInventory.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx"; + string res = _option.Url + fileName; + + Task.Run(async () => + { + await _exportExcelService.ExportList(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.ProductInventory); + }); + + return Task.FromResult(Result.ReSuccess(res)); + } + /// + /// 刷新数据 + /// + /// + [HttpPost] + [Route("Refresh")] + public async Task Refresh() + { + //var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + //if (loginInfo == null || loginInfo.UserInfo == null) + // return Result.ReFailure(ResultCodes.Token_Invalid_Error); + + return await _productInventoryService.Refresh(); + } + } +} diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index f9495ee9..68bc8c00 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -28,6 +28,10 @@ using System.Reflection; using WMS.Web.Domain.Services; using SkiaSharp; using Google.Protobuf.Collections; +using NPOI.SS.Formula.Functions; +using System.Text.Json; +using WMS.Web.Core.Dto.LingXing; +using WMS.Web.Domain.Services.Public; namespace WMS.Web.Api.Controllers { @@ -57,11 +61,16 @@ namespace WMS.Web.Api.Controllers private readonly IMemoryCache _memoryCache; private readonly IRedisConcurrentProcessService _redisConcurrentProcessService; private IInStockService _inStockService; + private readonly ILingXingService _lingXingService; + private readonly IProductInventoryService _productInventoryService; + private readonly IJuShuiTanService _juShuiTanService; + private readonly IErpInventoryService _erpInventoryService; public TestController(IErpService erpService, IInStockTaskService inStockTaskService, IBoxInventoryRepositories boxInventoryRepositories, IRedisConcurrentProcessService redisConcurrentProcessService, IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService, IBasicsRepositories basicsRepositories, IMemoryCache memoryCache, IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService, IOptions options, ILoginService loginService, ISendMessageService sendMessageService, ITakeStockService takeStockService, ITakeStockRepositories takeStockRepositories, IOutStockService outStockService, IInStockTaskRepositories inStockTaskRepositories, - IWebHostEnvironment env, IMaterialService materialService, IOutStockRepositories outStockRepositories, IInStockService inStockService) + IWebHostEnvironment env, IMaterialService materialService, IOutStockRepositories outStockRepositories, IInStockService inStockService, ILingXingService lingXingService + , IProductInventoryService productInventoryService, IJuShuiTanService juShuiTanService, IErpInventoryService erpInventoryService) { _inStockService = inStockService; _redisConcurrentProcessService = redisConcurrentProcessService; @@ -85,12 +94,50 @@ namespace WMS.Web.Api.Controllers _outStockService = outStockService; _outStockRepositories = outStockRepositories; _env = env; + _lingXingService = lingXingService; + _productInventoryService = productInventoryService; + _juShuiTanService = juShuiTanService; + _erpInventoryService = erpInventoryService; } [HttpGet] [Route("hj")] public async Task TestHJ() { + ////var myJson = "{\"name\":\"小明\",\"address\":\"威海\"}";//json字符串 + //var myJson= "{\"code\":\"200\",\"msg\":\"OK\",\"data\":{\"access_token\":\"05895ad6-e318-41da-9b2c-579dedd18fd1\",\"refresh_token\":\"ad9145cf-8af9-4617-9dbe-187b0ff3edf9\",\"expires_in\":7162}}"; + //var myObj = JsonConvert.DeserializeObject(myJson);//反序列化为 dynamic 对象 + //var my2 = System.Text.Json.JsonSerializer.Deserialize(myJson); + //string m = myObj.code; + //var m2 = my2.Object; + //var md = m2.code; + + //var b33= await _juShuiTanService.GetStock(); + // var bc = await _lingXingService.GetStock(); + + //List<(string orgCode, string stockCode)> request = new List<(string orgCode, string stockCode)>(); + //request.Add(("101", "CK001")); + //request.Add(("101", "CK002")); + //var list = await _erpService.BillQueryForInventory(request); + //var b33 = await _juShuiTanService.GetStock(); + //var b = b33.Data.Where(w => w.Id == 10923342).FirstOrDefault(); + //await _juShuiTanService.GetTest(); + //string codes = "AD"; + //var b = await _erpInventoryService.GetInventory(new List() { "111"}); + //int count = 10 / 5; + var bcd=await _productInventoryService.LingXing(); + + //LingXingResponse r = new LingXingResponse(); + + //string str = "{\"code\":0,\"message\":\"success\",\"error_details\":[],\"request_id\":\"7A739491-8740-01AC-304E-0203AF887AE2\",\"response_time\":\"2024-10-16 17:58:57\",\"data\":[{\"wid\":437,\"type\":1,\"name\":\"ORICO_OD\",\"is_delete\":0}],\"total\":1}"; + //var ss=JsonConvert.DeserializeObject>(str); + //var b = System.Text.Json.JsonSerializer.Deserialize>(str); + //await _productInventoryService.LingXing(); + //var s = await _lingXingService.GetSeller(); + //var ns = s.Data.Where(w =>w.Id== "2101").ToList(); + //string str = string.Join(",", s.Data.Select(s => s.Id).ToList()); + //var sd= await _lingXingService.GetInventory(new LingXingInventoryRequest() { wid = "437" }); + //string sdsdf = sd.Message; //List list = new List(); //list.Add("GD-02-15"); //list.Add("GD-01-15"); diff --git a/src/WMS.Web.Api/appsettings.json b/src/WMS.Web.Api/appsettings.json index 8d69e2a9..b80a9f8e 100644 --- a/src/WMS.Web.Api/appsettings.json +++ b/src/WMS.Web.Api/appsettings.json @@ -37,15 +37,27 @@ }, "ErpOptions": { "EndpointAddress": "http://erp.orico.com.cn/k3cloud/ERPGW.asmx", //原:119.23.206.129 - "UserName": "mes", //测试账号密码 mes/A1B2C3Dh/ce20210909 正式账号密码 orico/A123321./Orico + "UserName": "mes", //测试账号密码 mes/A1B2C3Dh/ce20210909/6723b1acf19987 正式账号密码 orico/A123321./Orico/663a26829afbdd "Password": "A1B2C3Dh.", - "ErpId": "ce20210909" + "ErpId": "ce20210909", + "ZhangTaoId": "6723b1acf19987" }, "OpsOptions": { "Url": "https://api.opsscm.test.f2b211.com/", //https://api.opsscm.test.f2b211.com/ "UserName": "admin", "PassWord": "888888" }, + "LingXingOptions": { + "Url": "https://openapi.lingxing.com", + "AppId": "ak_QGK2J8TssERmu", + "AppSecret": "n/HUKD2wVdTbvhnFZbVBPw==" + }, + "JuShuiTanOptions": { + "Url": "https://openapi.jushuitan.com", + "AppKey": "17231841286c45f99eb9acf445404349", + "AppSecret": "5ce9641ae6db4abb8b96eea7df6a81e9", + "AccessToken": "4605358c37374780a8a4395e6cdb1c3f" //一年后过期(2025/10/18) + }, "Qiniu": { "AccessKey": "dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms", "SecretKey": "KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q", @@ -89,6 +101,7 @@ "JobStartExpreSend": "0 0 12,16,20 * * ?", "JobStartExpreMaterial": "0 30 23 * * ?", "JobStartErpDelete": "0 5 * * * ?", + "JobStartProductInventory": "0 0/30 * * * ?", //a.是否启用集群：键和值 "JobStoreClusteredKey": "quartz.jobStore.clustered", "JobStoreClusteredValue": true, diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 7e714386..98db1f10 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1006,15 +1006,25 @@ 仓库 - + - 子仓库(跟金蝶交互字段) + 子仓库 + + + 批号 + + - - 数量 - + + 可用量 + + + + + 库存量 + @@ -4199,6 +4209,197 @@ wms箱ID + + + 页码 + + + + + 页条数 + + + + + 仓库Id + + + + + 开始时间 + + + + + 结算时间 + + + + + 商品 + + + + + 总量 + + + + + 可用数：可用数[同步线上的库存数]= + 主仓实际库存-订单占有数+虚拟库存+采购在途(业务设置)+进货仓(业务设置)+销退仓库存(业务设置) + + + + + 订单占有数 + + + + + 虚拟库存 + + + + + 采购在途 + + + + + 销退仓库存 + + + + + 进货仓 + + + + + 页码 + + + + + 页条数 + + + + + 仓库id + + + + + 仓库名 + + + + + 领星即时库存 + + + + + 仓库Id 1,3,234,33 + + + + + 物料规格型号 + + + + + 领星即时库存 + + + + + 仓库Id + + + + + SKU + + + + + 店铺id + + + + + 库存总量 + + + + + 可用量 + + + + + 领星登录 + + + + + id + + + + + Secret + + + + + 领星请求 + + + + + 不是页码 是从第几条数据开始 如果是第二页的话 就是1*800 + + + + + 页条数 + + + + + 海外仓 + + + + + 店铺信息 + + + + + id + + + + + name + + + + + id + + + + + name + + 客户端名称 @@ -5914,6 +6115,86 @@ 每页条数 不传默认每页10 条 + + + 成品即时库存列表 + + + + + 物料编码 + + + + + 仓库编码 + + + + + 客户/店铺 + + + + + 成品即时库存 + + + + + 单据Id + + + + + 单据类型 + + + + + 物料编码 + + + + + 物料规格型号 + + + + + 物料名称 + + + + + 仓库 + + + + + 组织 + + + + + 客户/店铺 + + + + + 批号 + + + + + 可用量 + + + + + 库存量 + + 客户编码 @@ -6204,6 +6485,31 @@ 仓库名称 + + + 根据总公司查仓库 + + + + + 领星仓库编码 + + + + + 聚水潭仓库编码 + + + + + 用途 0 总公司 + + + + + 管理系统 1 金蝶 2 聚水潭 3 领星 4WMS + + 仓库响应 @@ -7197,6 +7503,78 @@ + + + 实体分页集合结果 + + + + + 实体分页集合结果 + + 实体集合 + 总条数 + + + + 实体分页集合结果 + + + + + + + + Total count of Items. + + + + + 总数量 + + + + + 创建成功的返回消息 + + 实体集合 + 总条数 + + + + + 创建成功的返回消息 + + + + + + 创建返回信息（返回处理失败） + + 结果消息 + 结果状态 + + + + + 创建返回信息（返回处理失败） + + 结果消息 + + + + + 创建返回信息（返回处理失败） + + 结果 + + + + + 转换为 task + + + 分页列表结果对象 diff --git a/src/WMS.Web.Core/Dto/Erp/ErpInventoryDto.cs b/src/WMS.Web.Core/Dto/Erp/ErpInventoryDto.cs index 39a786f7..173e7c87 100644 --- a/src/WMS.Web.Core/Dto/Erp/ErpInventoryDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/ErpInventoryDto.cs @@ -1,4 +1,5 @@ -using System; +using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.Text; @@ -9,22 +10,37 @@ namespace WMS.Web.Core.Dto.Erp /// /// 物料编码 /// + [JsonProperty("FMATERIALNUMBER")] public string MaterialNumber { get; set; } /// /// 组织编码 /// + [JsonProperty("FSTOCKORGNUMBER")] public string OrgCode { get; set; } /// /// 仓库 /// + [JsonProperty("FSTOCKNUMBER")] public string StockCode { get; set; } /// - /// 子仓库(跟金蝶交互字段) + /// 子仓库 /// - public int Erp_SubStockId { get; set; } + [JsonProperty("FSTOCKLOC")] + public string Erp_SubStockName { get; set; } /// - /// 数量 - /// - public decimal Qty { get; set; } + /// 批号 + /// + [JsonProperty("FLOTNUMBER")] + public string Batch { get; set; } + /// + /// 可用量 + /// + [JsonProperty("FAVBQTY")] + public decimal Qty { get; set; } = 0; + /// + /// 库存量 + /// + [JsonProperty("FQTY")] + public decimal BeforeQty { get; set; } = 0; } } diff --git a/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanInventoryRequst.cs b/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanInventoryRequst.cs new file mode 100644 index 00000000..591b36f5 --- /dev/null +++ b/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanInventoryRequst.cs @@ -0,0 +1,36 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.JuShuiTan +{ + public class JuShuiTanInventoryRequst + { + /// + /// 页码 + /// + [JsonProperty("page_index")] + public int page_index { get; set; } = 1; + /// + /// 页条数 + /// + [JsonProperty("page_size")] + public int page_size { get; set; } = 30; + /// + /// 仓库Id + /// + [JsonProperty("wms_co_id")] + public int wms_co_id { get; set; } + /// + /// 开始时间 + /// + [JsonProperty("modified_begin")] + public string modified_begin { get; set; } + /// + /// 结算时间 + /// + [JsonProperty("modified_end")] + public string modified_end { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanInventoryResponse.cs b/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanInventoryResponse.cs new file mode 100644 index 00000000..7b570426 --- /dev/null +++ b/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanInventoryResponse.cs @@ -0,0 +1,55 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; +using Ubiety.Dns.Core.Common; + +namespace WMS.Web.Core.Dto.JuShuiTan +{ + public class JuShuiTanInventoryResponse + { + /// + /// 商品 + /// + [JsonProperty("sku_id")] + public string sku_id { get; set; } + [JsonProperty("wms_co_id")] + public int wms_co_id { get; set; } + /// + /// 总量 + /// + [JsonProperty("qty")] + public int? qty { get; set; } + /// + /// 可用数：可用数[同步线上的库存数]= + /// 主仓实际库存-订单占有数+虚拟库存+采购在途(业务设置)+进货仓(业务设置)+销退仓库存(业务设置) + /// + [JsonProperty("ky_qty")] + public int ky_qty { get; set; } + /// + /// 订单占有数 + /// + [JsonProperty("order_lock")] + public int? order_lock { get; set; } + /// + /// 虚拟库存 + /// + [JsonProperty("virtual_qty")] + public int? virtual_qty { get; set; } + /// + /// 采购在途 + /// + [JsonProperty("purchase_qty")] + public int? purchase_qty { get; set; } + /// + /// 销退仓库存 + /// + [JsonProperty("return_qty")] + public int? return_qty { get; set; } + /// + /// 进货仓 + /// + [JsonProperty("in_qty")] + public int? in_qty { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanStockRequst.cs b/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanStockRequst.cs new file mode 100644 index 00000000..d18528a1 --- /dev/null +++ b/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanStockRequst.cs @@ -0,0 +1,21 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.JuShuiTan +{ + public class JuShuiTanStockRequst + { + /// + /// 页码 + /// + [JsonProperty("page_index")] + public int page_index { get; set; } = 1; + /// + /// 页条数 + /// + [JsonProperty("page_size")] + public int page_size { get; set; } = 30; + } +} diff --git a/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanStockResResponse.cs b/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanStockResResponse.cs new file mode 100644 index 00000000..2f187e00 --- /dev/null +++ b/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanStockResResponse.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.JuShuiTan +{ + public class JuShuiTanStockResResponse + { + public int code { get; set; } + public string msg { get; set; } + public object data { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanStockResponse.cs b/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanStockResponse.cs new file mode 100644 index 00000000..3cfebdc3 --- /dev/null +++ b/src/WMS.Web.Core/Dto/JuShuiTan/JuShuiTanStockResponse.cs @@ -0,0 +1,21 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.JuShuiTan +{ + public class JuShuiTanStockResponse + { + /// + /// 仓库id + /// + [JsonProperty("wms_co_id")] + public int Id { get; set; } + /// + /// 仓库名 + /// + [JsonProperty("name")] + public string Name { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/LingXing/LingXingInventoryRequest.cs b/src/WMS.Web.Core/Dto/LingXing/LingXingInventoryRequest.cs new file mode 100644 index 00000000..9d770042 --- /dev/null +++ b/src/WMS.Web.Core/Dto/LingXing/LingXingInventoryRequest.cs @@ -0,0 +1,26 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.LingXing +{ + /// + /// 领星即时库存 + /// + [Serializable] + public class LingXingInventoryRequest:LingXingRequest + { + /// + /// 仓库Id 1,3,234,33 + /// + [JsonProperty("wid")] + public string wid { get; set; } + /// + /// 物料规格型号 + /// + [JsonProperty("sku")] + public string sku { get; set; } + + } +} diff --git a/src/WMS.Web.Core/Dto/LingXing/LingXingInventoryResponse.cs b/src/WMS.Web.Core/Dto/LingXing/LingXingInventoryResponse.cs new file mode 100644 index 00000000..030c15ba --- /dev/null +++ b/src/WMS.Web.Core/Dto/LingXing/LingXingInventoryResponse.cs @@ -0,0 +1,41 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.LingXing +{ + /// + /// 领星即时库存 + /// + [Serializable] + public class LingXingInventoryResponse + { + /// + /// 仓库Id + /// + [JsonProperty("wid")] + public int StockId { get; set; } + /// + /// SKU + /// + [JsonProperty("sku")] + public string SKU { get; set; } + /// + /// 店铺id + /// + [JsonProperty("seller_id")] + public string SellerId { get; set; } + /// + /// 库存总量 + /// + [JsonProperty("product_total")] + public decimal Product_Total { get; set; } + /// + /// 可用量 + /// + [JsonProperty("product_valid_num")] + public decimal Product_Valid_Num { get; set; } + + } +} diff --git a/src/WMS.Web.Core/Dto/LingXing/LingXingKongRequest.cs b/src/WMS.Web.Core/Dto/LingXing/LingXingKongRequest.cs new file mode 100644 index 00000000..0a81b7a9 --- /dev/null +++ b/src/WMS.Web.Core/Dto/LingXing/LingXingKongRequest.cs @@ -0,0 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.LingXing +{ + public class LingXingKongRequest + { + } +} diff --git a/src/WMS.Web.Core/Dto/LingXing/LingXingLoginRequest.cs b/src/WMS.Web.Core/Dto/LingXing/LingXingLoginRequest.cs new file mode 100644 index 00000000..b785544c --- /dev/null +++ b/src/WMS.Web.Core/Dto/LingXing/LingXingLoginRequest.cs @@ -0,0 +1,24 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.LingXing +{ + /// + /// 领星登录 + /// + public class LingXingLoginRequest + { + /// + /// id + /// + [JsonProperty("appId")] + public string AppId { get; set; } + /// + /// Secret + /// + [JsonProperty("appSecret")] + public string AppSecret { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/LingXing/LingXingRequest.cs b/src/WMS.Web.Core/Dto/LingXing/LingXingRequest.cs new file mode 100644 index 00000000..d4df39b9 --- /dev/null +++ b/src/WMS.Web.Core/Dto/LingXing/LingXingRequest.cs @@ -0,0 +1,29 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.LingXing +{ + /// + /// 领星请求 + /// + public class LingXingRequest + { + /// + /// 不是页码 是从第几条数据开始 如果是第二页的话 就是1*800 + /// + [JsonProperty("offset")] + public int offset { get; set; } = 0; + /// + /// 页条数 + /// + [JsonProperty("length")] + public int length { get; set; } = 800; + /// + /// 海外仓 + /// + [JsonProperty("type")] + public int type { get; set; } = 1; + } +} diff --git a/src/WMS.Web.Core/Dto/LingXing/LingXingResponse.cs b/src/WMS.Web.Core/Dto/LingXing/LingXingResponse.cs new file mode 100644 index 00000000..17beb7b5 --- /dev/null +++ b/src/WMS.Web.Core/Dto/LingXing/LingXingResponse.cs @@ -0,0 +1,23 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; +using System.Text.Json.Serialization; + +namespace WMS.Web.Core.Dto.LingXing +{ + public class LingXingResponse + { + public LingXingResponse() { } + [JsonProperty("code")] + public int Code { get; set; } + [JsonProperty("message")] + public string Message { get; set; } + [JsonProperty("error_details")] + public List Error_details { get; set; } + [JsonProperty("total")] + public int Total { get; set; } + [JsonProperty("data")] + public object Data { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/LingXing/LingXingSellerResponse.cs b/src/WMS.Web.Core/Dto/LingXing/LingXingSellerResponse.cs new file mode 100644 index 00000000..69ecef32 --- /dev/null +++ b/src/WMS.Web.Core/Dto/LingXing/LingXingSellerResponse.cs @@ -0,0 +1,25 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.LingXing +{ + /// + /// 店铺信息 + /// + public class LingXingSellerResponse + { + public LingXingSellerResponse() { } + /// + /// id + /// + [JsonProperty("sid")] + public string Id { get; set; } + /// + /// name + /// + [JsonProperty("name")] + public string Name { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/LingXing/LingXingStockResponse.cs b/src/WMS.Web.Core/Dto/LingXing/LingXingStockResponse.cs new file mode 100644 index 00000000..31f53838 --- /dev/null +++ b/src/WMS.Web.Core/Dto/LingXing/LingXingStockResponse.cs @@ -0,0 +1,22 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.LingXing +{ + public class LingXingStockResponse + { + public LingXingStockResponse() { } + /// + /// id + /// + [JsonProperty("wid")] + public int Id { get; set; } + /// + /// name + /// + [JsonProperty("name")] + public string Name { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryRequest.cs b/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryRequest.cs new file mode 100644 index 00000000..51a4edcd --- /dev/null +++ b/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryRequest.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.ProductInventory +{ + /// + /// 成品即时库存列表 + /// + public class ProductInventoryQueryRequest : PaginationBaseRequestDto + { + /// + /// 物料编码 + /// + public string MaterialNumber { get; set; } + /// + /// 仓库编码 + /// + public string StockCode { get; set; } + /// + /// 客户/店铺 + /// + public string Customer { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs b/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs new file mode 100644 index 00000000..ae55748d --- /dev/null +++ b/src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs @@ -0,0 +1,69 @@ +using Npoi.Mapper.Attributes; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.ProductInventory +{ + /// + /// 成品即时库存 + /// + public class ProductInventoryQueryResponse + { + /// + /// 单据Id + /// + [Ignore] + public int Id { get; set; } + /// + /// 单据类型 + /// + [Ignore] + public string Type { get; set; } + /// + /// 物料编码 + /// + [Column("物料编码")] + public string MaterialNumber { get; set; } + /// + /// 物料规格型号 + /// + [Column("规格型号")] + public string Specifications { get; set; } + /// + /// 物料名称 + /// + [Column("物料名称")] + public string MaterialName { get; set; } + /// + /// 仓库 + /// + [Column("仓库")] + public string Stock { get; set; } + /// + /// 组织 + /// + [Column("组织")] + public string Org { get; set; } + /// + /// 客户/店铺 + /// + [Column("客户/店铺")] + public string Customer { get; set; } + /// + /// 批号 + /// + [Column("批号")] + public string Batch { get; set; } + /// + /// 可用量 + /// + [Column("可用量")] + public decimal Qty { get; set; } = 0; + /// + /// 库存量 + /// + [Column("库存量")] + public decimal BeforeQty { get; set; } = 0; + } +} diff --git a/src/WMS.Web.Core/Dto/SingleData/UcStockHeadOfficeResponse.cs b/src/WMS.Web.Core/Dto/SingleData/UcStockHeadOfficeResponse.cs new file mode 100644 index 00000000..09901b16 --- /dev/null +++ b/src/WMS.Web.Core/Dto/SingleData/UcStockHeadOfficeResponse.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; + +namespace WMS.Web.Core.Dto.SingleData +{ + /// + /// 根据总公司查仓库 + /// + public class UcStockHeadOfficeResponse: UcStockResponse + { + /// + /// 领星仓库编码 + /// + public string WarehouseCodeOfLingxing { get; set; } = ""; + /// + /// 聚水潭仓库编码 + /// + public string WarehouseCodeOfJushuitan { get; set; } = ""; + /// + /// 用途 0 总公司 + /// + public int? WarehouseUseTo { get; set; } + /// + /// 管理系统 1 金蝶 2 聚水潭 3 领星 4WMS + /// + public int? ManagementSystem { get; set; } + } +} diff --git a/src/WMS.Web.Core/Internal/Results/ResultPagedNumber2List.cs b/src/WMS.Web.Core/Internal/Results/ResultPagedNumber2List.cs new file mode 100644 index 00000000..589557d5 --- /dev/null +++ b/src/WMS.Web.Core/Internal/Results/ResultPagedNumber2List.cs @@ -0,0 +1,114 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace WMS.Web.Core.Internal.Results +{ + public class ResultPagedNumber2List : ResultList + { + /// + /// 实体分页集合结果 + /// + public ResultPagedNumber2List() + { + } + + /// + /// 实体分页集合结果 + /// + /// 实体集合 + /// 总条数 + public ResultPagedNumber2List(IList data, int totalCount, List details) : base(data) + { + TotalCount = totalCount; + Details = details; + } + + /// + /// 实体分页集合结果 + /// + /// + /// + /// + public ResultPagedNumber2List(IList data, int totalCount, ValueTuple result) : base(data, result) + { + TotalCount = totalCount; + } + + /// + /// Total count of Items. + /// + public int TotalCount { get; set; } + /// + /// 总数量 + /// + public List Details { get; set; } + + /// + /// 创建成功的返回消息 + /// + /// 实体集合 + /// 总条数 + /// + public static ResultPagedNumber2List ReSuccess(IList data, int totalCount, List details) + { + return new ResultPagedNumber2List(data, totalCount, details); + } + + /// + /// 创建成功的返回消息 + /// + /// + public new static ResultPagedNumber2List ReSuccess() + { + return new ResultPagedNumber2List(new List(), 0, new List()); + } + + /// + /// 创建返回信息（返回处理失败） + /// + /// 结果消息 + /// 结果状态 + /// + public new static ResultPagedNumber2List ReFailure(string message, int status) + { + var result = new ResultPagedNumber2List(); + result.To(message, status); + return result; + } + + /// + /// 创建返回信息（返回处理失败） + /// + /// 结果消息 + /// + public new static ResultPagedNumber2List ReFailure(ValueTuple result) + { + var res = new ResultPagedNumber2List(); + res.To(result); + return res; + } + + /// + /// 创建返回信息（返回处理失败） + /// + /// 结果 + /// + public new static ResultPagedNumber2List ReFailure(Result result) + { + var re = new ResultPagedNumber2List(); + re.To(result); + return re; + } + + /// + /// 转换为 task + /// + /// + public new Task> AsTask() + { + return Task.FromResult(this); + } + } +} diff --git a/src/WMS.Web.Domain/Entitys/ProductInventory.cs b/src/WMS.Web.Domain/Entitys/ProductInventory.cs new file mode 100644 index 00000000..c5e98db4 --- /dev/null +++ b/src/WMS.Web.Domain/Entitys/ProductInventory.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; +using WMS.Web.Core; +using WMS.Web.Domain.Values; + +namespace WMS.Web.Domain.Entitys +{ + /// + /// 成品仓即时库存 + /// + [Serializable] + [Table("t_wms_product_inventory")] + public class ProductInventory : EntityBase + { + public ProductInventory() { } + /// + /// 主键 订单编号 + /// + [Column("Id")] + public override int Id { get; set; } + /// + /// 物料编码 + /// + [Column("MaterialNumber")] + public string MaterialNumber { get; set; } + /// + /// 单据类型 + /// + [Column("Type")] + public ProductInventoryType Type { get; set; } = ProductInventoryType.JinDie; + /// + /// 组织编码 + /// + [Column("OrgCode")] + public string OrgCode { get; set; } + /// + /// 仓库 + /// + [Column("StockCode")] + public string StockCode { get; set; } + /// + /// 客户/店铺 + /// + [Column("Customer")] + public string Customer { get; set; } + /// + /// 批号 + /// + [Column("Batch")] + public string Batch { get; set; } + /// + /// 可用量 + /// + [Column("Qty")] + public decimal Qty { get; set; } = 0; + /// + /// 库存量 + /// + [Column("BeforeQty")] + public decimal BeforeQty { get; set; } = 0; + } +} diff --git a/src/WMS.Web.Domain/IService/IProductInventoryService.cs b/src/WMS.Web.Domain/IService/IProductInventoryService.cs new file mode 100644 index 00000000..85b3aee9 --- /dev/null +++ b/src/WMS.Web.Domain/IService/IProductInventoryService.cs @@ -0,0 +1,18 @@ + +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using WMS.Web.Core.Internal.Results; + +namespace WMS.Web.Domain.IService +{ + public interface IProductInventoryService + { + Task LingXing(); + Task Erp(); + Task JuShuiTan(); + + Task Refresh(); + } +} diff --git a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs index 5a5267b5..512a46d9 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs @@ -5,6 +5,7 @@ using WMS.Web.Core.Dto.Erp; using WMS.Web.Core.Dto.Erp.Customer; using WMS.Web.Core.Dto.Erp.Org; using WMS.Web.Core.Dto.Erp.Supplier; +using WMS.Web.Core.Dto.SingleData; namespace WMS.Web.Domain.IService.Public { @@ -173,5 +174,12 @@ namespace WMS.Web.Domain.IService.Public /// /// string GetSubStockName(List erpStocks, string code); + /// + /// 成品即时库存仓库 + /// + /// + /// + /// + string GetProductInventoryStockName(List list, string code); } } diff --git a/src/WMS.Web.Domain/IService/Public/IErpInventoryService.cs b/src/WMS.Web.Domain/IService/Public/IErpInventoryService.cs new file mode 100644 index 00000000..b347db5f --- /dev/null +++ b/src/WMS.Web.Domain/IService/Public/IErpInventoryService.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using WMS.Web.Core.Dto.Erp; +using WMS.Web.Core.Internal.Results; + +namespace WMS.Web.Domain.IService.Public +{ + public interface IErpInventoryService + { + Task>> GetInventory(List stockCodes); + } +} diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs index f561fa68..5d7510c5 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs @@ -178,7 +178,7 @@ namespace WMS.Web.Domain.IService.Public /// 及时库存 /// /// - Task> BillQueryForInventory(List<(string materialNumber, string orgCode, string stockCode, int subStockId)> request); + Task> BillQueryForInventory(List<(string orgCode, string stockCode)> request); //同步数据(保存提交审核) Task> Save(T dto, string formId); //提交 diff --git a/src/WMS.Web.Domain/IService/Public/IHttpClientService.cs b/src/WMS.Web.Domain/IService/Public/IHttpClientService.cs index 42a5e48c..6e340c73 100644 --- a/src/WMS.Web.Domain/IService/Public/IHttpClientService.cs +++ b/src/WMS.Web.Domain/IService/Public/IHttpClientService.cs @@ -13,6 +13,7 @@ namespace WMS.Web.Domain.IService.Public Task GetAsync(string url, Dictionary dicHeaders, int timeoutSecond = 180); Task PostAsync(string url, string requestBody, int timeoutSecond = 180); Task PostAsync(string url, string requestBody, Dictionary dicHeaders, int timeoutSecond = 180); + Task PostAsync(string url, HttpContent content, Dictionary dicHeaders, int timeoutSecond = 180); Task ExecuteAsync(string url, HttpMethod method, string requestBody, Dictionary dicHeaders, int timeoutSecond = 180); } } diff --git a/src/WMS.Web.Domain/IService/Public/IJuShuiTanService.cs b/src/WMS.Web.Domain/IService/Public/IJuShuiTanService.cs new file mode 100644 index 00000000..9b6af1ca --- /dev/null +++ b/src/WMS.Web.Domain/IService/Public/IJuShuiTanService.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using WMS.Web.Core.Dto.JuShuiTan; +using WMS.Web.Core.Internal.Results; + +namespace WMS.Web.Domain.IService.Public +{ + public interface IJuShuiTanService + { + Task GetTest(); + Task>> GetStock(); + Task>> GetInventory(List StockId); + } +} diff --git a/src/WMS.Web.Domain/IService/Public/ILingXingService.cs b/src/WMS.Web.Domain/IService/Public/ILingXingService.cs new file mode 100644 index 00000000..e099b3e5 --- /dev/null +++ b/src/WMS.Web.Domain/IService/Public/ILingXingService.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using WMS.Web.Core.Dto.LingXing; +using WMS.Web.Core.Internal.Results; + +namespace WMS.Web.Domain.IService.Public +{ + /// + /// 领星服务接口 + /// + public interface ILingXingService + { + /// + /// 获取领星所有仓库 + /// + /// + public Task>> GetStock(); + /// + /// 获取领星所有仓库 + /// + /// + public Task>> GetSeller(); + /// + /// 获取即时库存 + /// + /// + public Task>> GetInventory(List ids); + } +} diff --git a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs index 070d45f1..d4ee6000 100644 --- a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs @@ -71,6 +71,11 @@ namespace WMS.Web.Domain.Infrastructure /// /// Task> GetUcStockAsync(string systemCode,string name, int companyId); + /// + /// 获取仓库总公司 + /// + /// + Task> GetUcStockByHeadOfficeAsync(string name, int companyId); /// /// 获取事务 用来处理即时库存 diff --git a/src/WMS.Web.Domain/Infrastructure/IProductInventoryRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IProductInventoryRepositories.cs new file mode 100644 index 00000000..fa0bcd53 --- /dev/null +++ b/src/WMS.Web.Domain/Infrastructure/IProductInventoryRepositories.cs @@ -0,0 +1,42 @@ +using AutoMapper; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using WMS.Web.Core.Dto.Inventory; +using WMS.Web.Core.Dto.ProductInventory; +using WMS.Web.Domain.Entitys; +using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Values; + +namespace WMS.Web.Domain.Infrastructure +{ + /// + /// 成品仓即时库存 + /// + public interface IProductInventoryRepositories + { + /// + /// 添加 + /// + /// + /// + /// + Task AddRange(List entitys, bool isTransaction = true); + /// + /// 删除 + /// + /// + /// + Task Delete(ProductInventoryType type, bool isTransaction = true); + Task EditEntityList(List entitys, bool isTransaction = true); + Task> GetEntityList(ProductInventoryType type); + /// + /// 列表-分页 + /// + /// + /// + /// + Task<(List list, int total, List details)> GetListAsync(ProductInventoryQueryRequest dto, int companyId = 0); + } +} diff --git a/src/WMS.Web.Domain/Mappers/ProductInventoryMapper.cs b/src/WMS.Web.Domain/Mappers/ProductInventoryMapper.cs new file mode 100644 index 00000000..182a829a --- /dev/null +++ b/src/WMS.Web.Domain/Mappers/ProductInventoryMapper.cs @@ -0,0 +1,17 @@ +using AutoMapper; +using System; +using System.Collections.Generic; +using System.Text; +using WMS.Web.Core.Dto.Erp; +using WMS.Web.Domain.Entitys; + +namespace WMS.Web.Domain.Mappers +{ + public class ProductInventoryMapper : Profile + { + public ProductInventoryMapper() + { + CreateMap().ReverseMap(); + } + } +} diff --git a/src/WMS.Web.Domain/Options/ErpOptions.cs b/src/WMS.Web.Domain/Options/ErpOptions.cs index f61280ea..588f3629 100644 --- a/src/WMS.Web.Domain/Options/ErpOptions.cs +++ b/src/WMS.Web.Domain/Options/ErpOptions.cs @@ -28,6 +28,10 @@ namespace WMS.Web.Domain.Options /// erp-Id /// public string ErpId { get; set; } + /// + /// 账号Id + /// + public string ZhangTaoId { get; set; } public readonly string cache_materail_all_key = "erp_materials_list_all"; public readonly string cache_materail_key = "erp_materials_list"; public readonly string cache_org_key = "erp_org_list"; diff --git a/src/WMS.Web.Domain/Options/JuShuiTanOptions.cs b/src/WMS.Web.Domain/Options/JuShuiTanOptions.cs new file mode 100644 index 00000000..960b6ac9 --- /dev/null +++ b/src/WMS.Web.Domain/Options/JuShuiTanOptions.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Domain.Options +{ + public class JuShuiTanOptions + { + public string Url { get; set; } + public string AppKey { get; set; } + public string AppSecret { get; set; } + public string AccessToken { get; set; } + } +} diff --git a/src/WMS.Web.Domain/Options/QuartzJobOptions.cs b/src/WMS.Web.Domain/Options/QuartzJobOptions.cs index cb2c89ef..20ec9889 100644 --- a/src/WMS.Web.Domain/Options/QuartzJobOptions.cs +++ b/src/WMS.Web.Domain/Options/QuartzJobOptions.cs @@ -103,6 +103,11 @@ namespace WMS.Web.Domain.Options /// 监测金蝶删单 /// public string JobStartErpDelete { get; set; } + /// + /// 成品仓库即时库存 + /// + public string JobStartProductInventory { get; set; } + /// /// 是否启用集群：键 /// diff --git a/src/WMS.Web.Domain/Options/lingXingOptions.cs b/src/WMS.Web.Domain/Options/lingXingOptions.cs new file mode 100644 index 00000000..8027ea61 --- /dev/null +++ b/src/WMS.Web.Domain/Options/lingXingOptions.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Domain.Options +{ + /// + /// 领星配置 + /// + public class lingXingOptions + { + public string Url { get; set; } + public string AppId { get; set; } + public string AppSecret { get; set; } + } +} diff --git a/src/WMS.Web.Domain/QuartzJob/InventoryQuartzJob.cs b/src/WMS.Web.Domain/QuartzJob/InventoryQuartzJob.cs new file mode 100644 index 00000000..ff670cc5 --- /dev/null +++ b/src/WMS.Web.Domain/QuartzJob/InventoryQuartzJob.cs @@ -0,0 +1,48 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Quartz; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using WMS.Web.Domain.IService; + +namespace WMS.Web.Domain.QuartzJob +{ + //成品即时库存 + public class InventoryQuartzJob : IJob + { + private readonly ILogger _logger; + private readonly IServiceScopeFactory _serviceScopeFactory; + private readonly IProductInventoryService _productInventoryService; + + public InventoryQuartzJob(ILogger logger, + IServiceScopeFactory serviceScopeFactory, IProductInventoryService productInventoryService) + { + this._logger = logger; + _serviceScopeFactory = serviceScopeFactory; + _productInventoryService = productInventoryService; + } + + /// + /// 执行方法 + /// + /// + /// + public async Task Execute(IJobExecutionContext context) + { + try + { + if (DateTime.Now.Hour < 8 || DateTime.Now.Hour > 20) return; + + _logger.LogInformation($"同步成品即时库存->开始定时任务"); + var result = await _productInventoryService.Refresh(); + } + catch (Exception ex) + { + _logger.LogInformation($"同步成品即时库存：定时任务执行失败->{ex.Message}"); + } + + } + } +} diff --git a/src/WMS.Web.Domain/Services/ProductInventoryService.cs b/src/WMS.Web.Domain/Services/ProductInventoryService.cs new file mode 100644 index 00000000..74dd41fc --- /dev/null +++ b/src/WMS.Web.Domain/Services/ProductInventoryService.cs @@ -0,0 +1,342 @@ +using Microsoft.EntityFrameworkCore.Storage; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using NPOI.POIFS.FileSystem; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Web; +using WMS.Web.Core.Dto.Erp; +using WMS.Web.Core.Dto.Login; +using WMS.Web.Core.Internal.Results; +using WMS.Web.Domain.Entitys; +using WMS.Web.Domain.Infrastructure; +using WMS.Web.Domain.IService; +using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Values; +using static Microsoft.EntityFrameworkCore.DbLoggerCategory; + +namespace WMS.Web.Domain.Services +{ + public class ProductInventoryService : IProductInventoryService + { + private readonly IErpService _erpService; + private readonly ISingleDataService _singleDataService; + private readonly IErpBasicDataExtendService _erpBasicDataExtendService; + private readonly IProductInventoryRepositories _repositories; + private readonly ILingXingService _lingXingService; + private readonly IBasicsRepositories _basicsRepositories; + public readonly IBasicsRepositories _transactionRepositories; + public readonly IJuShuiTanService _juShuiTanService; + public readonly IErpInventoryService _erpInventoryService; + private readonly ILogger _logger; + public ProductInventoryService(IErpService erpService, + ISingleDataService singleDataService, + IErpBasicDataExtendService erpBasicDataExtendService, + IProductInventoryRepositories repositories, + ILingXingService lingXingService, + IBasicsRepositories basicsRepositories, + IBasicsRepositories transactionRepositories, + IJuShuiTanService juShuiTanService, + IErpInventoryService erpInventoryService, + ILogger logger) + { + _erpService = erpService; + _singleDataService = singleDataService; + _erpBasicDataExtendService = erpBasicDataExtendService; + _repositories = repositories; + _lingXingService = lingXingService; + _basicsRepositories = basicsRepositories; + _transactionRepositories = transactionRepositories; + _juShuiTanService = juShuiTanService; + _erpInventoryService = erpInventoryService; + _logger = logger; + } + + /// + /// 金蝶 + /// + /// + public async Task Erp() + { + //获取单点配置 + var r = await _basicsRepositories.GetUcStockByHeadOfficeAsync("", 1); + //r = r.Where(w => w.Code.Equals("CK001")).ToList(); + var codes = r.Where(w => + w.ManagementSystem == 1 || w.ManagementSystem == 4).Select(s => (s.Code, s.ErpOrgCode)).ToList(); + if (codes.Count() <= 0) return Result.ReSuccess(); + + //var str = string.Join(",", codes.Select(s => s.Code).ToList()); + + var res = await _erpInventoryService.GetInventory(codes.Select(s => s.Code).ToList()); + _logger.LogInformation($"拉取金蝶数据结果:{res.IsSuccess} {res.Message}"); + if (!res.IsSuccess) return res; + //过滤掉不符合要求的组织和仓库组合 + List listOld = new List(); + foreach (var item in codes) + { + var zList = res.Data.Where(w => w.OrgCode == item.ErpOrgCode && w.StockCode == item.Code).ToList(); + listOld.AddRange(zList); + } + List inventoryList = new List(); + + foreach (var item in listOld) + { + string subStock = ""; + if (!string.IsNullOrEmpty(item.Erp_SubStockName)) + subStock = item.Erp_SubStockName.Split(':')[1].Replace(";", ""); + + var entity = new ProductInventory() + { + Type = ProductInventoryType.JinDie, + MaterialNumber = item.MaterialNumber, + Customer = subStock, + OrgCode = item.OrgCode, + StockCode = item.StockCode, + Qty = item.Qty, + Batch = item.Batch, + BeforeQty = item.BeforeQty + }; + inventoryList.Add(entity); + } + + IDbContextTransaction _transaction = _transactionRepositories.GetTransaction(); + Result res_Rollback = Result.ReSuccess(); + bool isSuccess = true; + //修改库存 + //先删除之前的再添加 + if (res_Rollback.IsSuccess) + { + isSuccess = await _repositories.Delete(ProductInventoryType.JinDie, false); + if (isSuccess == false) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError); + } + if (res_Rollback.IsSuccess) + { + isSuccess = await _repositories.AddRange(inventoryList, false); + if (isSuccess == false) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError); + } + //提交事务 + isSuccess = _transactionRepositories.CommitTransaction(res_Rollback.IsSuccess ? false : true, _transaction); + if (!res_Rollback.IsSuccess) return res_Rollback; + if (!isSuccess) + return Result.ReFailure(ResultCodes.DateWriteError); + return Result.ReSuccess(); + } + /// + /// 聚水潭 + /// + /// + /// + public async Task JuShuiTan() + { + //获取单点配置 + var r = await _basicsRepositories.GetUcStockByHeadOfficeAsync("", 1); + var listNames = r.Where(w => + w.ManagementSystem == 2 && !string.IsNullOrEmpty(w.WarehouseCodeOfJushuitan)) + .Select(s => s.WarehouseCodeOfJushuitan) + .ToList(); + if (listNames.Count() <= 0) return Result.ReSuccess(); + //获取原数据 + var yList = await _repositories.GetEntityList(ProductInventoryType.JushuiTan); + + //获取领星仓库 + var resStock = await _juShuiTanService.GetStock(); + if (!resStock.IsSuccess) return resStock; + + var ids = resStock.Data.Where(w => listNames.Contains(w.Name)).Select(s => s.Id).ToList(); + //获取领星库存 + var resInventory = await _juShuiTanService.GetInventory(ids); + _logger.LogInformation($"拉取聚水潭数据结果:{resInventory.IsSuccess} {resInventory.Message}"); + if (!resInventory.IsSuccess) return resStock; + + + + //物料 + var materials_result = await _erpService.BillQueryForMaterial(); + List materials = new List(); + if (materials_result.IsSuccess) + materials = materials_result.Data.ToList(); + + List inventoryList = new List(); + List update_List = new List(); + foreach (var item in resInventory.Data) + { + //如果物料不匹配 过滤 + var m = materials.FirstOrDefault(f => f.Specifications.Equals(item.sku_id)); + if (m == null) continue; + //找仓库 + var l_stock = resStock.Data.FirstOrDefault(f => f.Id == item.wms_co_id); + if (l_stock == null) continue; + var stock = r.FirstOrDefault(f => f.WarehouseCodeOfJushuitan.Equals(l_stock.Name)); + if (stock == null) continue; + + var entity = new ProductInventory() + { + Type = ProductInventoryType.JushuiTan, + MaterialNumber = m.MaterialNumber, + Customer = "", + OrgCode = stock.ErpOrgCode, + StockCode = stock.Code, + Qty = item.ky_qty, + BeforeQty = item.qty ?? 0 + }; + + var old_Entity = yList.FirstOrDefault(f => f.MaterialNumber.Equals(entity.MaterialNumber) && + f.OrgCode.Equals(entity.OrgCode) && f.StockCode.Equals(entity.StockCode)); + if (old_Entity != null) + { + old_Entity.Qty = entity.Qty; + old_Entity.BeforeQty = entity.BeforeQty; + update_List.Add(old_Entity); + } + else + inventoryList.Add(entity); + } + IDbContextTransaction _transaction = _transactionRepositories.GetTransaction(); + Result res_Rollback = Result.ReSuccess(); + bool isSuccess = true; + //修改库存 + //先删除之前的再添加 + if (res_Rollback.IsSuccess) + { + isSuccess = await _repositories.EditEntityList(update_List, false); + if (isSuccess == false) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError); + } + if (res_Rollback.IsSuccess) + { + isSuccess = await _repositories.AddRange(inventoryList, false); + if (isSuccess == false) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError); + } + //提交事务 + isSuccess = _transactionRepositories.CommitTransaction(res_Rollback.IsSuccess ? false : true, _transaction); + if (!res_Rollback.IsSuccess) return res_Rollback; + if (!isSuccess) + return Result.ReFailure(ResultCodes.DateWriteError); + + return Result.ReSuccess(); + } + /// + /// 领星 + /// + /// + public async Task LingXing() + { + //获取单点配置 + var r = await _basicsRepositories.GetUcStockByHeadOfficeAsync("", 1); + var listNames = r.Where(w => + w.ManagementSystem == 3 && !string.IsNullOrEmpty(w.WarehouseCodeOfLingxing)) + .Select(s => s.WarehouseCodeOfLingxing) + .ToList(); + if (listNames.Count() <= 0) return Result.ReSuccess(); + //获取领星仓库 + var resStock = await _lingXingService.GetStock(); + _logger.LogInformation($"拉取领星仓库:{JsonConvert.SerializeObject(resStock)}"); + if (!resStock.IsSuccess) return resStock; + + var ids = resStock.Data.Where(w => listNames.Contains(w.Name)).Select(s => s.Id).ToList(); + string strIds = string.Join(",", ids); + //获取领星库存 + var resInventory = await _lingXingService.GetInventory(ids); + _logger.LogInformation($"拉取领星数据结果:{resInventory.IsSuccess} {resInventory.Message}"); + if (!resInventory.IsSuccess) return resStock; + + foreach (var i in ids) + { + _logger.LogInformation($"拉取领星数据{i} 数据总数:{resInventory.Data.Where(w => w.StockId == i).Count()}"); + } + + //物料 + var materials_result = await _erpService.BillQueryForMaterial(); + List materials = new List(); + if (materials_result.IsSuccess) + materials = materials_result.Data.ToList(); + //获取店铺 + var sellerList = await _lingXingService.GetSeller(); + //合并 + var group = resInventory.Data.GroupBy(g => (g.StockId, g.SKU, g.SellerId)); + //int cc = group.Count(); + + List inventoryList = new List(); + foreach (var item in group) + { + //如果物料不匹配 过滤 + var m = materials.FirstOrDefault(f => f.Specifications.Equals(item.Key.SKU)); + if (m == null) continue; + //找仓库 + var l_stock = resStock.Data.FirstOrDefault(f => f.Id == item.Key.StockId); + if (l_stock == null) continue; + var stock = r.FirstOrDefault(f => f.WarehouseCodeOfLingxing.Equals(l_stock.Name)); + if (stock == null) continue; + //店铺 + var seller = sellerList.Data.FirstOrDefault(f => f.Id == item.Key.SellerId); + + var pList = resInventory.Data.Where(w => w.SKU == item.Key.SKU + && w.StockId == item.Key.StockId && w.SellerId == item.Key.SellerId).ToList(); + var entity = new ProductInventory() + { + Type = ProductInventoryType.LingXing, + MaterialNumber = m.MaterialNumber, + Customer = seller != null ? seller.Name : "", + OrgCode = stock.ErpOrgCode, + StockCode = stock.Code, + Qty = pList.Sum(s => s.Product_Valid_Num), + BeforeQty = pList.Sum(s => s.Product_Total) + }; + inventoryList.Add(entity); + } + + IDbContextTransaction _transaction = _transactionRepositories.GetTransaction(); + Result res_Rollback = Result.ReSuccess(); + bool isSuccess = true; + //修改库存 + //先删除之前的再添加 + if (res_Rollback.IsSuccess) + { + isSuccess = await _repositories.Delete(ProductInventoryType.LingXing, false); + if (isSuccess == false) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError); + } + if (res_Rollback.IsSuccess) + { + isSuccess = await _repositories.AddRange(inventoryList, false); + if (isSuccess == false) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError); + } + //提交事务 + isSuccess = _transactionRepositories.CommitTransaction(res_Rollback.IsSuccess ? false : true, _transaction); + if (!res_Rollback.IsSuccess) return res_Rollback; + if (!isSuccess) + return Result.ReFailure(ResultCodes.DateWriteError); + + return Result.ReSuccess(); + } + + public async Task Refresh() + { + _logger.LogInformation($"同步成品仓库存->开始 {DateTime.Now}"); + + try + { + var res = await this.Erp(); + _logger.LogInformation($"同步成品仓库存(物料) {res.IsSuccess} {res.Message}"); + if (!res.IsSuccess) return res; + + res = await this.JuShuiTan(); + _logger.LogInformation($"同步成品仓库存(聚水潭) {res.IsSuccess} {res.Message}"); + if (!res.IsSuccess) return res; + + res = await this.LingXing(); + _logger.LogInformation($"同步成品仓库存(领星) {res.IsSuccess} {res.Message}"); + if (!res.IsSuccess) return res; + } + catch (Exception ex) + { + _logger.LogError($"同步成品仓库异常:{ex.ToString()}"); + } + + _logger.LogInformation($"同步成品仓库存->结束 {DateTime.Now}"); + return Result.ReSuccess(); + } + } +} diff --git a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs index 3710980d..a927b6d7 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs @@ -7,6 +7,7 @@ using WMS.Web.Core.Dto.Erp; using WMS.Web.Core.Dto.Erp.Customer; using WMS.Web.Core.Dto.Erp.Org; using WMS.Web.Core.Dto.Erp.Supplier; +using WMS.Web.Core.Dto.SingleData; using WMS.Web.Domain.Infrastructure; using WMS.Web.Domain.IService.Public; @@ -407,6 +408,18 @@ namespace WMS.Web.Domain.Services.Public var stock = erpStocks.Where(x => x.Code == code).FirstOrDefault(); return stock == null ? "" : stock.Name; } - + /// + /// 成品即时库存仓库 + /// + /// + /// + /// + public string GetProductInventoryStockName(List list, string code) + { + if (list == null || list.Count == 0) + return ""; + var stock = list.Where(x => x.Code == code).FirstOrDefault(); + return stock == null ? "" : stock.Name; + } } } diff --git a/src/WMS.Web.Domain/Services/Public/ErpInventoryService.cs b/src/WMS.Web.Domain/Services/Public/ErpInventoryService.cs new file mode 100644 index 00000000..bc67173d --- /dev/null +++ b/src/WMS.Web.Domain/Services/Public/ErpInventoryService.cs @@ -0,0 +1,320 @@ +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using MySqlX.XDevAPI.Common; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net; +using System.Text; +using System.Threading.Tasks; +using WMS.Web.Core.Dto.Erp; +using WMS.Web.Core.Dto.JuShuiTan; +using WMS.Web.Core.Internal.Results; +using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Options; +using WMS.Web.Domain.Values; + +namespace WMS.Web.Domain.Services.Public +{ + public class ErpInventoryService : IErpInventoryService + { + private ErpOptions _erpOptions; + private readonly ILogger _logger; + public ErpInventoryService(IOptions erpOptions, ILogger logger) + { + _erpOptions = erpOptions?.Value; + _logger = logger; + } + + private bool Login(HttpClientEx httpClient) + { + string baseUrl = _erpOptions.EndpointAddress.Replace("/ERPGW.asmx", ""); //"http://192.168.1.1/k3cloud";//服务器地址 + + httpClient.Url = string.Format("{0}/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc", baseUrl); + List Parameters = new List(); + Parameters.Add(_erpOptions.ZhangTaoId);//帐套Id + Parameters.Add(_erpOptions.UserName);//用户名 + Parameters.Add(_erpOptions.Password);//密码 + Parameters.Add(2052);//多语言：中文 + + httpClient.Content = JsonConvert.SerializeObject(Parameters); + string response = httpClient.AsyncRequest(); + var iResult = JObject.Parse(response)["LoginResultType"].Value(); + return iResult == 1 ? true : false; + } + public async Task>> GetInventory(List stockCodes) + { + List list = new List(); + HttpClientEx httpClient = new HttpClientEx(); + var isSuccess = Login(httpClient); + string baseUrl = _erpOptions.EndpointAddress.Replace("/ERPGW.asmx", ""); + httpClient.Url = string.Format("{0}/Kingdee.K3.SCM.WebApi.ServicesStub.InventoryQueryService.GetInventoryData.common.kdsvc", baseUrl); + int count = stockCodes.Count() / 10; + count = count + 1; + for (int ic = 1; ic <= count; ic++) + { + var codes = stockCodes.Skip((ic-1) * 10).Take(10).ToList(); + if (codes.Count() <= 0) + { + return Result>.ReSuccess(list.Where(w => w.Qty > 0 || w.BeforeQty > 0).ToList()); + } + string code = string.Join(",", codes); + + //foreach (var code in stockCodes) + //{ + List Parameters = new List(); + var model = new InventoryParamModel(); + model.fstocknumbers = code; + //model.fmaterialnumbers = "G01-11-572474"; + model.isshowauxprop = true; + model.isshowstockloc = true; + model.pageindex = 1; + model.pagerows = 5000; + Parameters.Add(model); + + httpClient.Content = JsonConvert.SerializeObject(Parameters); + //_logger.LogInformation($"1.开始进行连接 {code}"); + string content = httpClient.AsyncRequest(); + //_logger.LogInformation($"金蝶返回数据{content}"); + JObject resData = JObject.Parse(content); + + if (resData["success"].ToString().ToLower() != "true") + return Result>.ReFailure(ResultCodes.Erp_Inventory_Error); + + string json = resData["data"].ToString(); + var datas = JsonConvert.DeserializeObject>(json); + if (datas != null && datas.Count() > 0) + list.AddRange(datas); + + int num = Convert.ToInt32(resData["rowcount"]) / 5000; + for (int i = 1; i <= num; i++) + { + model.pageindex++; + + httpClient.Content = JsonConvert.SerializeObject(Parameters); + + content = httpClient.AsyncRequest(); + //_logger.LogInformation($"金蝶返回数据{content}"); + resData = JObject.Parse(content); + + if (resData["success"].ToString().ToLower() != "true") + return Result>.ReFailure(ResultCodes.Erp_Inventory_Error); + + json = resData["data"].ToString(); + datas = JsonConvert.DeserializeObject>(json); + if (datas != null && datas.Count() > 0) + list.AddRange(datas); + } + } + + var blist = list.Where(w => w.Qty > 0 || w.BeforeQty > 0).ToList(); + + return Result>.ReSuccess(blist); + } + + } + class HttpClientEx + + { + + /// + + /// Seivice URL + + /// + + public string Url { get; set; } + + /// + + /// 内容 + + /// + + public string Content { get; set; } + + /// + + /// Cookie，保证登录后，所有访问持有一个Cookie； + + /// + + static CookieContainer Cookie = new CookieContainer(); + + + + /// + + /// HTTP访问 + + /// + + public string AsyncRequest() + + { + + HttpWebRequest httpRequest = HttpWebRequest.Create(Url) as HttpWebRequest; + + httpRequest.Method = "POST"; + + httpRequest.ContentType = "application/json"; + + httpRequest.CookieContainer = Cookie; + + httpRequest.Timeout = 1000 * 60 * 10;//10min + + + + using (Stream reqStream = httpRequest.GetRequestStream()) + + { + + JObject jObj = new JObject(); + + jObj.Add("format", 1); + + jObj.Add("useragent", "ApiClient"); + + jObj.Add("rid", Guid.NewGuid().ToString().GetHashCode().ToString()); + + jObj.Add("parameters", Content); + + jObj.Add("timestamp", DateTime.Now); + + jObj.Add("v", "1.0"); + + string sContent = jObj.ToString(); + + var bytes = UnicodeEncoding.UTF8.GetBytes(sContent); + + reqStream.Write(bytes, 0, bytes.Length); + + reqStream.Flush(); + + } + + using (var repStream = httpRequest.GetResponse().GetResponseStream()) + + { + + using (var reader = new StreamReader(repStream)) + + { + + return ValidateResult(reader.ReadToEnd()); + + } + + } + + } + + + + private static string ValidateResult(string responseText) + + { + + if (responseText.StartsWith("response_error:")) + + { + + return responseText.TrimStart("response_error:".ToCharArray()); + + } + + return responseText; + + } + + + + } + class InventoryParamModel + + { + + /// + + /// 库存组织编码，多个使用英文逗号【,】分隔 + + /// + + public string fstockorgnumbers { get; set; } + + + + /// + + /// 物料编码，多个使用英文逗号【,】分隔 + + /// + + public string fmaterialnumbers { get; set; } + + + + /// + + /// 仓库编码，多个使用英文逗号【,】分隔 + + /// + + public string fstocknumbers { get; set; } + + + + /// + + /// 批号编码，多个使用英文逗号【,】分隔 + + /// + + public string flotnumbers { get; set; } + + + + /// + + /// 是否查询仓位 + + /// + + public bool isshowstockloc { get; set; } + + + + /// + + /// 是否查询辅助属性 + + /// + + public bool isshowauxprop { get; set; } + + + + /// + + /// 当前页码 + + /// + + public int pageindex { get; set; } + + + + /// + + /// 每页显示行数 + + /// + + public int pagerows { get; set; } + + } + +} diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index ebcfb7b8..59516961 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -160,7 +160,7 @@ namespace WMS.Web.Domain.Services.Public /// 模糊搜索 /// 单据编号集合精确查找 /// - public async Task> BillQueryForPurchaseInStock(List sourceBillNos = null, DateTime? beginTime = null,bool isCheck=true) + public async Task> BillQueryForPurchaseInStock(List sourceBillNos = null, DateTime? beginTime = null, bool isCheck = true) { string result_json = ""; try @@ -194,7 +194,7 @@ namespace WMS.Web.Domain.Services.Public //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //param.FilterString = " FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'"; param.FilterString = " FMRPCloseStatus='A'"; - if(isCheck) param.FilterString += " and FDocumentStatus='C'"; + if (isCheck) param.FilterString += " and FDocumentStatus='C'"; for (int i = 0; i < stocks.Count(); i++) { if (i == 0) @@ -2637,7 +2637,7 @@ namespace WMS.Web.Domain.Services.Public } } - public async Task> BillQueryForInventory(List<(string materialNumber, string orgCode, string stockCode, int subStockId)> request) + public async Task> BillQueryForInventory(List<(string orgCode, string stockCode)> request) { try { @@ -2650,51 +2650,76 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_Inventory.ToString()); - param.FieldKeys = "FBASEQTY,FMATERIALID.FNumber,FSTOCKORGID.FNumber,FSTOCKID.FNumber,FSTOCKLOCID"; - param.Limit = 100; - //param.FilterString = $"FSTOCKORGID.FNumber='{request[0].orgCode}' and FSTOCKID.FNumber='{request[0].stockCode}'"; - //param.FilterString = $""; + // ORICO_AD,FF100004 ORICO_GD,FF100005 ORICO_HD,FF100007 ORICO_JD,FF100008 + param.FieldKeys = "FMATERIALID.FNumber,FSTOCKORGID.FNumber,FSTOCKID.FNumber,FLot.FNumber,FBASEQTY,FSTOREURNOM,FSTOREURNUM,FSTOCKLOCID.FF100004.FName,FSTOCKLOCID.FF100005.FName,FSTOCKLOCID.FF100007.FName,FSTOCKLOCID.FF100008.FName"; + param.Limit = 10000; + //param.FilterString = $" FMATERIALID.FNumber='G01-11-572474' and FSTOCKID.FNumber='AD' and FBASEQTY>0"; + //param.FilterString = $" FBASEQTY>0"; for (int i = 0; i < request.Count(); i++) { if (i == 0) { - param.FilterString = $"(FMATERIALID.FNumber='{request[0].materialNumber}' and FSTOCKORGID.FNumber='{request[0].orgCode}' and FSTOCKID.FNumber='{request[0].stockCode}' and FSTOCKLOCID={request[0].subStockId})"; + param.FilterString += $" and ((FSTOCKORGID.FNumber='{request[0].orgCode}' and FSTOCKID.FNumber='{request[0].stockCode}' )"; + if (request.Count() == 1) param.FilterString += ")"; } else { - param.FilterString += $" or (FMATERIALID.FNumber='{request[i].materialNumber}' and FSTOCKORGID.FNumber='{request[i].orgCode}' and FSTOCKID.FNumber='{request[i].stockCode}' and FSTOCKLOCID={request[i].subStockId})"; + param.FilterString += $" or (FSTOCKORGID.FNumber='{request[i].orgCode}' and FSTOCKID.FNumber='{request[i].stockCode}' ))"; } } - query.Data = JsonConvert.SerializeObject(param); - var json = JsonConvert.SerializeObject(query); - - //4.请求查询接口 - var result_json = await _client.ExecuteBillQueryAsync(json); - var result = JsonConvert.DeserializeObject>>(result_json); + bool isHave = true; var erp_list = new List(); - foreach (var item in result) + int skip = 0; + + + while (isHave) { + //4.1.页码：页码按照金蝶的要求从0开始 + param.StartRow = (Convert.ToInt32(skip) * param.Limit); - var lis = erp_list.FirstOrDefault(f => f.MaterialNumber.Equals(item[1]) - && f.OrgCode.Equals(item[2]) - && f.StockCode.Equals(item[3])); + query.Data = JsonConvert.SerializeObject(param); + var json = JsonConvert.SerializeObject(query); - if (lis == null) + //4.请求查询接口 + var result_json = await _client.ExecuteBillQueryAsync(json); + var result = JsonConvert.DeserializeObject>>(result_json); + //4.4.判断数据是否全部拉取完成：并停止循环的条件 + if (result == null || result.Count == 0) + isHave = false; + + foreach (var item in result) { - lis = new ErpInventoryDto(); - lis.Qty = Convert.ToDecimal(item[0]); - lis.MaterialNumber = item[1]; - lis.OrgCode = item[2]; - lis.StockCode = item[3]; - lis.Erp_SubStockId = Convert.ToInt32(item[4]); - erp_list.Add(lis); - } - else - lis.Qty = lis.Qty + Convert.ToDecimal(item[0]); - } + string name = GetName(item[7], item[8], item[9], item[10]); + var lis = erp_list.FirstOrDefault(f => f.MaterialNumber.Equals(item[0]) + && f.OrgCode.Equals(item[1]) + && f.StockCode.Equals(item[2]) && f.Erp_SubStockName.Equals(name)); - return ResultList.ReSuccess(erp_list); + if (lis == null) + { + lis = new ErpInventoryDto(); + lis.MaterialNumber = item[0]; + lis.OrgCode = item[1]; + lis.StockCode = item[2]; + lis.Batch = item[3]; + //查询库存单位数量FQTY：FMaterialid.FSTOREURNOM,FMaterialid.FSTOREURNUM， + //查出结果后用(FBASEQTY*FSTOREURNOM/FSTOREURNUM)计算得到库存单位数量。 + lis.BeforeQty = Convert.ToDecimal(item[4]) * Convert.ToDecimal(item[5]) / Convert.ToDecimal(item[6]); + //lis.Qty= Convert.ToDecimal(item[10]) * Convert.ToDecimal(item[5]) / Convert.ToDecimal(item[6]); + lis.Erp_SubStockName = name; + erp_list.Add(lis); + } + else + { + lis.BeforeQty = lis.BeforeQty + (Convert.ToDecimal(item[4]) * Convert.ToDecimal(item[5]) / Convert.ToDecimal(item[6])); + //lis.Qty = lis.Qty + Convert.ToDecimal(item[5]); + } + } + //4.6页面的叠加 + skip++; + } + var list = erp_list.Where(w => w.BeforeQty > 0 || w.Qty > 0).ToList(); + return ResultList.ReSuccess(list); } catch (Exception ex) { @@ -2702,9 +2727,16 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(ResultCodes.Erp_Inventory_Error); } } + - - + public string GetName(string name1,string name2,string name3,string name4) + { + if (!string.IsNullOrEmpty(name1)) return name1; + if (!string.IsNullOrEmpty(name2)) return name2; + if (!string.IsNullOrEmpty(name3)) return name3; + if (!string.IsNullOrEmpty(name4)) return name4; + return ""; + } #endregion } diff --git a/src/WMS.Web.Domain/Services/Public/HttpClientService.cs b/src/WMS.Web.Domain/Services/Public/HttpClientService.cs index 016bd2dd..5f9b5d3f 100644 --- a/src/WMS.Web.Domain/Services/Public/HttpClientService.cs +++ b/src/WMS.Web.Domain/Services/Public/HttpClientService.cs @@ -1,4 +1,5 @@ using Microsoft.Extensions.Logging; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Net.Http; @@ -48,8 +49,9 @@ namespace WMS.Web.Domain.Services.Public var responseContent = await response.Content.ReadAsStringAsync(); //2.当前使用这里是为了迎合错误信息观看 if (response.IsSuccessStatusCode) { - var t = JsonSerializer.Deserialize(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); + //var t = JsonSerializer.Deserialize(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); //var t = await JsonSerializer.DeserializeAsync(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });//3.配合1的ReadAsStream使用 + var t = JsonConvert.DeserializeObject(responseContent); return t; } @@ -80,8 +82,9 @@ namespace WMS.Web.Domain.Services.Public var responseContent = await response.Content.ReadAsStringAsync(); //2.当前使用这里是为了迎合错误信息观看 if (response.IsSuccessStatusCode) { - var t = JsonSerializer.Deserialize(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); + //var t = JsonSerializer.Deserialize(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); //var t = await JsonSerializer.DeserializeAsync(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });//3.配合1的ReadAsStream使用 + var t = JsonConvert.DeserializeObject(responseContent); return t; } @@ -111,7 +114,8 @@ namespace WMS.Web.Domain.Services.Public var responseContent = await response.Content.ReadAsStringAsync(); if (response.IsSuccessStatusCode) { - var t = JsonSerializer.Deserialize(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); + //var t = JsonSerializer.Deserialize(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); + var t = JsonConvert.DeserializeObject(responseContent); return t; } @@ -135,7 +139,8 @@ namespace WMS.Web.Domain.Services.Public var responseContent = await response.Content.ReadAsStringAsync(); if (response.IsSuccessStatusCode) { - var t = JsonSerializer.Deserialize(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); + //var t = JsonSerializer.Deserialize(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); + var t = JsonConvert.DeserializeObject(responseContent); if (t == null) _logger.LogInformation($"获取单点数据为空---{responseContent}"); return t; @@ -163,8 +168,8 @@ namespace WMS.Web.Domain.Services.Public var responseContent = await response.Content.ReadAsStringAsync(); if (response.IsSuccessStatusCode) { - var t = JsonSerializer.Deserialize(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); - + //var t = JsonSerializer.Deserialize(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); + var t = JsonConvert.DeserializeObject(responseContent); return t; } @@ -226,5 +231,20 @@ namespace WMS.Web.Domain.Services.Public if (timeoutSecond != null) httpClient.Timeout = TimeSpan.FromSeconds(timeoutSecond.Value); return httpClient; } + + public async Task PostAsync(string url, HttpContent content, Dictionary dicHeaders, int timeoutSecond = 180) + { + var client = BuildHttpClient(dicHeaders, timeoutSecond); + var response = await client.PostAsync(url, content); + var responseContent = await response.Content.ReadAsStringAsync(); + if (response.IsSuccessStatusCode) + { + var t = Newtonsoft.Json.JsonConvert.DeserializeObject(responseContent); + return t; + } + + _logger.LogError($"HttpGet:{url} Error:{responseContent}"); + throw new WebHttpException(response.StatusCode.ToString(), responseContent); + } } } diff --git a/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs b/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs new file mode 100644 index 00000000..b7cc5e52 --- /dev/null +++ b/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs @@ -0,0 +1,245 @@ +using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net; +using System.Security.Cryptography; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using WMS.Web.Core.Dto.Erp; +using WMS.Web.Core.Dto.JuShuiTan; +using WMS.Web.Core.Help; +using WMS.Web.Core.Internal.Results; +using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Options; +using WMS.Web.Domain.Values; + +namespace WMS.Web.Domain.Services.Public +{ + public class JuShuiTanService : IJuShuiTanService + { + private readonly IHttpClientService _httpClientService; + private readonly ILogger _logger; + private readonly IMemoryCache _memoryCache; + private int hours = 10;//过期时间 默认10小时 + private readonly JuShuiTanOptions _option; + public JuShuiTanService(IHttpClientService httpClientService, ILogger logger, + IMemoryCache memoryCache, IOptions option) + { + this._memoryCache = memoryCache; + this._httpClientService = httpClientService; + this._logger = logger; + _option = option?.Value; + } + public async Task GetTest() + { + //await GetStock(); + var list = new List(); + list.Add(10923342); + await GetInventory(list); + } + + public async Task>> GetStock() + { + var stock_list = _memoryCache.Get>("jushuitan_stock"); + if (stock_list != null && stock_list.Count > 0) + return Result>.ReSuccess(stock_list); + + List list = new List(); + + JuShuiTanStockRequst request = new JuShuiTanStockRequst(); + var resContent = PostUrl("/open/wms/partner/query", JsonConvert.SerializeObject(request)); + JObject resData = JObject.Parse(resContent); + + if (Convert.ToInt32(resData["code"]) != 0) + { + _logger.LogInformation($"聚水潭获取仓库失败:{resData["msg"].ToString()}"); + return Result>.ReFailure(ResultCodes.JuShuiTanDataError); + } + string json = resData["data"]["datas"].ToString(); + var datas = JsonConvert.DeserializeObject>(json); + list.AddRange(datas); + + int count = Convert.ToInt32(resData["data"]["page_count"]); + for (int i = 1; i < count; i++) + { + request.page_index++; + resContent = PostUrl("/open/wms/partner/query", JsonConvert.SerializeObject(request)); + resData = JObject.Parse(resContent); + + if (Convert.ToInt32(resData["code"]) != 0) + { + _logger.LogInformation($"聚水潭获取仓库失败:{resData["msg"].ToString()}"); + return Result>.ReFailure(ResultCodes.JuShuiTanDataError); + } + json = resData["data"]["datas"].ToString(); + datas = JsonConvert.DeserializeObject>(json); + list.AddRange(datas); + } + + //设置缓存 + _memoryCache.Set("jushuitan_stock", list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromMinutes(DateTimeUtil.GetTotalMinutesTimeSpan()))); + return Result>.ReSuccess(list); + } + + + public async Task>> GetInventory(List StockId) + { + List list = new List(); + foreach (var id in StockId) + { + Thread.Sleep(1000);//不能太频繁请求 + JuShuiTanInventoryRequst request = new JuShuiTanInventoryRequst(); + request.wms_co_id = id;//10923342; + request.page_size = 100; + request.modified_begin = DateTime.Now.AddDays(-6).AddHours(-23).ToString("yyyy-MM-dd HH:mm:ss"); + request.modified_end = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + var resContent = PostUrl("/open/inventory/query", JsonConvert.SerializeObject(request)); + JObject resData = JObject.Parse(resContent); + + if (Convert.ToInt32(resData["code"]) != 0) + { + _logger.LogInformation($"聚水潭获取即时库存失败:{resData["msg"].ToString()}"); + return Result>.ReFailure(ResultCodes.JuShuiTanDataError); + } + string json = resData["data"]["inventorys"].ToString(); + var datas = JsonConvert.DeserializeObject>(json); + datas.ForEach(f => f.wms_co_id = id); + list.AddRange(datas); + + int count = Convert.ToInt32(resData["data"]["page_count"]); + for (int i = 1; i < count; i++) + { + Thread.Sleep(1000);//不能太频繁请求 + request.page_index++; + resContent = PostUrl("/open/inventory/query", JsonConvert.SerializeObject(request)); + resData = JObject.Parse(resContent); + + if (Convert.ToInt32(resData["code"]) != 0) + { + _logger.LogInformation($"聚水潭获取即时库存失败:{resData["msg"].ToString()}"); + return Result>.ReFailure(ResultCodes.JuShuiTanDataError); + } + json = resData["data"]["inventorys"].ToString(); + datas = JsonConvert.DeserializeObject>(json); + datas.ForEach(f => f.wms_co_id = id); + list.AddRange(datas); + } + } + //主仓实际库存-订单占有数+虚拟库存+采购在途(业务设置)+进货仓(业务设置)+销退仓库存(业务设置) + foreach (var item in list) + { + item.qty = item.qty == null ? 0 : item.qty; + item.ky_qty = (item.qty ?? 0) - (item.order_lock ?? 0) + (item.virtual_qty ?? 0) + + (item.purchase_qty ?? 0) + (item.in_qty ?? 0) + (item.return_qty ?? 0); + } + //这里不能过滤掉都是0的 因为要修改 + //var resList = list.Where(w => w.qty > 0 || w.ky_qty > 0).ToList(); + return Result>.ReSuccess(list); + } + + /// + /// 调用接口 + /// + private string PostUrl(string urlStr, string biz) + { + Hashtable ht = new Hashtable(); + System.DateTime starttime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); + string time = Math.Floor((System.DateTime.Now - starttime).TotalSeconds).ToString(); + string app_key = _option.AppKey;// "17231841286c45f99eb9acf445404349"; + string app_secret = _option.AppSecret;// "5ce9641ae6db4abb8b96eea7df6a81e9"; + string access_token = _option.AccessToken;// "4605358c37374780a8a4395e6cdb1c3f"; + + + //string biz = "{\"modified_begin\":\"2022-06-10 00:00:00\",\"modified_end\":\"2022-06-12 00:00:00\",\"page_index\":1,\"page_size\":30}"; + + ht.Add("access_token", access_token); + ht.Add("app_key", app_key); + ht.Add("biz", biz); + ht.Add("charset", "utf-8"); + ht.Add("timestamp", time); + ht.Add("version", "2"); + string sign = getSign(app_secret, ht); + ht.Add("sign", sign); + string posturl = _option.Url + urlStr; + Encoding datacode = Encoding.UTF8; + string paramData = GetParamData(ht); + return PostWebRequest(posturl, paramData, datacode); + } + + string getSign(string signKey, Hashtable param) + { + + ArrayList keys = new ArrayList(param.Keys); + keys.Sort(); //按字母顺序进行排序 + string resultStr = ""; + foreach (string key in keys) + { + if (key != null && key != "" && key != "sign") + { + resultStr = resultStr + key + param[key]; + } + } + resultStr = signKey + resultStr; + MD5 md5 = MD5.Create(); + byte[] rstRes = md5.ComputeHash(Encoding.UTF8.GetBytes(resultStr)); + string hex = BitConverter.ToString(rstRes, 0).Replace("-", string.Empty).ToLower(); + + return hex; + + } + + + private string PostWebRequest(string postUrl, string paramData, Encoding dataEncode) + { + string ret = string.Empty; + try + { + + byte[] byteArray = dataEncode.GetBytes(paramData); + //转化 + HttpWebRequest webReq = (HttpWebRequest)WebRequest.Create(new Uri(postUrl)); + webReq.Method = "POST"; + webReq.ContentType = "application/x-www-form-urlencoded;charset=UTF-8"; + webReq.ContentLength = byteArray.Length; + + Stream newStream = webReq.GetRequestStream(); + newStream.Write(byteArray, 0, byteArray.Length); + //写入参数 + newStream.Close(); + + HttpWebResponse response = (HttpWebResponse)webReq.GetResponse(); + StreamReader sr = new StreamReader(response.GetResponseStream(), dataEncode); + ret = sr.ReadToEnd(); + sr.Close(); + response.Close(); + newStream.Close(); + } + catch (Exception ex) + { + + } + return ret; + } + + private string GetParamData(Hashtable ht) + { + string str = ""; + foreach (DictionaryEntry items in ht) + { + + str += items.Key.ToString() + "=" + System.Web.HttpUtility.UrlEncode(items.Value.ToString(), System.Text.Encoding.UTF8) + "&"; + } + + return str.Substring(0, str.Length - 1); + } + + } +} diff --git a/src/WMS.Web.Domain/Services/Public/LingXingService.cs b/src/WMS.Web.Domain/Services/Public/LingXingService.cs new file mode 100644 index 00000000..5ec6b350 --- /dev/null +++ b/src/WMS.Web.Domain/Services/Public/LingXingService.cs @@ -0,0 +1,392 @@ +using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using WMS.Web.Core.Dto; +using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Options; +using WMS.Web.Core.Internal.Results; +using WMS.Web.Core.Dto.LingXing; +using System.Json; +using System.Net.Http; +using NPOI.POIFS.Crypt.Dsig; +using NPOI.SS.Formula.Functions; +using System.Configuration; +using System.Linq; +using System.Net; +using System.Text.RegularExpressions; +using System.Security.Cryptography; +using System.Reflection; +using WMS.Web.Core.Help; +using static System.Net.WebRequestMethods; +using WMS.Web.Domain.Values; +using WMS.Web.Core.Dto.JuShuiTan; +using System.Threading; + +namespace WMS.Web.Domain.Services.Public +{ + /// + /// 领星服务接口 + /// + public class LingXingService : ILingXingService + { + private readonly IHttpClientService _httpClientService; + private readonly ILogger _logger; + private readonly IMemoryCache _memoryCache; + private int hours = 10;//过期时间 默认10小时 + private readonly lingXingOptions _option; + + public LingXingService(IHttpClientService httpClientService, ILogger logger, + IMemoryCache memoryCache, IOptions option) + { + this._memoryCache = memoryCache; + this._httpClientService = httpClientService; + this._logger = logger; + _option = option?.Value; + } + + public async Task> Login() + { + string endStr = "/api/auth-server/oauth/access-token"; + + var formData = new MultipartFormDataContent(); + formData.Add(new StringContent(_option.AppId), "appId"); + formData.Add(new StringContent(_option.AppSecret), "appSecret"); + + var res = await _httpClientService.PostAsync(_option.Url + endStr, formData, null); + + if (res.code != "200") + { + _logger.LogInformation($"领星获取授权失败:{res.msg}"); + return Result.ReFailure(ResultCodes.LingXingTokenError); + } + string token = res.data.access_token; + return Result.ReSuccess(token); + } + /// + /// 获取所有仓库 + /// + /// + public async Task>> GetStock() + { + var stock_list = _memoryCache.Get>("lingxing_stock"); + if (stock_list != null && stock_list.Count > 0) + return Result>.ReSuccess(stock_list); + + List list = new List(); + + //默认获取本地仓库 如果需要海外仓 另外需传参数type + var request = new LingXingRequest(); + var resUrl = await GetStr("/erp/sc/data/local_inventory/warehouse", request); + if (!resUrl.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); + + var res = await _httpClientService.PostAsync(resUrl.Data, JsonConvert.SerializeObject(request), null); + if (res.Code != 0) return Result>.ReFailure(ResultCodes.LingXingDataError); + + list.AddRange(JsonConvert.DeserializeObject>(res.Data.ToString())); + + //海外仓 + request = new LingXingRequest(); + request.type = 3; + resUrl = await GetStr("/erp/sc/data/local_inventory/warehouse", request); + if (!resUrl.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); + + res = await _httpClientService.PostAsync(resUrl.Data, JsonConvert.SerializeObject(request), null); + if (res.Code != 0) return Result>.ReFailure(ResultCodes.LingXingDataError); + + list.AddRange(JsonConvert.DeserializeObject>(res.Data.ToString())); + + + //设置缓存 + _memoryCache.Set("lingxing_stock", list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromMinutes(DateTimeUtil.GetTotalMinutesTimeSpan()))); + + return Result>.ReSuccess(list); + } + + /// + /// 获取所有店铺 + /// + /// + /// + public async Task>> GetSeller() + { + var seller_list = _memoryCache.Get>("lingxing_seller"); + if (seller_list != null && seller_list.Count > 0) + return Result>.ReSuccess(seller_list); + + var request = new LingXingKongRequest(); + var resUrl = await GetStr("/erp/sc/data/seller/lists", request); + if (!resUrl.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); + + var res = await _httpClientService.GetAsync(resUrl.Data); + if (res.Code != 0) + { + _logger.LogInformation($"领星获取数据失败{res.Message}"); + return Result>.ReFailure(ResultCodes.LingXingDataError); + } + + var list = JsonConvert.DeserializeObject>(res.Data.ToString()); + //设置缓存 + _memoryCache.Set("lingxing_seller", list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromMinutes(DateTimeUtil.GetTotalMinutesTimeSpan()))); + + return Result>.ReSuccess(list); + } + + /// + /// 获取即使库存 + /// + /// + /// + /// + public async Task>> GetInventory(List ids) + { + List list = new List(); + foreach (var id in ids) + { + LingXingInventoryRequest dto = new LingXingInventoryRequest(); + dto.wid = id.ToString(); + //dto.length = 50; + //dto.sku = "NTONPOWER-OSP-3A2U-US-BK-4.6M"; + var resUrl = await GetStr("/erp/sc/routing/data/local_inventory/inventoryDetails", dto); + if (!resUrl.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); + + var res = await _httpClientService.PostAsync(resUrl.Data, JsonConvert.SerializeObject(dto), null); + if (res.Code != 0) + { + _logger.LogInformation($"领星获取数据失败{res.Message}"); + return Result>.ReFailure(ResultCodes.LingXingDataError); + } + list.AddRange(JsonConvert.DeserializeObject>(res.Data.ToString())); + //var b = list.Where(w => w.SKU.Equals("NTONPOWER-OSP-3A2U-US-BK-4.6M")).ToList(); + int num = res.Total / 800; + for (int i = 1; i <= num; i++) + { + Thread.Sleep(1000);//怕拉取过于频繁接口限制 + dto.offset = i * 800; + if (i == num) dto.length = res.Total - (num * 800); + var resUrl_f = await GetStr("/erp/sc/routing/data/local_inventory/inventoryDetails", dto); + if (!resUrl_f.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); + var res_f = await _httpClientService.PostAsync(resUrl_f.Data, JsonConvert.SerializeObject(dto), null); + if (res_f.Code != 0) + { + _logger.LogInformation($"领星获取数据失败{res.Message}"); + return Result>.ReFailure(ResultCodes.LingXingDataError); + } + var d = JsonConvert.DeserializeObject>(res_f.Data.ToString()); + //var bc = d.Where(w => w.SKU.Equals("NTONPOWER-OSP-3A2U-US-BK-4.6M")).Any(); + //_logger.LogInformation($"次数:{i} 是否存在{bc}"); + + list.AddRange(d); + + } + } + //var bcd = list.Where(w => w.SKU.Equals("NTONPOWER-OSP-3A2U-US-BK-4.6M")).ToList(); + return Result>.ReSuccess(list.Where(w => w.Product_Total > 0 && w.Product_Valid_Num > 0).ToList()); + } + #region 基础函数 + public async Task> GetStr(string urlStr, T data) + { + var res = await Login(); + if (!res.IsSuccess) return res; + + LxSignInfo lxSign = new LxSignInfo(); + + lxSign.access_token = res.Data; + lxSign.app_key = _option.AppId; + lxSign.timestamp = DateTime.Now.DateTimeToTimeStamp().ToString(); + + #region ASCII排序 + Dictionary testParamDics = new Dictionary(); + var ssi = GetEntityPropertyToDic(testParamDics, lxSign.GetType().GetProperties(), lxSign);//把签名参数实体转化为键值对 + var ssdata = GetEntityPropertyToDic(testParamDics, data.GetType().GetProperties(), data);//把参数实体转化为键值对 + + // List> list = new List>(); + Dictionary list = new Dictionary(); + //string[] arrays = new string[data]; + + foreach (var item in typeof(LxSignInfo).GetProperties()) + { + //KeyValueInfo keys = new KeyValueInfo(); + //keys.Key = item.Name; + //keys.Value = ssi[$"{item.Name}"].ToString(); + //list.Add(keys); + list.Add(item.Name, ssi[$"{item.Name}"].ToString()); + } + + foreach (var item in typeof(T).GetProperties()) + { + //KeyValueInfo keys = new KeyValueInfo(); + //keys.Key = item.Name; + //keys.Value = JsonConvert.SerializeObject(ssdata[$"{item.Name}"]); + + //if (ssdata[$"{item.Name}"] == null) { list.Add(keys); continue; } + //if (string.IsNullOrEmpty(ssdata[$"{item.Name}"].ToString())) + //{ + // continue;//跳过值为NULL的 + //} + + if (ssdata[$"{item.Name}"] == null) { list.Add(item.Name, JsonConvert.SerializeObject(ssdata[$"{item.Name}"])); continue; } + if (string.IsNullOrEmpty(ssdata[$"{item.Name}"].ToString())) + { + continue;//跳过值为NULL的 + } + + list.Add(item.Name, JsonConvert.SerializeObject(ssdata[$"{item.Name}"])); + } + + string[] arrays = new string[list.Count]; + + int i = 0; + foreach (var item in list) + { + arrays[i] = item.Key; + + i++; + } + + Array.Sort(arrays, string.CompareOrdinal); //ASCII排序 + + string sig = null; + int j = 0; + foreach (var item in arrays) + { + string key = list.Where(a => a.Key == item).ToList()[0].Key.ToString(); + string value = list.Where(a => a.Key == item).ToList()[0].Value.ToString(); + + #region 清除嵌套外的字段值的双引号 + if (value.IndexOf("{", StringComparison.OrdinalIgnoreCase) > -1) { } + else + { + value = Regex.Replace(value, @"[\""]+", "");//去掉双引号 + } + #endregion + + if (j == i - 1) + { + sig += $"{key}={value}"; + } + else + { + sig += $"{key}={value}&"; + } + + j++; + } + #endregion + + #region MD5加密转大写+AES/ECB/PKCS5PADDING加密 + //sig = Regex.Replace(sig, @"[\""]+", "");//去掉双引号 + var md5 = MD5Encrypt(sig, false); + var signs = Encrypt(md5, lxSign.app_key); + #endregion + + #region 字符转义 + + signs = WebUtility.UrlEncode(signs); + #endregion + + #region 形成签名地址 + var url = _option.Url + urlStr; + var ret = $"{url}?app_key={lxSign.app_key}&access_token={lxSign.access_token}×tamp={lxSign.timestamp}&sign={signs}"; + return Result.ReSuccess(ret); + #endregion + } + + /// + /// 32位MD5加密 + /// + /// 要加密字符串 + /// 是否以小写方式返回 + /// + public static string MD5Encrypt(string strText, bool IsLower = true) + { + MD5 md5 = new MD5CryptoServiceProvider(); + byte[] bytes = System.Text.Encoding.UTF8.GetBytes(strText); + bytes = md5.ComputeHash(bytes); + md5.Clear(); + + string ret = ""; + for (int i = 0; i < bytes.Length; i++) + { + ret += Convert.ToString(bytes[i], 16).PadLeft(2, '0'); + + } + if (IsLower == false) { return ret.PadLeft(32, '0').ToUpper(); } + return ret.PadLeft(32, '0'); + } + /// + /// AES加密 + /// + /// 需要加密的字符串 + /// 32位密钥 + ///向量（默认偏移量） + /// 加密后的字符串 + public static string Encrypt(string str, string key) + { + try + { + + Byte[] keyArray = System.Text.Encoding.UTF8.GetBytes(key); + Byte[] toEncryptArray = System.Text.Encoding.UTF8.GetBytes(str); + var rijndael = new System.Security.Cryptography.RijndaelManaged(); + rijndael.Key = keyArray; + rijndael.Mode = System.Security.Cryptography.CipherMode.ECB; + rijndael.Padding = System.Security.Cryptography.PaddingMode.PKCS7; + rijndael.IV = System.Text.Encoding.UTF8.GetBytes(key); + System.Security.Cryptography.ICryptoTransform cTransform = rijndael.CreateEncryptor(); + Byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length); + return Convert.ToBase64String(resultArray, 0, resultArray.Length); + + } + catch (Exception ex) + { + //YellowJLog("调用AES加密方法异常，异常原因：" + ex.Message, "加密异常"); + return ""; + } + } + + /// + /// 类实体的属性与值转化成键值对形式 + /// + /// + /// + /// + /// + public static Dictionary GetEntityPropertyToDic(Dictionary inParam, PropertyInfo[] infos, T Entity) + { + foreach (var info in infos) + { + var itemTpe = info.PropertyType; + //实体中有嵌套类的处理 + if (itemTpe.IsClass && !itemTpe.Name.Equals("String", StringComparison.OrdinalIgnoreCase)) + { + //if (info.GetValue(Entity) == null) continue; + //GetEntityPropertyToDic(inParam, itemTpe.GetProperties(), info.GetValue(Entity)); + //inParam.Add(info.Name, info.GetValue(JsonConvert.SerializeObject(Entity), null)); + inParam.Add(info.Name, info.GetValue(Entity, null)); + } + else + { + + inParam.Add(info.Name, info.GetValue(Entity, null)); + //sig = Regex.Replace(sig, @"[\""]+", "");//去掉双引号 + } + } + + return inParam; + } + + + #endregion + } + public class LxSignInfo + { + public string access_token { get; set; } + public string app_key { get; set; } + public string timestamp { get; set; } + } +} diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 76440189..80a2220e 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -262,14 +262,14 @@ namespace WMS.Web.Domain.Services int subStockId = subs.Data.FirstOrDefault(w => w.OrgCode.Equals(d.OrgCode) && w.StockCode.Equals(d.Erp_SubStockCode))?.Id ?? 0; requestInventory.Add((d.MaterialNumber, d.OrgCode, d.StockCode, subStockId)); }; - var res_s = await sc_erpService.BillQueryForInventory(requestInventory); - if (!res_s.IsSuccess) - { - entity.Sync(false, res_s.Message, SyncStatus.Fail, ""); - await sc_takeStockRepositories.Edit(entity, true); - _logger.LogInformation($"及时库存获取异常->错误:{res_s.Message} 数据: {JsonConvert.SerializeObject(entity)}"); - return Result.ReFailure(res_s.Message, res_s.Status); - } + //var res_s = await sc_erpService.BillQueryForInventory(requestInventory); + //if (!res_s.IsSuccess) + //{ + // entity.Sync(false, res_s.Message, SyncStatus.Fail, ""); + // await sc_takeStockRepositories.Edit(entity, true); + // _logger.LogInformation($"及时库存获取异常->错误:{res_s.Message} 数据: {JsonConvert.SerializeObject(entity)}"); + // return Result.ReFailure(res_s.Message, res_s.Status); + //} //组装dto #region 组装dto //子仓库 ORICO_JD：1000008 GD：1000005 HD：1000007 AD：1000004 @@ -278,9 +278,10 @@ namespace WMS.Web.Domain.Services { int subStockId = subs.Data.FirstOrDefault(w => w.OrgCode.Equals(d.OrgCode) && w.StockCode.Equals(d.Erp_SubStockCode))?.Id ?? 0; var number = d.MaterialNumber; - var erpInventory = res_s.Data.FirstOrDefault(f => f.MaterialNumber == number && f.StockCode == d.StockCode - && f.OrgCode == d.OrgCode && f.Erp_SubStockId == subStockId); - decimal qty = erpInventory?.Qty ?? 0; + //var erpInventory = res_s.Data.FirstOrDefault(f => f.MaterialNumber == number && f.StockCode == d.StockCode + //&& f.OrgCode == d.OrgCode && f.Erp_SubStockId == subStockId); + //decimal qty = erpInventory?.Qty ?? 0; + decimal qty = 0; var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialNumber); detils.Add(new ErpTakeStockDetailsSaveDto() { diff --git a/src/WMS.Web.Domain/Values/FileDownLoadOrderType.cs b/src/WMS.Web.Domain/Values/FileDownLoadOrderType.cs index 33b56314..cfb78d15 100644 --- a/src/WMS.Web.Domain/Values/FileDownLoadOrderType.cs +++ b/src/WMS.Web.Domain/Values/FileDownLoadOrderType.cs @@ -70,5 +70,11 @@ namespace WMS.Web.Domain.Values /// [EnumRemark("出库信息")] OutStockTaskInfo = 12, + /// + /// 成品即时库存 + /// + [EnumRemark("成品即时库存")] + ProductInventory = 13, + } } diff --git a/src/WMS.Web.Domain/Values/ProductInventoryType.cs b/src/WMS.Web.Domain/Values/ProductInventoryType.cs new file mode 100644 index 00000000..6a355305 --- /dev/null +++ b/src/WMS.Web.Domain/Values/ProductInventoryType.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Text; +using WMS.Web.Core; + +namespace WMS.Web.Domain.Values +{ + /// + /// 成品即时库存类型 + /// + public enum ProductInventoryType + { + /// + /// 金蝶 + /// + [EnumRemark("金蝶")] + JinDie = 0, + /// + /// 领星 + /// + [EnumRemark("领星")] + LingXing = 1, + /// + /// 聚水潭 + /// + [EnumRemark("聚水潭")] + JushuiTan = 2, + } +} diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs index 02548f64..9c2e5618 100644 --- a/src/WMS.Web.Domain/Values/ResultCodes.cs +++ b/src/WMS.Web.Domain/Values/ResultCodes.cs @@ -97,6 +97,11 @@ namespace WMS.Web.Domain.Values public static ValueTuple SubscribeNotificationNoData = (700001, "订阅通知信息不存在"); public static ValueTuple GetBarCodeSerialNumberError = (800001, "获取序列码异常"); + + public static ValueTuple LingXingTokenError = (810001, "获取领星授权失败"); + public static ValueTuple LingXingUrlError = (810002, "拼接领星请求参数失败"); + public static ValueTuple LingXingDataError = (810003, "请求领星数据失败"); + public static ValueTuple JuShuiTanDataError = (810004, "请求聚水潭数据失败"); public static ValueTuple SyncSuccessError = (800002, "单据已经同步成功"); } } diff --git a/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs b/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs index c68861fd..04a0d128 100644 --- a/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs +++ b/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs @@ -211,5 +211,9 @@ namespace WMS.Web.Domain.Values.Single /// 获取仓位详情：根据仓位Codes集合和公司ID /// GetWmsSubWarehouseByCodesAndCompany = 48, + /// + /// 获取仓库:：根据总公司标记获取仓库 + /// + GetWmsWarehouseByHeadOfficeAndNameAndCompany = 49, } } diff --git a/src/WMS.Web.Repositories/BasicsRepositories.cs b/src/WMS.Web.Repositories/BasicsRepositories.cs index 80212a37..8d48f1cd 100644 --- a/src/WMS.Web.Repositories/BasicsRepositories.cs +++ b/src/WMS.Web.Repositories/BasicsRepositories.cs @@ -135,7 +135,7 @@ namespace WMS.Web.Repositories public async Task> GetUcStockAsync(string systemCode, string name, int companyId) { var result = await _singleDataService.GetSysConfigData, SystemCodeRequest> - (new SystemCodeRequest(systemCode,name, companyId), + (new SystemCodeRequest(systemCode, name, companyId), SysConfigAction.GetWmsWarehouseBySystemCodeAndNameAndCompany); if (!result.Success) return null; @@ -168,7 +168,42 @@ namespace WMS.Web.Repositories } return true; } + /// + /// 根据总公司获取仓位 + /// + /// + /// + /// + public async Task> GetUcStockByHeadOfficeAsync(string name, int companyId) + { + var result = await _singleDataService.GetSysConfigData, SystemCodeRequest> + (new SystemCodeRequest("", name, companyId), + SysConfigAction.GetWmsWarehouseByHeadOfficeAndNameAndCompany); + if (!result.Success) + return null; + return result.Data.Where(w => w.ManagementSystem != null).ToList(); - + //List list = new List(); + //list.Add(new UcStockHeadOfficeResponse() + //{ + // ManagementSystem = 1, + // Code = "CK001", + // ErpOrgCode = "101" + //}); + //list.Add(new UcStockHeadOfficeResponse() + //{ + // ManagementSystem = 1, + // Code = "AD", + // ErpOrgCode = "101" + //}); + //list.Add(new UcStockHeadOfficeResponse() + //{ + // ManagementSystem = 2, + // Code = "CK002", + // ErpOrgCode = "101", + // WarehouseCodeOfJushuitan = "ORICO_JD" + //}); + //return list; + } } } diff --git a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs index bfdfd3f1..5ffd3a6c 100644 --- a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs +++ b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs @@ -414,8 +414,16 @@ namespace WMS.Web.Repositories.Configuration .SetValueComparer(valueComparer); ; }); + //成品即时库存 + builder.Entity(ent => + { + ent.ToTable("t_wms_product_inventory"); + ent.HasKey(x => x.Id); + }); + base.OnModelCreating(builder); } + public DbSet ProductInventory { get; set; } public DbSet Materials { get; set; } public DbSet BoxMarkBillNo { get; set; } public DbSet BoxMark { get; set; } diff --git a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs index bde012a3..0279e877 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs @@ -182,7 +182,10 @@ namespace WMS.Web.Repositories.DependencyInjection Services.Configure(Configuration.GetSection("EmailOptions")); Services.AddOptions(); Services.Configure(Configuration.GetSection("SmsOptions")); - + Services.AddOptions(); + Services.Configure(Configuration.GetSection("LingXingOptions")); + Services.AddOptions(); + Services.Configure(Configuration.GetSection("JuShuiTanOptions")); } @@ -200,6 +203,7 @@ namespace WMS.Web.Repositories.DependencyInjection Services.AddTransient();//添加注入定时服务 Services.AddTransient();//添加注入定时服务 //Services.AddTransient();//添加注入定时服务 + Services.AddTransient();//添加注入定时服务 Services.AddQuartz(q => { q.UsePersistentStore(x => @@ -298,6 +302,18 @@ namespace WMS.Web.Repositories.DependencyInjection //.WithCronSchedule(CronScheduleBuilder.DailyAtHourAndMinute(options.JobStartHour[5], options.JobStartMinute[5])) .WithDescription("ErpDeleteQuartzJobTriggerDecs")); #endregion + + #region 成品即时库存 + var jobKey_Inventory = new JobKey("InventoryQuartzJob", options.QuartzJobValue); + q.AddJob(jobKey_Inventory, j => j.WithDescription("InventoryQuartzJob")); + q.AddTrigger(t => t + .WithIdentity("InventoryQuartzJobTrigger") + .ForJob(jobKey_Inventory) + .StartNow() + .WithCronSchedule(options.JobStartProductInventory) + //.WithCronSchedule(CronScheduleBuilder.DailyAtHourAndMinute(options.JobStartHour[5], options.JobStartMinute[5])) + .WithDescription("InventoryQuartzJobTriggerDecs")); + #endregion }); //.net core核心托管-添加Quartz服务器 Services.AddQuartzServer(options => @@ -345,8 +361,10 @@ namespace WMS.Web.Repositories.DependencyInjection Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); - - + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); } } } diff --git a/src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs index 00475c06..27fdecb2 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs @@ -8,6 +8,7 @@ using WMS.Web.Core.Dto.Inventory; using WMS.Web.Core.Dto.MoveBoxRecord; using WMS.Web.Core.Dto.OutStock; using WMS.Web.Core.Dto.OutStockTask; +using WMS.Web.Core.Dto.ProductInventory; using WMS.Web.Core.Dto.TakeStock; using WMS.Web.Domain.Infrastructure; using WMS.Web.Repositories; @@ -57,6 +58,7 @@ namespace Microsoft.Extensions.DependencyInjection services.AddTransient, InventoryInOutDetailsRepositories>(); services.AddTransient, BoxInventoryRepositories>(); services.AddTransient, BackRecordRepositories>(); + services.AddTransient, ProductInventoryRepositories>(); #endregion @@ -81,7 +83,7 @@ namespace Microsoft.Extensions.DependencyInjection services.AddTransient(); services.AddTransient(); - + services.AddTransient(); } } } diff --git a/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs b/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs index 4304d74c..e387b15d 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs @@ -49,7 +49,7 @@ namespace WMS.Web.Repositories.DependencyInjection string[] pathlist = path.Split('/'); bool isLogin = pathlist.Where(x => x == "login" || x.ToLower() == "heart" || x.ToLower() == "test" || x.ToLower() == "serialnumber" || x.ToLower() == "barcode" || - x.ToLower() == "swagger").Any(); + x.ToLower() == "swagger" || x.ToLower() == "productinventory").Any(); if (isLogin) { context.Response.StatusCode = 200; diff --git a/src/WMS.Web.Repositories/ProductInventoryRepositories.cs b/src/WMS.Web.Repositories/ProductInventoryRepositories.cs new file mode 100644 index 00000000..45937649 --- /dev/null +++ b/src/WMS.Web.Repositories/ProductInventoryRepositories.cs @@ -0,0 +1,230 @@ +using AutoMapper; +using Microsoft.EntityFrameworkCore; +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.Erp.Customer; +using WMS.Web.Core.Dto.Erp.Org; +using WMS.Web.Core.Dto.Erp; +using WMS.Web.Core.Dto.ProductInventory; +using WMS.Web.Domain.Entitys; +using WMS.Web.Domain.Infrastructure; +using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Values; +using WMS.Web.Repositories.Configuration; +using WMS.Web.Core.Dto.OutStockTask; +using WMS.Web.Domain.Values.Single; +using WMS.Web.Core; +using NPOI.SS.Formula.Functions; +using WMS.Web.Domain.Mappers; +using WMS.Web.Core.Help; +using WMS.Web.Core.Dto.SingleData; + +namespace WMS.Web.Repositories +{ + /// + /// 成品仓即时库存 + /// + public class ProductInventoryRepositories : IAllFielRepositories, IProductInventoryRepositories + { + private readonly IMapper _mapper; + private readonly IServiceProvider _serviceProvider; + private readonly ILoginRepositories _loginRepositories; + private readonly IBasicsRepositories _basicsRepositories; + private readonly RepositoryDbContext _context; + private readonly IErpService _erpService; + private readonly ISingleDataService _singleDataService; + private readonly IErpBasicDataExtendService _erpBasicDataExtendService; + + public ProductInventoryRepositories(RepositoryDbContext context, + IMapper mapper, + IErpService erpService, + IBasicsRepositories basicsRepositories, + ILoginRepositories loginRepositories, + IServiceProvider serviceProvider, + ISingleDataService singleDataService, + IErpBasicDataExtendService erpBasicDataExtendService) + { + _erpService = erpService; + _context = context; + _mapper = mapper; + _basicsRepositories = basicsRepositories; + _serviceProvider = serviceProvider; + _loginRepositories = loginRepositories; + _singleDataService = singleDataService; + _erpBasicDataExtendService = erpBasicDataExtendService; + } + + public async Task AddRange(List entitys, bool isTransaction = true) + { + IDbContextTransaction _transaction = null; + if (isTransaction) + _transaction = _context.Database.BeginTransaction(); + try + { + if (entitys != null && entitys.Count != 0) + { + await _context.ProductInventory.AddRangeAsync(entitys); + await _context.SaveChangesAsync(); + } + if (_transaction != null) + _transaction.Commit(); + return true; + } + catch + { + if (_transaction != null) + _transaction.Rollback(); + return false; + } + } + + public async Task Delete(ProductInventoryType type, bool isTransaction = true) + { + IDbContextTransaction _transaction = null; + if (isTransaction) + _transaction = _context.Database.BeginTransaction(); + try + { + var list = await _context.ProductInventory.Where(w => w.Type == type).ToListAsync(); + _context.RemoveRange(list); + + if (_transaction != null) + _transaction.Commit(); + return true; + } + catch + { + if (_transaction != null) + _transaction.Rollback(); + return false; + } + } + + public async Task<(List list, int total, List details)> GetListAsync(ProductInventoryQueryRequest dto, int companyId = 0) + { + //因为要开放给别的系统用 固定死 + companyId = 1; + //if (companyId == 0) + // companyId = _loginRepositories.CompanyId; + #region erp基础资料 + List mNumber = new List(); + var materials_result = await _erpService.BillQueryForMaterial(); + List materials = new List(); + if (materials_result.IsSuccess) + materials = materials_result.Data.ToList(); + //物料集合；模糊查询后的物料集合 + if (!string.IsNullOrEmpty(dto.MaterialNumber)) + { + if (materials != null) + mNumber = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber) + || w.MaterialName.Contains(dto.MaterialNumber) + || w.Specifications.Contains(dto.MaterialNumber) + ).Select(s => s.MaterialNumber).ToList(); + } + + //取组织 + var org_result = await _erpService.BillQueryForOrg(); + List orgs = new List(); + if (org_result.IsSuccess) + orgs = org_result.Data.ToList(); + + var p_stocks = await _basicsRepositories.GetUcStockByHeadOfficeAsync("", 1); + #endregion + + var query = _context.ProductInventory + .OrderByDescending(o => o.Id) + .Where(adv => 1 == 1 && (adv.Qty > 0 || adv.BeforeQty > 0)); + + if (!string.IsNullOrEmpty(dto.MaterialNumber)) + query = query.Where(w => mNumber.Contains(w.MaterialNumber)); + if (!string.IsNullOrEmpty(dto.Customer)) + query = query.Where(w => dto.Customer.Contains(w.Customer)); + if (!string.IsNullOrEmpty(dto.StockCode)) + { + var split = dto.StockCode.Split("_$"); + query = query.Where(w => w.StockCode == split[0] && w.OrgCode == split[1]); + } + + //组装 + int total = await query.CountAsync(); + decimal qty = await query.SumAsync(s => s.Qty); + decimal beforeQty = await query.SumAsync(s => s.BeforeQty); + List details = new List(); + details.Add(qty); + details.Add(beforeQty); + var list = await query.Select(s => new ProductInventoryQueryResponse() + { + #region dto组装 + Id = s.Id, + Type = s.Type.GetRemark(), + Stock = _erpBasicDataExtendService.GetProductInventoryStockName(p_stocks, s.StockCode), + Org = _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode), + MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber), + MaterialNumber = s.MaterialNumber, + Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber), + Batch = s.Batch, + Customer = s.Customer, + Qty = s.Qty, + BeforeQty = s.BeforeQty + #endregion + + }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); + return (list, total, details); + } + + public async Task<(object obj, int total)> GetListField(ProductInventoryQueryRequest dto, int companyId) + { + var (list, count, qty) = await GetListAsync(dto, companyId); + return (list, count); + } + /// + /// 批量修改 + /// + /// + /// + /// + public async Task EditEntityList(List entitys, bool isTransaction = true) + { + IDbContextTransaction _transaction = null; + if (isTransaction) + _transaction = _context.Database.BeginTransaction(); + try + { + List list = entitys.Select(s => s.Id).ToList(); + + var res = await _context.ProductInventory + .Where(f => list.Contains(f.Id)).ToListAsync(); + + _mapper.ToMapList(entitys, res); + await _context.SaveChangesAsync(); + if (_transaction != null) + _transaction.Commit(); + } + catch (Exception ex) + { + if (_transaction != null) + _transaction.Rollback(); + return false; + } + return true; + + } + /// + /// 获取数据 + /// + /// + /// + public async Task> GetEntityList(ProductInventoryType type) + { + var res = await _context.ProductInventory + .Where(f => f.Type == type) + .ToListAsync(); + + return res.Clone(); + } + } +}