diff --git a/src/WMS.Web.Api/Controllers/OutStockController.cs b/src/WMS.Web.Api/Controllers/OutStockController.cs index 0fd36429..15a41af3 100644 --- a/src/WMS.Web.Api/Controllers/OutStockController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockController.cs @@ -122,13 +122,14 @@ namespace WMS.Web.Api.Controllers /// [HttpPost] [Route("Sync")] - public async Task Sync(OperateRequest dto) + public Task Sync(OperateRequest dto) { - var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); - if (loginInfo == null || loginInfo.UserInfo == null) - return Result.ReFailure(ResultCodes.Token_Invalid_Error); + //var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + //if (loginInfo == null || loginInfo.UserInfo == null) + // return Result.ReFailure(ResultCodes.Token_Invalid_Error); - return await _outStockService.Sync(dto, loginInfo); + //return await _outStockService.Sync(dto, loginInfo); + return Task.FromResult(Result.ReSuccess()); } } } diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs index ae3ea180..c6b6ffab 100644 --- a/src/WMS.Web.Domain/Entitys/OutStock.cs +++ b/src/WMS.Web.Domain/Entitys/OutStock.cs @@ -115,19 +115,19 @@ namespace WMS.Web.Domain.Entitys this.StockCode = task.StockCode; this.CreatorId = creatorId; this.CreateTime = DateTime.Now; - if (task.Type == OutStockType.Sal) - { - //只有销售出库才需要同步金蝶 - this.SuccessSync = SyncStatus.SyncIng; - var erpd = this.Details.SelectMany(s => s.ErpDetails).ToList(); - erpd.ForEach(f => f.SuccessSync = SyncStatus.SyncIng); - } - else - { - this.SuccessSync = SyncStatus.Success; - var erpd = this.Details.SelectMany(s => s.ErpDetails).ToList(); - erpd.ForEach(f => f.SuccessSync = SyncStatus.Success); - } + //if (task.Type == OutStockType.Sal) + //{ + // //只有销售出库才需要同步金蝶 + // this.SuccessSync = SyncStatus.SyncIng; + // var erpd = this.Details.SelectMany(s => s.ErpDetails).ToList(); + // erpd.ForEach(f => f.SuccessSync = SyncStatus.SyncIng); + //} + //else + //{ + this.SuccessSync = SyncStatus.Success; + var erpd = this.Details.SelectMany(s => s.ErpDetails).ToList(); + erpd.ForEach(f => f.SuccessSync = SyncStatus.Success); + //} } /// /// 同步金蝶(成功) diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs index 1d60d8bf..19cc79d9 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs @@ -99,6 +99,11 @@ namespace WMS.Web.Domain.IService.Public /// Task> BillQueryForMisDeliveryOutStock(List sourceBillNos = null, DateTime? beginTime = null); /// + /// erp:单据查询-销售出库单 + /// + /// + Task> BillQueryForSalOutStock(List sourceBillNos = null, DateTime? beginTime = null); + /// /// erp:查询销售出库单信息 /// /// diff --git a/src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs b/src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs index f52995e3..e6a8cf98 100644 --- a/src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs +++ b/src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs @@ -40,6 +40,11 @@ namespace WMS.Web.Domain.IService.Public /// /// Task BillQueryForMisDeliveryOutStock(bool isTransaction, List sourceBillNos = null, DateTime? beginTime = null); + /// + /// 采购发货通知单 + /// + /// + Task BillQueryForSalOutStock(bool isTransaction, List sourceBillNos = null, DateTime? beginTime = null); //出库任务作废 Task Repeal(OperateRequest dto, LoginInDto loginInfo); //出库任务作废 diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs index 2f08b098..e25d90e9 100644 --- a/src/WMS.Web.Domain/Services/OutStockService.cs +++ b/src/WMS.Web.Domain/Services/OutStockService.cs @@ -206,13 +206,13 @@ namespace WMS.Web.Domain.Services if (!res_Rollback.IsSuccess) return res_Rollback; if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); - - if (entity.Type == OutStockType.Sal) - { - OperateRequest oRequest = new OperateRequest(); - oRequest.Ids.Add(entity.Id); - await Sync(oRequest, loginInfo, false); - } + //取消同步金蝶 + //if (entity.Type == OutStockType.Sal) + //{ + // OperateRequest oRequest = new OperateRequest(); + // oRequest.Ids.Add(entity.Id); + // await Sync(oRequest, loginInfo, false); + //} return Result.ReSuccess(); } diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index c19a34e0..c579662d 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -266,6 +266,21 @@ namespace WMS.Web.Domain.Services return await this.SsynDate(erp_result.Data.ToList(), isTransaction); } /// + /// 销售出库单 + /// + /// + /// + /// + /// + public async Task BillQueryForSalOutStock(bool isTransaction, List sourceBillNos = null, DateTime? beginTime = null) + { + var erp_result = await _erpService.BillQueryForSalOutStock(sourceBillNos, beginTime); + if (!erp_result.IsSuccess) + return Result.ReFailure(erp_result.Message, erp_result.Status); + + return await this.SsynDate(erp_result.Data.ToList(), isTransaction); + } + /// /// 同步金蝶数据 不传源订单号则更新所有 /// /// @@ -285,7 +300,7 @@ namespace WMS.Web.Domain.Services if (DateTime.Now > Convert.ToDateTime("2024-03-04 00:00:00")) begin = DateTime.Now.AddDays(-3);//默认拉去三天以内的数据 //更新时间范围内所有 - result = await BillQueryForDeliveryNoticeOutStock(false, null, begin); + result = await BillQueryForSalOutStock(false, null, begin); if (!result.IsSuccess) isRollback = true; result = await BillQueryForTransferDirectOutStock(false, null, begin); if (!result.IsSuccess) isRollback = true; @@ -309,7 +324,7 @@ namespace WMS.Web.Domain.Services } //根据指定单号更新 - List DeliveryNotice_Nos = new List(); + List SalOutStock_Nos = new List(); List TransferDirect_Nos = new List(); List TransferOut_Nos = new List(); List AssembledApp_Nos = new List(); @@ -318,7 +333,7 @@ namespace WMS.Web.Domain.Services foreach (var entity in taskList) { if (entity.Type == OutStockType.Sal) - DeliveryNotice_Nos.AddRange(entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.SourceBillNo)); + SalOutStock_Nos.AddRange(entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.SourceBillNo)); else if (entity.Type == OutStockType.Stkdirecttransfers) TransferDirect_Nos.AddRange(entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.SourceBillNo)); else if (entity.Type == OutStockType.StktransferInst) @@ -329,9 +344,9 @@ namespace WMS.Web.Domain.Services MisDeliveryOut_Nos.AddRange(entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.SourceBillNo)); } - if (DeliveryNotice_Nos.Count() > 0) + if (SalOutStock_Nos.Count() > 0) { - result = await BillQueryForDeliveryNoticeOutStock(false, DeliveryNotice_Nos); + result = await BillQueryForSalOutStock(false, SalOutStock_Nos); if (!result.IsSuccess) isRollback = true; } if (TransferDirect_Nos.Count() > 0) @@ -361,5 +376,6 @@ namespace WMS.Web.Domain.Services return Result.ReFailure(ResultCodes.DateWriteError); return Result.ReSuccess(); } + } } diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 2a01fc80..7977d7bd 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -2136,6 +2136,105 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(ResultCodes.Erp_BillQuery_Error); } } + /// + /// 销售出库单 + /// + /// + /// + /// + public async Task> BillQueryForSalOutStock(List sourceBillNos = null, DateTime? beginTime = null) + { + try + { + + var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId); + if (stocks.Count == 0) + return ResultList.ReFailure(ResultCodes.ErpStockNoData); + //var stocks_codes = string.Join(",",stocks.Select(x => x.Id)); + var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); + var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'")); + + //1.先登录金蝶-拿到token + var token_result = await this.Init(); + if (!token_result.IsSuccess) + return ResultList.ReFailure(token_result); + + //2.时间条件：可能还有其它条件 + + var beginStr = DateTime.Now.AddYears(-30).ToString("yyyy-MM-dd HH:mm:ss"); + if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss"); + var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + //3.获取金蝶采购订单：拼接参数和条件 + var query = new ErpBillQueryDto(token_result.Data); + var param = new ErpBillQueryParamDto(FormIdParam.SAL_DELIVERYNOTICE.ToString()); + param.FieldKeys = "FBillNo,FSoorDerno,FStockOrgId,FCustomerID,FMaterialID,FStockID.FNumber,FStockLocID,FSALUNITQTY,F_ENTRYREMARKS,FCreateDate,FEntity_FENTRYID,FStockOrgId.FNumber";//FEntryID + param.Limit = 10000; + //查询条件：备注其中的条件值以金蝶的值为准！！！ + //1.创建时间在两天前和当天时间之间 + //2.审核状态：已审核 + //4.日期>=系统上线之日 + //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 + //6.物料 物料属性=费用或资产的排除 不拉取 + param.FilterString = "FDocumentStatus='C' and FMaterialID.FERPCLSID not in (10,11)"; + //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; + //param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")"; + for (int i = 0; i < stocks.Count(); i++) + { + if (i == 0) + { + param.FilterString += " and ("; + param.FilterString += $"(FStockID.FNumber='{stocks[i].Code}' and FStockOrgId.FNumber='{stocks[i].ErpOrgCode}')"; + } + else + param.FilterString += $" or (FStockID.FNumber='{stocks[i].Code}' and FStockOrgId.FNumber='{stocks[i].ErpOrgCode}')"; + if (i == stocks.Count() - 1) param.FilterString += ")"; + + } + + //根据原订单号查询 + if (sourceBillNos != null && sourceBillNos.Count() > 0) + { + var srt_b = string.Join(",", sourceBillNos.Select(x => $"'{x}'")); + param.FilterString += " and FBillNo in (" + srt_b + ")"; + } + else//没有指定单号搜索 则带时间范围 + param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; + + query.Data = JsonConvert.SerializeObject(param); + var json = JsonConvert.SerializeObject(query); + + //4.请求查询接口 + var result_json = await _client.ExecuteBillQueryAsync(json); + var result = JsonConvert.DeserializeObject>>(result_json); + + //5.返回数据的组装 + var erp_list = new List(); + foreach (var item in result) + { + var lis = new ErpDeliveryNoticeOutStockResultDto(); + lis.SourceBillNo = item[0]; + lis.SaleBillNo = item[1]; + lis.DeliveryOrgId = Convert.ToInt32(item[2]); + lis.ReceiptCustomerId = Convert.ToInt32(item[3]); + lis.MaterialId = Convert.ToInt32(item[4]); + lis.StockCode = item[5]; + lis.SubStockId = Convert.ToInt32(item[6]); + lis.AccruedQty = Convert.ToDecimal(item[7]); + lis.Remark = item[8]; + lis.CreateTime = Convert.ToDateTime(item[9]); + lis.Type = (int)OutStockType.Sal; + lis.Erp_DetailId = Convert.ToInt32(item[10]); + lis.OrgCode = item[11]; + erp_list.Add(lis); + } + return ResultList.ReSuccess(erp_list); + } + catch (Exception ex) + { + return ResultList.ReFailure(ResultCodes.Erp_BillQuery_Error); + } + } + public async Task> BillQueryForSalOutStock(string id) { @@ -2286,6 +2385,7 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(ResultCodes.Erp_Inventory_Error); } } + #endregion }