wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物料同步

Browse Source
This commit is contained in:
周科达
2024-09-04 14:08:41 +08:00
parent 26311fa6a7
commit b07f20845d
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/ErpEntity/ErpBdMaterial.cs
View File

@@ -56,5 +56,10 @@ namespace Tnb.ProductionMgr.Entities.Entity.ErpEntity
/// 修改时间 /// 修改时间
/// </summary> /// </summary>
public string MODIFIEDTIME { get; set; } public string MODIFIEDTIME { get; set; }
/// <summary>
/// mes物料类型
/// </summary>
public string DEFNAME { get; set; }
} }
} }

6
ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
View File

@@ -42,6 +42,7 @@ using Tnb.ProductionMgr.Entities.Dto.PrdManage;
using Tnb.ProductionMgr.Entities.Entity; using Tnb.ProductionMgr.Entities.Entity;
using Tnb.ProductionMgr.Entities.Entity.ErpEntity; using Tnb.ProductionMgr.Entities.Entity.ErpEntity;
using Tnb.BasicData.Entities.Dto; using Tnb.BasicData.Entities.Dto;
using Tnb.BasicData;
namespace Tnb.ProductionMgr namespace Tnb.ProductionMgr
{ {
@@ -994,6 +995,9 @@ namespace Tnb.ProductionMgr
Dictionary<string, object> unitDic2 = await _db.Queryable<DictionaryDataEntity>() Dictionary<string, object> unitDic2 = await _db.Queryable<DictionaryDataEntity>()
.Where(x => x.DictionaryTypeId == WmsWareHouseConst.UNITTYPEID) .Where(x => x.DictionaryTypeId == WmsWareHouseConst.UNITTYPEID)
.ToDictionaryAsync(x => x.FullName, y => y.EnCode); .ToDictionaryAsync(x => x.FullName, y => y.EnCode);
Dictionary<string, object> materialcategoryDic = await _db.Queryable<DictionaryDataEntity>()
.Where(x => x.DictionaryTypeId == DictConst.MaterialCatagoryID)
.ToDictionaryAsync(x => x.FullName, y => y.EnCode);
List<BasMaterial> materials = await _db.Queryable<BasMaterial>().ToListAsync(); List<BasMaterial> materials = await _db.Queryable<BasMaterial>().ToListAsync();
List<BasEbomH> basEbomHs = await _db.Queryable<BasEbomH>().ToListAsync(); List<BasEbomH> basEbomHs = await _db.Queryable<BasEbomH>().ToListAsync();
List<BasMaterial> insertMaterial = new List<BasMaterial>(); List<BasMaterial> insertMaterial = new List<BasMaterial>();
@@ -1038,7 +1042,7 @@ namespace Tnb.ProductionMgr
} }
else else
{ {
categoryId = materialcategoryDic.ContainsKey(erpBdMaterial.DEFNAME) ? $"[\"{materialcategoryDic["erpBdMaterial.DEFNAME"]}\"]" : "[\"CGJCJ\"]";
} }
if (erpExtendFields.All(x => x.cmaterialoid != erpBdMaterial.ID)) if (erpExtendFields.All(x => x.cmaterialoid != erpBdMaterial.ID))