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

20260209修改

Browse Source
This commit is contained in:
18923810322
2026-02-09 16:59:27 +08:00
parent 2c4b77dd50
commit 92ac988933
10 changed files with 289 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BarCode.Web.Api/Controllers/TestController.cs
View File

@@ -156,8 +156,8 @@ namespace BarCode.Web.Api.Controllers
//});
//await _serialNumberService.Generate(r, null);
// await _materialService.SyncNewMaterials();
//var s= await _repositories.GetList(new Core.Dto.FileDownManagerRequest(), 0);
await _materialService.SyncNewMaterials();
// var s= await _repositories.GetList(new Core.Dto.FileDownManagerRequest(), 0);
return Result.ReSuccess();
}

2
src/BarCode.Web.Api/appsettings.json
View File

@@ -10,7 +10,9 @@
"AllowedCores": "localhost,http://localhost:8080,http://192.168.1.188:8080",//跨域
"AppOptions": {
"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=test_barcode_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //数据库连接地址
//"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=barcode_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //数据库连接地址
"RedisConnectionString": "47.106.232.90:6379,password=orico.2020,DefaultDatabase=7", //redis连接地址test_barcode_db
//"RedisConnectionString": "47.106.232.90:6379,password=orico.2020,DefaultDatabase=3", //redis连接地址barcode_db
"RedisIpRateLimitingConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=3", //redis连接地址
"SingleBaseUrl": "http://127.0.0.1:8066/api", //单点服务连接地址
"DBType": "Mysql", //数据库类型

50
src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
View File

@@ -1264,6 +1264,56 @@
物料Id 32进制字符串
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.FModifyDate">
<summary>
修改日期
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.FCreateDate">
<summary>
创建日期
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.FProductLines1">
<summary>
产品线(1级)
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.FProductCATs1">
<summary>
产品分类(2级)
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.FMaterialGroup">
<summary>
产品分组(3级)
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.F_Product">
<summary>
SPU
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.FProductLines1FName">
<summary>
产品线(1级)名称
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.FProductCATs1FName">
<summary>
产品分类(2级)名称
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.FMaterialGroupFName">
<summary>
产品分组(3级)名称
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.FProductIDS">
<summary>
物料32进制
</summary>
</member>
<member name="T:BarCode.Web.Core.Dto.Erp.Org.ErpOrgDto">
<summary>
金蝶组织-基本信息

47
src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
View File

@@ -456,6 +456,46 @@
物料Id 32进制字符串
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.Materials.FProductLines1">
<summary>
产品线(1级)
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.Materials.FProductCATs1">
<summary>
产品分类(2级)
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.Materials.FMaterialGroup">
<summary>
产品分组(3级)
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.Materials.F_Product">
<summary>
SPU
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.Materials.FProductLines1FName">
<summary>
产品线(1级)名称
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.Materials.FProductCATs1FName">
<summary>
产品分类(2级)名称
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.Materials.FMaterialGroupFName">
<summary>
产品分组(3级)名称
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.Materials.FProductIDS">
<summary>
物料32进制Id
</summary>
</member>
<member name="T:BarCode.Web.Domain.Entitys.SecurityNumberGenerateRecord">
<summary>
防伪码生成记录
@@ -1178,6 +1218,13 @@
</summary>
<returns></returns>
</member>
<member name="M:BarCode.Web.Domain.Infrastructure.IMaterialsRepositories.GetEntityListAddMaterial(System.Collections.Generic.List{System.String})">
<summary>
列表
</summary>
<param name="materNumbers"></param>
<returns></returns>
</member>
<member name="M:BarCode.Web.Domain.Infrastructure.IMaterialsRepositories.Get(System.Int32)">
<summary>
物料

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

@@ -64,5 +64,53 @@ namespace BarCode.Web.Core.Dto.Erp
/// 物料Id 32进制字符串
/// </summary>
public string IdConvertBar { get; set; }
/// <summary>
/// 修改日期
/// </summary>
public DateTime? FModifyDate { get; set; }
/// <summary>
/// 创建日期
/// </summary>
public DateTime? FCreateDate { get; set; }
/// <summary>
/// 产品线(1级)
/// </summary>
public string FProductLines1 { get; set; }
/// <summary>
/// 产品分类(2级)
/// </summary>
public string FProductCATs1 { get; set; }
/// <summary>
/// 产品分组(3级)
/// </summary>
public string FMaterialGroup { get; set; }
/// <summary>
/// SPU
/// </summary>
public string F_Product { get; set; }
/// <summary>
/// 产品线(1级)名称
/// </summary>
public string FProductLines1FName { get; set; }
/// <summary>
/// 产品分类(2级)名称
/// </summary>
public string FProductCATs1FName { get; set; }
/// <summary>
/// 产品分组(3级)名称
/// </summary>
public string FMaterialGroupFName { get; set; }
/// <summary>
/// 物料32进制
/// </summary>
public string FProductIDS { get; set; }
}
}

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

@@ -73,5 +73,44 @@ namespace BarCode.Web.Domain.Entitys
/// 物料Id 32进制字符串
/// </summary>
public string IdConvertBar { get; set; }
/// <summary>
/// 产品线(1级)
/// </summary>
public string FProductLines1 { get; set; }
/// <summary>
/// 产品分类(2级)
/// </summary>
public string FProductCATs1 { get; set; }
/// <summary>
/// 产品分组(3级)
/// </summary>
public string FMaterialGroup { get; set; }
/// <summary>
/// SPU
/// </summary>
public string F_Product { get; set; }
/// <summary>
/// 产品线(1级)名称
/// </summary>
public string FProductLines1FName { get; set; }
/// <summary>
/// 产品分类(2级)名称
/// </summary>
public string FProductCATs1FName { get; set; }
/// <summary>
/// 产品分组(3级)名称
/// </summary>
public string FMaterialGroupFName { get; set; }
/// <summary>
/// 物料32进制Id
/// </summary>
public string FProductIDS { get; set; }
}
}

7
src/BarCode.Web.Domain/Infrastructure/IMaterialsRepositories.cs
View File

@@ -25,6 +25,13 @@ namespace BarCode.Web.Domain.Infrastructure
/// <returns></returns>
Task<List<Materials>> GetEntityList(int? orgId = null);
/// <summary>
/// 列表
/// </summary>
/// <param name="materNumbers"></param>
/// <returns></returns>
Task<List<Materials>> GetEntityListAddMaterial(List<string> materNumbers);
/// <summary>
/// 物料
/// </summary>

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

@@ -222,7 +222,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";
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.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
@@ -278,6 +278,11 @@ namespace BarCode.Web.Domain.Services.Public
lis.OrgCode = item[9];
lis.IsBatchManage = Convert.ToBoolean(item[10]);
lis.IdConvertBar = item[11].Trim();
lis.FModifyDate = Convert.ToDateTime(item[12]);
lis.FCreateDate = Convert.ToDateTime(item[13]);
lis.FProductLines1FName =item[14];
lis.FProductCATs1FName = item[15];
lis.FMaterialGroupFName = item[16];
erp_materials_list.Add(lis);
}
}
@@ -364,7 +369,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";
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.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
@@ -415,6 +420,11 @@ namespace BarCode.Web.Domain.Services.Public
lis.OrgCode = item[9];
lis.IsBatchManage = Convert.ToBoolean(item[10]);
lis.IdConvertBar = item[11].Trim();
lis.FModifyDate = Convert.ToDateTime(item[12]);
lis.FCreateDate = Convert.ToDateTime(item[13]);
lis.FProductLines1FName = item[14];
lis.FProductCATs1FName = item[15];
lis.FMaterialGroupFName = item[16];
erp_materials_list.Add(lis);
}
//4.6页面的叠加

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

@@ -95,7 +95,7 @@ namespace BarCode.Web.Domain.Services
{
try
{
_logger.LogInformation("同步金蝶新物料：开始->" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
_logger.LogInformation("同步金蝶新物料（20260209）：开始->" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
//1.获取全部物料编码
var materialNumbers = await _materialsRepositories.GetAllNumbers();
//1.1通过hash处理
@@ -120,6 +120,77 @@ namespace BarCode.Web.Domain.Services
if (!isSuccess)
return Result.ReFailure(ResultCodes.DateWriteError);
}
//修改有更新的数据
if (mats.Count != 0)
{
var isFModifyDateMatNumbs = mats.Where(x => x.FModifyDate >= DateTime.Now.AddDays(-5)).Select(x => new { MaterialNumber = x.MaterialNumber, Specifications = x.Specifications, MaterialName = x.MaterialName, BarCode = x.BarCode, OrgId = x.OrgId, 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();
//
_logger.LogInformation("取到需要同步的金蝶修改物料规格yzh（20260209）：" + isFModifyDateMatNumbs.Count + "个");
List<string> s = new List<string>();
foreach (var ismat in isFModifyDateMatNumbs)
{
s.Add(ismat.MaterialNumber);
}
var updateList = await _materialsRepositories.GetEntityListAddMaterial(s);
if (isFModifyDateMatNumbs.Count != 0)
{
//updateList.ForEach(x => { x.Specifications = ; });
foreach (var entity in updateList)
{
// entity.Specifications = mats_result[];
foreach (var mat in isFModifyDateMatNumbs)
{
if (entity.MaterialNumber == mat.MaterialNumber)
{
entity.Specifications = mat.Specifications;
entity.MaterialName = mat.MaterialName;
entity.BarCode = mat.BarCode;
//entity.OrgId = mat.OrgId;
entity.FProductLines1 = mat.FProductLines1;
entity.FProductCATs1 = mat.FProductCATs1;
entity.FMaterialGroup = mat.FMaterialGroup;
entity.F_Product = mat.F_Product;
entity.FProductLines1FName = mat.FProductLines1FName;
entity.FProductCATs1FName = mat.FProductCATs1FName;
entity.FMaterialGroupFName = mat.FMaterialGroupFName;
entity.MaterialId = mat.MaterialId;
entity.FProductIDS = mat.FProductIDS;
continue;
}
}
}
var isSuccess = await _materialsRepositories.UpdateRange(updateList);
if (!isSuccess)
_logger.LogInformation("同步金蝶修改物料-修改物料规格yzh：失败");
else
_logger.LogInformation("同步金蝶修改物料-修改物料规格yzh：成功->" + updateList.Count + "条");
}
// List<string> s = new List<string>();
//foreach (var ismat in isFModifyDateMatNumbs)
// {
// s.Add(ismat.MaterialNumber);
// }
// var updateList = await _materialsRepositories.GetEntityListAddMaterial(s);
// if (updateList.Count != 0)
// {
// updateList.ForEach(x => { x.Specifications = ; });
// var isSuccess = await _materialsRepositories.UpdateRange(updateList);
// if (!isSuccess)
// _logger.LogInformation("同步金蝶新物料-修改物料：失败");
// else
// _logger.LogInformation("同步金蝶新物料-修改物料：成功->" + updateList.Count + "条");
// }
}
//5.修改物料数据
if (mats.Count != 0)
{

10
src/BarCode.Web.Repositories/MaterialsRepositories.cs
View File

@@ -78,6 +78,16 @@ namespace BarCode.Web.Repositories
return await query.ToListAsync();
}
/// <summary>
/// 获取全部的物料编码2
/// </summary>
/// <returns></returns>
public async Task<List<Materials>> GetEntityListAddMaterial(List<string> materNumbers)
{
var entitys = await _context.Materials.Where(x => materNumbers.Contains(x.MaterialNumber)).ToListAsync();
return entitys;
}
/// <summary>
/// 获取
/// </summary>