盘点单接口 报表优化

WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs

@@ -218,11 +218,14 @@ namespace Tnb.WarehouseMgr
             }
 
             IEnumerable<dynamic> result = null;
-            
+
             result = await _db.Queryable<WmsOutinStockDetail>()
                 .InnerJoin<WmsOutinStockCode>((a, b) => a.id == b.bill_d_id)
                 .InnerJoin<BasWarehouse>((a, b, c) => a.warehouse_id == c.id)
-                .Select((a,b,c) => new
+                .InnerJoin<BasMaterial>((a, b, c, d) => b.material_id == d.id)
+                .WhereIF(!string.IsNullOrEmpty(code_batch), (a, b, c, d) => b.code_batch.Contains(code_batch))
+                .WhereIF(!string.IsNullOrEmpty(material_specification), (a, b, c, d) => b.material_specification.Contains(material_specification))
+                .Select((a, b, c) => new
                 {
                     act_start_date = a.act_start_date,
                     act_end_date = a.act_end_date,