diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 8028e8d7..966d46d7 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -172,9 +172,9 @@ namespace WMS.Web.Domain.Services.Public if (!token_result.IsSuccess) return ResultList.ReFailure(token_result); - //2.时间条件:可能还有其它条件 - var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); - var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + ////2.时间条件:可能还有其它条件 + //var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + //var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶采购订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.PUR_PurchaseOrder.ToString()); @@ -221,7 +221,14 @@ namespace WMS.Web.Domain.Services.Public }//注意:当有单据编号的查询的时候,时间条件去掉;不然就查不到数据了 else { - param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'"; + //2.时间条件:可能还有其它条件 + var qidongshij = Convert.ToDateTime("2024-03-01 00:00:00");//正式环境 从3月1好开始 + if (qidongshij <= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"))) + { + var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'"; + } } query.Data = JsonConvert.SerializeObject(param); @@ -282,7 +289,8 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件:可能还有其它条件 - var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + //var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + var beginTime= Convert.ToDateTime("2024-03-01 00:00:00");//正式环境 从3月1好开始 var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶其他入库订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); @@ -386,7 +394,8 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件:可能还有其它条件 - var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + //var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + var beginTime = Convert.ToDateTime("2024-03-01 00:00:00");//正式环境 从3月1好开始 var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶直接调拨入库订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); @@ -491,7 +500,8 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件:可能还有其它条件 - var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + //var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + var beginTime = Convert.ToDateTime("2024-03-01 00:00:00");//正式环境 从3月1好开始 var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶分步式入库订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); @@ -596,7 +606,8 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件:可能还有其它条件 - var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + //var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + var beginTime = Convert.ToDateTime("2024-03-01 00:00:00");//正式环境 从3月1好开始 var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶分步式入库订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); @@ -701,7 +712,8 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(token_result); //2.时间条件:可能还有其它条件 - var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + //var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00"); + var beginTime = Convert.ToDateTime("2024-03-01 00:00:00");//正式环境 从3月1好开始 var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //3.获取金蝶分步式入库订单:拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data);