18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加日志

Browse Source
This commit is contained in:
18942506660
2024-05-13 12:00:28 +08:00
parent 1653c43ae9
commit 5d31f820e0
7 changed files with 121 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -3597,7 +3597,7 @@
<param name="sourceBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SsynPurchaseInStock(System.Collections.Generic.List{System.String},System.Boolean)">
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SsynPurchaseInStock(System.Collections.Generic.List{System.String},System.Boolean,System.Nullable{System.DateTime})">
<summary>
同步：采购入库类型单据
</summary>
@@ -3605,7 +3605,7 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SysnMiscellaneous(System.Collections.Generic.List{System.String},System.Boolean)">
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SysnMiscellaneous(System.Collections.Generic.List{System.String},System.Boolean,System.Nullable{System.DateTime})">
<summary>
同步：其他入库类型单据
</summary>
@@ -3613,7 +3613,7 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SysnTransferDirect(System.Collections.Generic.List{System.String},System.Boolean)">
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SysnTransferDirect(System.Collections.Generic.List{System.String},System.Boolean,System.Nullable{System.DateTime})">
<summary>
同步：直接调拨入库单据
</summary>
@@ -3621,7 +3621,7 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SysnTransferin(System.Collections.Generic.List{System.String},System.Boolean)">
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SysnTransferin(System.Collections.Generic.List{System.String},System.Boolean,System.Nullable{System.DateTime})">
<summary>
同步：分步式入库单据
</summary>
@@ -3629,7 +3629,7 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SysnAssembledApp(System.Collections.Generic.List{System.String},System.Boolean)">
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SysnAssembledApp(System.Collections.Generic.List{System.String},System.Boolean,System.Nullable{System.DateTime})">
<summary>
同步：组装拆卸单
</summary>
@@ -3942,41 +3942,41 @@
<param name="purchaseDetailId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForPurchaseInStock(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForPurchaseInStock(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-采购入库单
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForMiscellaneous(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForMiscellaneous(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-其他入库单
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForTransferDirect(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForTransferDirect(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-直接调拨入库单
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForTransferin(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForTransferin(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-分步式调入单
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForAssembledApp_Assembly(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForAssembledApp_Assembly(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-组装拆卸单-组装（成品入库）
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForAssembledApp_Disassembly(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForAssembledApp_Disassembly(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-组装拆卸单-拆卸（子件入库）
</summary>
@@ -5224,7 +5224,7 @@
<param name="sourceBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SsynPurchaseInStock(System.Collections.Generic.List{System.String},System.Boolean)">
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SsynPurchaseInStock(System.Collections.Generic.List{System.String},System.Boolean,System.Nullable{System.DateTime})">
<summary>
同步：采购入库类型单据
</summary>
@@ -5232,7 +5232,7 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SysnMiscellaneous(System.Collections.Generic.List{System.String},System.Boolean)">
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SysnMiscellaneous(System.Collections.Generic.List{System.String},System.Boolean,System.Nullable{System.DateTime})">
<summary>
同步：其他入库单
</summary>
@@ -5240,7 +5240,7 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SysnTransferDirect(System.Collections.Generic.List{System.String},System.Boolean)">
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SysnTransferDirect(System.Collections.Generic.List{System.String},System.Boolean,System.Nullable{System.DateTime})">
<summary>
同步：直接调拨入库单
</summary>
@@ -5248,7 +5248,7 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SysnTransferin(System.Collections.Generic.List{System.String},System.Boolean)">
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SysnTransferin(System.Collections.Generic.List{System.String},System.Boolean,System.Nullable{System.DateTime})">
<summary>
同步：分步式调入单
</summary>
@@ -5256,7 +5256,7 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SysnAssembledApp(System.Collections.Generic.List{System.String},System.Boolean)">
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SysnAssembledApp(System.Collections.Generic.List{System.String},System.Boolean,System.Nullable{System.DateTime})">
<summary>
同步：组装拆卸单
</summary>
@@ -5693,7 +5693,7 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForPurchaseInStock(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForPurchaseInStock(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-采购入库单
</summary>
@@ -5701,35 +5701,35 @@
<param name="sourceBillNos">单据编号集合精确查找</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMiscellaneous(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMiscellaneous(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-其他入库单
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForTransferDirect(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForTransferDirect(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-直接调拨入库单
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForTransferin(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForTransferin(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-分步式调入单
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForAssembledApp_Assembly(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForAssembledApp_Assembly(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-组装拆卸单-组装（成品入库）
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForAssembledApp_Disassembly(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForAssembledApp_Disassembly(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-组装拆卸单-拆卸（子件入库）
</summary>

10
src/WMS.Web.Domain/IService/IInStockTaskService.cs
View File

@@ -26,7 +26,7 @@ namespace WMS.Web.Domain.IService
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> SsynPurchaseInStock(List<string> billNos = null, bool isTransaction=true);
Task<Result> SsynPurchaseInStock(List<string> billNos = null, bool isTransaction=true, DateTime? beginTime = null);
/// <summary>
/// 同步：其他入库类型单据
@@ -34,7 +34,7 @@ namespace WMS.Web.Domain.IService
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> SysnMiscellaneous(List<string> billNos = null, bool isTransaction = true);
Task<Result> SysnMiscellaneous(List<string> billNos = null, bool isTransaction = true, DateTime? beginTime = null);
/// <summary>
/// 同步：直接调拨入库单据
@@ -42,7 +42,7 @@ namespace WMS.Web.Domain.IService
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> SysnTransferDirect(List<string> billNos = null, bool isTransaction = true);
Task<Result> SysnTransferDirect(List<string> billNos = null, bool isTransaction = true, DateTime? beginTime = null);
/// <summary>
/// 同步：分步式入库单据
@@ -50,7 +50,7 @@ namespace WMS.Web.Domain.IService
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> SysnTransferin(List<string> billNos = null, bool isTransaction = true);
Task<Result> SysnTransferin(List<string> billNos = null, bool isTransaction = true, DateTime? beginTime = null);
/// <summary>
/// 同步：组装拆卸单
@@ -58,7 +58,7 @@ namespace WMS.Web.Domain.IService
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> SysnAssembledApp(List<string> billNos = null, bool isTransaction = true);
Task<Result> SysnAssembledApp(List<string> billNos = null, bool isTransaction = true, DateTime? beginTime = null);
/// <summary>
/// 同步

12
src/WMS.Web.Domain/IService/Public/IErpService.cs
View File

@@ -38,42 +38,42 @@ namespace WMS.Web.Domain.IService.Public
/// erp:单据查询-采购入库单
/// </summary>
/// <returns></returns>
Task<ResultList<ErpInStockResultDto>> BillQueryForPurchaseInStock(List<string> sourceBillNos = null);
Task<ResultList<ErpInStockResultDto>> BillQueryForPurchaseInStock(List<string> sourceBillNos = null, DateTime? beginTime = null);
/// <summary>
/// erp:单据查询-其他入库单
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
Task<ResultList<ErpInStockResultDto>> BillQueryForMiscellaneous(List<string> sourceBillNos = null);
Task<ResultList<ErpInStockResultDto>> BillQueryForMiscellaneous(List<string> sourceBillNos = null, DateTime? beginTime = null);
/// <summary>
/// erp:单据查询-直接调拨入库单
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
Task<ResultList<ErpInStockResultDto>> BillQueryForTransferDirect(List<string> sourceBillNos = null);
Task<ResultList<ErpInStockResultDto>> BillQueryForTransferDirect(List<string> sourceBillNos = null, DateTime? beginTime = null);
/// <summary>
/// erp:单据查询-分步式调入单
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
Task<ResultList<ErpInStockResultDto>> BillQueryForTransferin(List<string> sourceBillNos = null);
Task<ResultList<ErpInStockResultDto>> BillQueryForTransferin(List<string> sourceBillNos = null, DateTime? beginTime = null);
/// <summary>
/// erp:单据查询-组装拆卸单-组装（成品入库）
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
Task<ResultList<ErpInStockResultDto>> BillQueryForAssembledApp_Assembly(List<string> sourceBillNos = null);
Task<ResultList<ErpInStockResultDto>> BillQueryForAssembledApp_Assembly(List<string> sourceBillNos = null, DateTime? beginTime = null);
/// <summary>
/// erp:单据查询-组装拆卸单-拆卸（子件入库）
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
Task<ResultList<ErpInStockResultDto>> BillQueryForAssembledApp_Disassembly(List<string> sourceBillNos = null);
Task<ResultList<ErpInStockResultDto>> BillQueryForAssembledApp_Disassembly(List<string> sourceBillNos = null, DateTime? beginTime = null);
/// <summary>
/// erp:单据查询-出库单

2
src/WMS.Web.Domain/QuartzJob/OutStockOrderQuartzJob.cs
View File

@@ -48,7 +48,7 @@ namespace WMS.Web.Domain.QuartzJob
var begindatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
_logger.LogInformation($"出库单-同步金蝶出库单数据：执行开始时间->{begindatetime}");
DateTime begin = DateTime.Now.AddDays(-3);//默认拉去一天以内的数据
DateTime begin = DateTime.Now.AddHours(-8);//默认拉去8个小时以内的
//3.同步数据
var result = await _outStockTaskService.Sync(null, begin);
//5.记录：结束时间

33
src/WMS.Web.Domain/Services/InStockTaskService.cs
View File

@@ -110,10 +110,10 @@ namespace WMS.Web.Domain.Services
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> SsynPurchaseInStock(List<string> billNos = null, bool isTransaction = true)
public async Task<Result> SsynPurchaseInStock(List<string> billNos = null, bool isTransaction = true, DateTime? beginTime = null)
{
//1.获取金蝶数据：采购订单数据
var erp_result = await _erpService.BillQueryForPurchaseInStock(billNos);
var erp_result = await _erpService.BillQueryForPurchaseInStock(billNos, beginTime);
if (!erp_result.IsSuccess)
return Result.ReFailure(erp_result.Message, erp_result.Status);
var erp_list = erp_result.Data;
@@ -127,10 +127,10 @@ namespace WMS.Web.Domain.Services
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> SysnMiscellaneous(List<string> billNos = null, bool isTransaction = true)
public async Task<Result> SysnMiscellaneous(List<string> billNos = null, bool isTransaction = true, DateTime? beginTime = null)
{
//1.获取金蝶数据：其他入库订单数据
var erp_result = await _erpService.BillQueryForMiscellaneous(billNos);
var erp_result = await _erpService.BillQueryForMiscellaneous(billNos, beginTime);
if (!erp_result.IsSuccess)
return Result.ReFailure(erp_result.Message, erp_result.Status);
var erp_list = erp_result.Data;
@@ -144,10 +144,10 @@ namespace WMS.Web.Domain.Services
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> SysnTransferDirect(List<string> billNos = null, bool isTransaction = true)
public async Task<Result> SysnTransferDirect(List<string> billNos = null, bool isTransaction = true, DateTime? beginTime = null)
{
//1.获取金蝶数据：直接调拨入库订单数据
var erp_result = await _erpService.BillQueryForTransferDirect(billNos);
var erp_result = await _erpService.BillQueryForTransferDirect(billNos, beginTime);
if (!erp_result.IsSuccess)
return Result.ReFailure(erp_result.Message, erp_result.Status);
var erp_list = erp_result.Data;
@@ -161,10 +161,10 @@ namespace WMS.Web.Domain.Services
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> SysnTransferin(List<string> billNos = null, bool isTransaction = true)
public async Task<Result> SysnTransferin(List<string> billNos = null, bool isTransaction = true, DateTime? beginTime = null)
{
//1.获取金蝶数据：分步式入库订单数据
var erp_result = await _erpService.BillQueryForTransferin(billNos);
var erp_result = await _erpService.BillQueryForTransferin(billNos, beginTime);
if (!erp_result.IsSuccess)
return Result.ReFailure(erp_result.Message, erp_result.Status);
var erp_list = erp_result.Data;
@@ -177,18 +177,18 @@ namespace WMS.Web.Domain.Services
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> SysnAssembledApp(List<string> billNos = null, bool isTransaction = true)
public async Task<Result> SysnAssembledApp(List<string> billNos = null, bool isTransaction = true, DateTime? beginTime = null)
{
var erp_list = new List<ErpInStockResultDto>();
//1.获取金蝶数据：组装成品入库订单数据
var erp_result_ass = await _erpService.BillQueryForAssembledApp_Assembly(billNos);
var erp_result_ass = await _erpService.BillQueryForAssembledApp_Assembly(billNos, beginTime);
if (!erp_result_ass.IsSuccess)
return Result.ReFailure(erp_result_ass.Message, erp_result_ass.Status);
var erp_list_ass = erp_result_ass.Data;
erp_list.AddRange(erp_list_ass);
//1.1.获取金蝶数据：拆卸子件入库订单数据
var erp_result_disass = await _erpService.BillQueryForAssembledApp_Disassembly(billNos);
var erp_result_disass = await _erpService.BillQueryForAssembledApp_Disassembly(billNos, beginTime);
if (!erp_result_disass.IsSuccess)
return Result.ReFailure(erp_result_disass.Message, erp_result_disass.Status);
var erp_list_disass = erp_result_disass.Data;
@@ -235,28 +235,29 @@ namespace WMS.Web.Domain.Services
{
if (billNos == null || billNos.Count == 0)
{
var beginTime = DateTime.Now.AddHours(-8);
//1.同步数据:采购订单
var purchase_result = await this.SsynPurchaseInStock(null, isTransaction);
var purchase_result = await this.SsynPurchaseInStock(null, isTransaction, beginTime);
if (!purchase_result.IsSuccess)
return Result.ReFailure(purchase_result.Message, purchase_result.Status);
//2.同步数据：其他入库单
var miscellaneou_result = await this.SysnMiscellaneous(null, isTransaction);
var miscellaneou_result = await this.SysnMiscellaneous(null, isTransaction, beginTime);
if (!miscellaneou_result.IsSuccess)
return Result.ReFailure(miscellaneou_result.Message, miscellaneou_result.Status);
//3.同步数据：直接调拨入库单
var TransferDirect_result = await this.SysnTransferDirect(null, isTransaction);
var TransferDirect_result = await this.SysnTransferDirect(null, isTransaction, beginTime);
if (!TransferDirect_result.IsSuccess)
return Result.ReFailure(TransferDirect_result.Message, TransferDirect_result.Status);
//4.同步数据：分步式入库单
var Transferin_result = await this.SysnTransferin(null, isTransaction);
var Transferin_result = await this.SysnTransferin(null, isTransaction, beginTime);
if (!Transferin_result.IsSuccess)
return Result.ReFailure(Transferin_result.Message, Transferin_result.Status);
//5.同步数据：组装拆卸单
var AssembledApp_result = await this.SysnAssembledApp(null, isTransaction);
var AssembledApp_result = await this.SysnAssembledApp(null, isTransaction, beginTime);
if (!AssembledApp_result.IsSuccess)
return Result.ReFailure(AssembledApp_result.Message, AssembledApp_result.Status);
}

2
src/WMS.Web.Domain/Services/OutStockTaskService.cs
View File

@@ -370,7 +370,7 @@ namespace WMS.Web.Domain.Services
{
//DateTime begin = await _erpOpsSyncDateRepositories.Get(ErpOpsSyncType.OutStock);
if (begin == null)
begin = DateTime.Now.AddDays(-3);//默认拉去三天以内的数据
begin = DateTime.Now.AddHours(-8);//默认拉去8小时以内的数据
//更新时间范围内所有
result = await BillQueryForSalOutStock(false, null, begin);
if (!result.IsSuccess) isRollback = true;

95
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -160,8 +160,9 @@ namespace WMS.Web.Domain.Services.Public
/// <param name="billNo">模糊搜索</param>
/// <param name="sourceBillNos">单据编号集合精确查找</param>
/// <returns></returns>
public async Task<ResultList<ErpInStockResultDto>> BillQueryForPurchaseInStock(List<string> sourceBillNos = null)
public async Task<ResultList<ErpInStockResultDto>> BillQueryForPurchaseInStock(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -230,10 +231,12 @@ namespace WMS.Web.Domain.Services.Public
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 beginTime = DateTime.Now.AddHours(-8).ToString("yyyy-MM-dd HH:mm:ss");
var beginStr = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
param.FilterString = param.FilterString + " and FApproveDate>='" + beginTime + "' and FApproveDate<='" + endTime + "'";
param.FilterString = param.FilterString + " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endTime + "'";
}
}
@@ -241,7 +244,7 @@ namespace WMS.Web.Domain.Services.Public
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -271,6 +274,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForPurchaseInStock->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpInStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
@@ -280,8 +284,9 @@ namespace WMS.Web.Domain.Services.Public
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
public async Task<ResultList<ErpInStockResultDto>> BillQueryForMiscellaneous(List<string> sourceBillNos = null)
public async Task<ResultList<ErpInStockResultDto>> BillQueryForMiscellaneous(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -298,7 +303,8 @@ namespace WMS.Web.Domain.Services.Public
//2.时间条件：可能还有其它条件
//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 beginStr = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶其他入库订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
@@ -345,14 +351,14 @@ namespace WMS.Web.Domain.Services.Public
else
{
//param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
param.FilterString = param.FilterString + " and FAPPROVEDATE>='" + beginTime + "' and FAPPROVEDATE<='" + endTime + "'";
param.FilterString = param.FilterString + " and FAPPROVEDATE>='" + beginStr + "' and FAPPROVEDATE<='" + endTime + "'";
}
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -377,6 +383,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForMiscellaneous->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpInStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
@@ -386,8 +393,9 @@ namespace WMS.Web.Domain.Services.Public
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
public async Task<ResultList<ErpInStockResultDto>> BillQueryForTransferDirect(List<string> sourceBillNos = null)
public async Task<ResultList<ErpInStockResultDto>> BillQueryForTransferDirect(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -404,7 +412,8 @@ namespace WMS.Web.Domain.Services.Public
//2.时间条件：可能还有其它条件
//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 beginStr = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶直接调拨入库订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
@@ -454,14 +463,14 @@ namespace WMS.Web.Domain.Services.Public
else
{
//param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
param.FilterString = param.FilterString + " and FApproveDate>='" + beginTime + "' and FApproveDate<='" + endTime + "'";
param.FilterString = param.FilterString + " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endTime + "'";
}
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -486,6 +495,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForTransferDirect->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpInStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
@@ -495,8 +505,9 @@ namespace WMS.Web.Domain.Services.Public
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
public async Task<ResultList<ErpInStockResultDto>> BillQueryForTransferin(List<string> sourceBillNos = null)
public async Task<ResultList<ErpInStockResultDto>> BillQueryForTransferin(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -513,7 +524,8 @@ namespace WMS.Web.Domain.Services.Public
//2.时间条件：可能还有其它条件
//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 beginStr = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶分步式入库订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
@@ -562,14 +574,14 @@ namespace WMS.Web.Domain.Services.Public
else
{
//param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
param.FilterString = param.FilterString + " and FApproveDate>='" + beginTime + "' and FApproveDate<='" + endTime + "'";
param.FilterString = param.FilterString + " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endTime + "'";
}
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -595,6 +607,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForTransferin->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpInStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
@@ -604,8 +617,9 @@ namespace WMS.Web.Domain.Services.Public
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
public async Task<ResultList<ErpInStockResultDto>> BillQueryForAssembledApp_Assembly(List<string> sourceBillNos = null)
public async Task<ResultList<ErpInStockResultDto>> BillQueryForAssembledApp_Assembly(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -622,7 +636,8 @@ namespace WMS.Web.Domain.Services.Public
//2.时间条件：可能还有其它条件
//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 beginStr = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶分步式入库订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
@@ -670,14 +685,14 @@ namespace WMS.Web.Domain.Services.Public
else
{
//param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
param.FilterString = param.FilterString + " and FAPPROVEDATE>='" + beginTime + "' and FAPPROVEDATE<='" + endTime + "'";
param.FilterString = param.FilterString + " and FAPPROVEDATE>='" + beginStr + "' and FAPPROVEDATE<='" + endTime + "'";
}
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -702,6 +717,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForAssembledApp_Assembly->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpInStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
@@ -711,8 +727,9 @@ namespace WMS.Web.Domain.Services.Public
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
public async Task<ResultList<ErpInStockResultDto>> BillQueryForAssembledApp_Disassembly(List<string> sourceBillNos = null)
public async Task<ResultList<ErpInStockResultDto>> BillQueryForAssembledApp_Disassembly(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -729,7 +746,8 @@ namespace WMS.Web.Domain.Services.Public
//2.时间条件：可能还有其它条件
//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 beginStr = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶分步式入库订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
@@ -777,14 +795,14 @@ namespace WMS.Web.Domain.Services.Public
else
{
//param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
param.FilterString = param.FilterString + " and FAPPROVEDATE>='" + beginTime + "' and FAPPROVEDATE<='" + endTime + "'";
param.FilterString = param.FilterString + " and FAPPROVEDATE>='" + beginStr + "' and FAPPROVEDATE<='" + endTime + "'";
}
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -809,6 +827,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForAssembledApp_Disassembly->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpInStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
@@ -1757,6 +1776,7 @@ namespace WMS.Web.Domain.Services.Public
#region 出库
public async Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForDeliveryNoticeOutStock(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -1819,7 +1839,7 @@ namespace WMS.Web.Domain.Services.Public
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -1846,6 +1866,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForDeliveryNoticeOutStock->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
@@ -1856,6 +1877,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public async Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForTransferDirectOutStock(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -1915,7 +1937,7 @@ namespace WMS.Web.Domain.Services.Public
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -1942,6 +1964,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForTransferDirectOutStock->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
@@ -1952,6 +1975,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public async Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForTransferOutOutStock(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -2011,7 +2035,7 @@ namespace WMS.Web.Domain.Services.Public
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -2038,6 +2062,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForTransferOutOutStock->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
@@ -2048,6 +2073,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public async Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForAssembledAppOutStock_Dassembly(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -2105,7 +2131,7 @@ namespace WMS.Web.Domain.Services.Public
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -2132,6 +2158,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForAssembledAppOutStock_Dassembly->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
@@ -2142,6 +2169,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public async Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForMisDeliveryOutStock(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -2199,7 +2227,7 @@ namespace WMS.Web.Domain.Services.Public
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -2226,6 +2254,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForMisDeliveryOutStock->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
@@ -2236,6 +2265,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public async Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForAssembledAppOutStock_Assembly(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -2295,7 +2325,7 @@ namespace WMS.Web.Domain.Services.Public
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -2322,6 +2352,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForAssembledAppOutStock_Assembly->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
@@ -2333,6 +2364,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns>
public async Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForSalOutStock(List<string> sourceBillNos = null, DateTime? beginTime = null)
{
string result_json = "";
try
{
@@ -2394,7 +2426,7 @@ namespace WMS.Web.Domain.Services.Public
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
@@ -2421,6 +2453,7 @@ namespace WMS.Web.Domain.Services.Public
}
catch (Exception ex)
{
_logger.LogError($"BillQueryForSalOutStock->拉取金蝶数据失败:{ex.Message} 返回json:{result_json}");
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}