点巡检报表 设备维修复核

ProductionMgr/Tnb.ProductionMgr/PrdRawMaterialBarcodeService.cs

@@ -87,6 +87,7 @@ namespace Tnb.ProductionMgr
                 .WhereIF(!string.IsNullOrEmpty(equipTypeId),(a,b,c)=>c.equip_type_id==equipTypeId)
                 .WhereIF(!string.IsNullOrEmpty(isUpdate),(a,b,c)=>a.is_update.ToString()==isUpdate)
                 .Where((a,b,c)=>a.type=="1")
+                .OrderBy((a,b,c,d)=>c.code)
                 .Select((a, b, c,d) => new PrdRawMaterialBarcodeListDto
                 {
                     id = a.id,
@@ -259,6 +260,7 @@ namespace Tnb.ProductionMgr
         public async Task<dynamic> AsyncMaterialWarhouse()
         {
             List<string> equipIds = await _db.Queryable<PrdRawMaterialBarcode>().Where(x=>x.type=="1").Select(x=>x.equip_id).ToListAsync();
+            // code JZGL开始的为料仓
             List<EqpEquipment> equipments = await _db.Queryable<EqpEquipment>().Where(x=>!equipIds.Contains(x.id) && x.code.StartsWith("JZGL")).ToListAsync();
 
             List<PrdRawMaterialBarcode> insertList = new List<PrdRawMaterialBarcode>();