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

bug

Browse Source
This commit is contained in:
周科达
2024-07-22 12:46:46 +08:00
parent 6ac4016dee
commit 3a88deb159
3 changed files with 3396 additions and 3391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/ErpEntity/BomList.cs
View File

@@ -38,5 +38,7 @@ namespace Tnb.ProductionMgr.Entities.Entity.ErpEntity
/// 修改时间 /// 修改时间
/// </summary> /// </summary>
public string MODIFIEDTIME { get; set; } public string MODIFIEDTIME { get; set; }
public int ROWNO { get; set; }
} }
} }

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

@@ -778,7 +778,7 @@ namespace Tnb.ProductionMgr
string[] tables = new[] { "base_dictionarydata", "bas_material" }; string[] tables = new[] { "base_dictionarydata", "bas_material" };
var erpdb = _db.AsTenant().GetConnection("erpdb"); var erpdb = _db.AsTenant().GetConnection("erpdb");
List<ErpBdMaterial> list = await erpdb.Queryable<ErpBdMaterial>().ToListAsync(); List<ErpBdMaterial> list = await erpdb.Queryable<ErpBdMaterial>().ToListAsync();
List<BomList> bomList = erpdb.Queryable<BomList>().ToList(); List<BomList> bomList = await erpdb.Queryable<BomList>().OrderBy(x=>x.BOMID).OrderBy(x=>x.ROWNO).ToListAsync();
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>() List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>()
.Where(x => tables.Contains(x.table_name)).ToListAsync(); .Where(x => tables.Contains(x.table_name)).ToListAsync();
Dictionary<string, object> unitDic = await _db.Queryable<DictionaryDataEntity>() Dictionary<string, object> unitDic = await _db.Queryable<DictionaryDataEntity>()
@@ -923,7 +923,7 @@ namespace Tnb.ProductionMgr
BomList firstItemInList = itemList[0]; BomList firstItemInList = itemList[0];
BasMaterial material = materials.Find(x => x.code==firstItemInList.MPRODID); BasMaterial material = materials.Find(x => x.code==firstItemInList.MPRODID);
if (material == null) continue; if (material == null) continue;
string unitId = unitDic.ContainsKey(firstItemInList.UNIT) ? unitDic[firstItemInList.UNIT].ToString() : ""; string unitId = unitDic2.ContainsKey(firstItemInList.UNIT) ? unitDic2[firstItemInList.UNIT].ToString() : "";
if (basEbomHs.All(x => x.material_id != material.id && x.version != firstItemInList.HVERSION)) if (basEbomHs.All(x => x.material_id != material.id && x.version != firstItemInList.HVERSION))
{ {
BasEbomH basEbomH = new BasEbomH() BasEbomH basEbomH = new BasEbomH()

6781
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

File diff suppressed because it is too large Load Diff