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-06-17 14:34:47 +08:00
parent 05cedd2457
commit 90bcfc9033
13 changed files with 204 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -530,7 +530,9 @@ 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(-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");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶分步式入库订单：拼接参数和条件
@@ -546,6 +548,7 @@ namespace WMS.Web.Domain.Services.Public
//当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取
//param.FilterString = " FDocumentStatus='C' and FBillTypeID='e65a4f29743a44b7b67dc8145e1f9c92'";
param.FilterString = " 1=1";
param.FilterString += " and FSrcBillType<>'STK_TRANSFERIN'";
if (isCheck) param.FilterString += " and FDocumentStatus='C'";
param.FilterString += " and FSrcStockId!=FDestStockId";
for (int i = 0; i < stocks.Count(); i++)
@@ -668,7 +671,7 @@ namespace WMS.Web.Domain.Services.Public
if (i == 0)
{
param.FilterString += " and (";
param.FilterString += $"(FSTOCKID.FNumber='{stocks[i].Code}' and FPrdOrgId.FNumber='{stocks[i].ErpOrgCode}')";
param.FilterString += $"(FSTOCKID.FNumber='{stocks[i].Code}' and FPrdOrgId.FNumber='{stocks[i].ErpOrgCode}')";
// param.FilterString += $"( FPrdOrgId.FNumber='{stocks[i].ErpOrgCode}')";
}
else
@@ -724,7 +727,7 @@ namespace WMS.Web.Domain.Services.Public
lis.OrgCode = item[3];
lis.ErpDetailId = Convert.ToInt32(item[12]);
lis.Type = (int)InstockType.ProduceSotck;
lis.SaleBillNo= item[1];
lis.SaleBillNo = item[1];
erp_list.Add(lis);
}
//_logger.LogInformation("分步式调入条数：" + erp_list.Count);
@@ -738,6 +741,7 @@ namespace WMS.Web.Domain.Services.Public
}
/// <summary>
/// erp:单据查询-组装拆卸单-组装（成品入库）
/// </summary>
@@ -2227,6 +2231,7 @@ namespace WMS.Web.Domain.Services.Public
//7.V01.05.00: 当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取
//param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'";
param.FilterString = " 1=1";
param.FilterString += " and FSrcBillType<>'STK_TRANSFERIN'";//add by yzh
if (isCheck) param.FilterString += " and FDocumentStatus='C'";
param.FilterString += " and FMaterialID.FERPCLSID not in (10,11,6)";
param.FilterString += " and FSrcStockID!=FDestStockID";