diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 84ba3309..3788cb46 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 8a96d7f8..4b458a1c 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1633,7 +1633,7 @@ namespace WMS.Web.Domain.Services.Public var srt_b = string.Join(",", sourceBillNos.Select(x => $"'{x}'")); param.FilterString += " and FBillNo in (" + srt_b + ")"; } - else//没有指定单号搜索 则带时间范围 + else//没有指定单号搜索 则带时间范围 FApproveDate param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); @@ -1728,7 +1728,7 @@ namespace WMS.Web.Domain.Services.Public var srt_b = string.Join(",", sourceBillNos.Select(x => $"'{x}'")); param.FilterString += " and FBillNo in (" + srt_b + ")"; } - else//没有指定单号搜索 则带时间范围 + else//没有指定单号搜索 则带时间范围 FApproveDate param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -1822,7 +1822,7 @@ namespace WMS.Web.Domain.Services.Public var srt_b = string.Join(",", sourceBillNos.Select(x => $"'{x}'")); param.FilterString += " and FBillNo in (" + srt_b + ")"; } - else//没有指定单号搜索 则带时间范围 + else//没有指定单号搜索 则带时间范围 FApproveDate param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -1916,7 +1916,7 @@ namespace WMS.Web.Domain.Services.Public var srt_b = string.Join(",", sourceBillNos.Select(x => $"'{x}'")); param.FilterString += " and FBillNo in (" + srt_b + ")"; } - else//没有指定单号搜索 则带时间范围 + else//没有指定单号搜索 则带时间范围 FAPPROVEDATE param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -2010,7 +2010,7 @@ namespace WMS.Web.Domain.Services.Public var srt_b = string.Join(",", sourceBillNos.Select(x => $"'{x}'")); param.FilterString += " and FBillNo in (" + srt_b + ")"; } - else//没有指定单号搜索 则带时间范围 + else//没有指定单号搜索 则带时间范围 FApproveDate param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -2106,7 +2106,7 @@ namespace WMS.Web.Domain.Services.Public var srt_b = string.Join(",", sourceBillNos.Select(x => $"'{x}'")); param.FilterString += " and FBillNo in (" + srt_b + ")"; } - else//没有指定单号搜索 则带时间范围 + else//没有指定单号搜索 则带时间范围 FAPPROVEDATE param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -2204,7 +2204,7 @@ namespace WMS.Web.Domain.Services.Public var srt_b = string.Join(",", sourceBillNos.Select(x => $"'{x}'")); param.FilterString += " and FBillNo in (" + srt_b + ")"; } - else//没有指定单号搜索 则带时间范围 + else//没有指定单号搜索 则带时间范围 FApproveDate param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param);