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

改了调入

Browse Source
This commit is contained in:
18923810322
2025-08-14 12:01:35 +08:00
parent d9708a6b00
commit 884aaea83d
3 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,7 +263,13 @@ namespace WMS.Web.Domain.Services
if (billNos == null || billNos.Count == 0)
{
var beginTime = DateTime.Now.AddHours(-20);//默认拉去8小时以内的数据，ALTER BY YZH
// var beginTime = DateTime.Now.AddDays(-200);//默认拉去8小时以内的数据，ALTER BY YZH这里要改回去
// var beginTime = DateTime.Now.AddDays(-200);//默认拉去8小时以内的数据，ALTER BY YZH这里要改回去
//4.同步数据：分步式入库单
var Transferin_result = await this.SysnTransferin(null, isTransaction, beginTime);
if (!Transferin_result.IsSuccess)
return Result.ReFailure(Transferin_result.Message, Transferin_result.Status);
//6.同步数据:生产入库单
@@ -273,11 +279,7 @@ namespace WMS.Web.Domain.Services
//4.同步数据：分步式入库单
var Transferin_result = await this.SysnTransferin(null, isTransaction, beginTime);
if (!Transferin_result.IsSuccess)
return Result.ReFailure(Transferin_result.Message, Transferin_result.Status);
@@ -835,6 +837,13 @@ namespace WMS.Web.Domain.Services
else if (entity.Type == InstockType.ProduceSotck)
ProduceSotck_sourceBillNos.Add(entity.SourceBillNo);
}
if (Transferin_sourceBillNos.Count() > 0)
{
var erp_result = await _erpService.BillQueryForTransferin(Transferin_sourceBillNos, null);
if (!erp_result.IsSuccess)
return Result<List<ErpInStockResultDto>>.ReFailure(erp_result.Message, erp_result.Status);
erp_list.AddRange(erp_result.Data);
}
if (ProduceSotck_sourceBillNos.Count() > 0)//生产入库
{
@@ -865,13 +874,7 @@ namespace WMS.Web.Domain.Services
return Result<List<ErpInStockResultDto>>.ReFailure(erp_result.Message, erp_result.Status);
erp_list.AddRange(erp_result.Data);
}
if (Transferin_sourceBillNos.Count() > 0)
{
var erp_result = await _erpService.BillQueryForTransferin(Transferin_sourceBillNos, null);
if (!erp_result.IsSuccess)
return Result<List<ErpInStockResultDto>>.ReFailure(erp_result.Message, erp_result.Status);
erp_list.AddRange(erp_result.Data);
}
if (AssembledApp_sourceBillNos.Count() > 0)
{
var erp_result_ass = await _erpService.BillQueryForAssembledApp_Assembly(AssembledApp_sourceBillNos, null);

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

@@ -597,15 +597,16 @@ namespace WMS.Web.Domain.Services.Public
//2.时间条件：可能还有其它条件
//var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00");
var beginStr = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd HH:mm:ss");
// var beginStr = DateTime.Now.AddDays(-180).ToString("yyyy-MM-dd HH:mm:ss");
// var beginStr = DateTime.Now.AddDays(-180).ToString("yyyy-MM-dd HH:mm:ss");
// var beginStr = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd HH:mm:ss");
// var beginStr = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd HH:mm:ss");
var beginStr = DateTime.Now.AddDays(-10).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
// beginStr = DateTime.Now.AddDays(-10).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);
var param = new ErpBillQueryParamDto(FormIdParam.STK_TRANSFERIN.ToString());
param.FieldKeys = "FBillNo,FStockOrgID,FMaterialID.FNumber,FDestStockID,FDestStockID.FNumber,FQty,FCreateDate,FEntryNote,FStockOrgID.FNumber,FSTKTRSINENTRY_FEntryID";
param.FieldKeys = "FSrcBillType,FBillNo,FStockOrgID,FMaterialID.FNumber,FDestStockID,FDestStockID.FNumber,FQty,FCreateDate,FEntryNote,FStockOrgID.FNumber,FSTKTRSINENTRY_FEntryID";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -615,7 +616,8 @@ namespace WMS.Web.Domain.Services.Public
//当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取
//param.FilterString = " FDocumentStatus='C' and FBillTypeID='e65a4f29743a44b7b67dc8145e1f9c92'";
param.FilterString = " 1=1";
param.FilterString += " and FSrcBillType<>'STK_TRANSFERIN'";
// param.FilterString += " and FSrcBillType<>'STK_TRANSFERIN' and FBillNo='FBDR226242'";
param.FilterString += " and FSrcBillType<>'STK_TransferDirect'";
if (isCheck) param.FilterString += " and FDocumentStatus='C'";
param.FilterString += " and FSrcStockId!=FDestStockId";
for (int i = 0; i < stocks.Count(); i++)
@@ -651,7 +653,7 @@ namespace WMS.Web.Domain.Services.Public
}//注意：当有单据编号的查询的时候，时间条件去掉；不然就查不到数据了
else
{
//param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
// param.FilterString = param.FilterString + " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endTime + "'";
param.FilterString = param.FilterString + " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endTime + "'";
}