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

修改了反审核也能变没有

Browse Source
This commit is contained in:
18923810322
2026-02-26 11:46:10 +08:00
parent 3758b57d37
commit 7d293c441d
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
View File

@@ -116,6 +116,8 @@ namespace BarCode.Web.Core.Dto.Erp
/// </summary>
public string? FProductIDS { get; set; }
public string FDocumentStatus { get; set; }
}
}

2
src/BarCode.Web.Domain/Entitys/Materials.cs
View File

@@ -84,6 +84,8 @@ namespace BarCode.Web.Domain.Entitys
/// </summary>
public DateTime FModifyDate { get; set; }
/// <summary>
/// 物料修改时间
/// </summary>

5
src/BarCode.Web.Domain/Services/Public/ErpService.cs
View File

@@ -370,7 +370,7 @@ namespace BarCode.Web.Domain.Services.Public
//3.获取金蝶物料：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.BD_MATERIAL.ToString());
param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName,FBaseUnitId.FNumber,FBARCODE,FUseOrgId,FUseOrgId.FNumber,FIsBatchManage,FProductIDS,FModifyDate,FCreateDate,FProductLines1.FName,FProductCATs1.FName,FMaterialGroup.FName";
param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName,FBaseUnitId.FNumber,FBARCODE,FUseOrgId,FUseOrgId.FNumber,FIsBatchManage,FProductIDS,FModifyDate,FCreateDate,FProductLines1.FName,FProductCATs1.FName,FMaterialGroup.FName,FDocumentStatus";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
@@ -378,7 +378,7 @@ namespace BarCode.Web.Domain.Services.Public
//2.禁用状态：A否，B是
//3.使用组织：只查询“深圳市元创时代科技有限公司”这个组织；组织ID=100008--固定值查询（测试端和正式是一样的）
//param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and (FUseOrgId=19162897 or FUseOrgId=100008)";
param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and FUseOrgId=100008";
param.FilterString = "(FDocumentStatus='C' or FDocumentStatus='D') and FForbidStatus='A' and FUseOrgId=100008";
param.OrderString = "FCreateDate ASC";
//4.循环拿金蝶数据
@@ -423,6 +423,7 @@ namespace BarCode.Web.Domain.Services.Public
lis.IdConvertBar = item[11].Trim();
lis.FModifyDate = Convert.ToDateTime(item[12]);
lis.FCreateDate = Convert.ToDateTime(item[13]);
lis.FDocumentStatus = item[17];
lis.isDis = "1";
//lis.FProductLines1FName = item[14];
//lis.FProductCATs1FName = item[15];

10
src/BarCode.Web.Domain/Services/Public/MaterialService.cs
View File

@@ -124,7 +124,8 @@ namespace BarCode.Web.Domain.Services
//修改有更新的数据
if (mats.Count != 0)
{
var isFModifyDateMatNumbs = mats.Where(x => x.FModifyDate >= DateTime.Now.AddDays(-35)).Select(x => new { MaterialNumber = x.MaterialNumber, Specifications = x.Specifications, MaterialName = x.MaterialName, BarCode = x.BarCode, OrgId = x.OrgId, FCreateDate=x.FCreateDate, FModifyDate=x.FModifyDate, FProductLines1 = x.FProductLines1, FProductCATs1 = x.FProductCATs1, FMaterialGroup = x.FMaterialGroup, F_Product = x.F_Product, FProductLines1FName = x.FProductLines1FName, FProductCATs1FName = x.FProductCATs1FName, FMaterialGroupFName = x.FMaterialGroupFName, MaterialId = x.MaterialId, FProductIDS = x.FProductIDS }).ToList();
var isFModifyDateMatNumbs = mats.Where(x => x.FModifyDate >= DateTime.Now.AddDays(-35)).Select(x => new { MaterialNumber = x.MaterialNumber, Specifications = x.Specifications, MaterialName = x.MaterialName, BarCode = x.BarCode, OrgId = x.OrgId, FCreateDate=x.FCreateDate, FModifyDate=x.FModifyDate, FProductLines1 = x.FProductLines1, FProductCATs1 = x.FProductCATs1, FMaterialGroup = x.FMaterialGroup, F_Product = x.F_Product, FProductLines1FName = x.FProductLines1FName, FProductCATs1FName = x.FProductCATs1FName, FMaterialGroupFName = x.FMaterialGroupFName, MaterialId = x.MaterialId, FProductIDS = x.FProductIDS, FDocumentStatus = x.FDocumentStatus }).ToList();
//
_logger.LogInformation("取到需要同步的金蝶修改物料规格yzh（20260209）：" + isFModifyDateMatNumbs.Count + "个");
@@ -151,7 +152,14 @@ namespace BarCode.Web.Domain.Services
entity.BarCode = mat.BarCode;
entity.FCreateDate = DateTime.Now;
entity.FModifyDate = mat.FModifyDate;
if(mat.FDocumentStatus == "D")
{
entity.isDis = "0";
}
else
{
entity.isDis = "1";
}
//entity.OrgId = mat.OrgId;
//entity.FProductLines1 = mat.FProductLines1;
//entity.FProductCATs1 = mat.FProductCATs1;