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

erp物料同步开关

Browse Source
This commit is contained in:
周科达
2024-10-12 14:06:16 +08:00
parent 20ff2d213a
commit f2bc936ea7
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BasicData/Tnb.BasicData.Entities/Consts/FactoryConfigConst.cs
View File

@@ -49,5 +49,10 @@ namespace Tnb.BasicData
/// 换批号天数 /// 换批号天数
/// </summary> /// </summary>
public const string CHANGEBATCHDAY = "changeBatchDay"; public const string CHANGEBATCHDAY = "changeBatchDay";
/// <summary>
/// erp全物料更新
/// </summary>
public const string MATERIALALLUPDATE = "materialAllUpDate";
} }
} }

1
EquipMgr/Tnb.EquipMgr/EquipmentService.cs
View File

@@ -78,6 +78,7 @@ namespace Tnb.EquipMgr
.WhereIF(!string.IsNullOrEmpty(code),a=>a.code.Contains(code)) .WhereIF(!string.IsNullOrEmpty(code),a=>a.code.Contains(code))
.WhereIF(!string.IsNullOrEmpty(name),a=>a.name.Contains(name)) .WhereIF(!string.IsNullOrEmpty(name),a=>a.name.Contains(name))
.WhereIF(!string.IsNullOrEmpty(contract_no),a=>a.contract_no.Contains(contract_no)) .WhereIF(!string.IsNullOrEmpty(contract_no),a=>a.contract_no.Contains(contract_no))
.OrderBy(a=>a.code)
.Select((a, b,c,d,e,f,g,h,i,j) => new EquipListOuput() .Select((a, b,c,d,e,f,g,h,i,j) => new EquipListOuput()
{ {
id = a.id, id = a.id,

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

@@ -854,6 +854,7 @@ namespace Tnb.ProductionMgr
Dictionary<string, object> materialcategoryDic = await _db.Queryable<DictionaryDataEntity>() Dictionary<string, object> materialcategoryDic = await _db.Queryable<DictionaryDataEntity>()
.Where(x => x.DictionaryTypeId == DictConst.MaterialCatagoryID) .Where(x => x.DictionaryTypeId == DictConst.MaterialCatagoryID)
.ToDictionaryAsync(x => x.FullName, y => y.EnCode); .ToDictionaryAsync(x => x.FullName, y => y.EnCode);
BasFactoryConfig materialAllUpDate = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.MATERIALALLUPDATE);
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>();
@@ -975,7 +976,7 @@ namespace Tnb.ProductionMgr
string materialId = extendField?.table_id ?? ""; string materialId = extendField?.table_id ?? "";
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x => x.id == materialId); BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x => x.id == materialId);
// if (extendField.erp_modify_time==null || erpBdMaterial.MODIFIEDTIME != extendField.erp_modify_time) // if (extendField.erp_modify_time==null || erpBdMaterial.MODIFIEDTIME != extendField.erp_modify_time)
if (erpBdMaterial.MODIFIEDTIME != extendField.erp_modify_time) if (materialAllUpDate.value=="1" || erpBdMaterial.MODIFIEDTIME != extendField.erp_modify_time)
{ {
string unitId = erpExtendFields.Find(x => x.cunitid == erpBdMaterial.PK_MEASDOC)?.table_id ?? ""; string unitId = erpExtendFields.Find(x => x.cunitid == erpBdMaterial.PK_MEASDOC)?.table_id ?? "";
unitId = unitDic.ContainsKey(unitId) ? unitDic[unitId].ToString() : ""; unitId = unitDic.ContainsKey(unitId) ? unitDic[unitId].ToString() : "";