bug

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/ErpEntity/BomList.cs

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

ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs

@@ -778,7 +778,7 @@ namespace Tnb.ProductionMgr
                 string[] tables = new[] { "base_dictionarydata", "bas_material" };
                 var erpdb = _db.AsTenant().GetConnection("erpdb");
                 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>()
                     .Where(x => tables.Contains(x.table_name)).ToListAsync();
                 Dictionary<string, object> unitDic = await _db.Queryable<DictionaryDataEntity>()
@@ -923,7 +923,7 @@ namespace Tnb.ProductionMgr
                     BomList firstItemInList = itemList[0];
                     BasMaterial material = materials.Find(x => x.code==firstItemInList.MPRODID);
                     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))
                     {
                         BasEbomH basEbomH = new BasEbomH()