同上

Bailun.DC.Services/OrdersServices.cs

@@ -4628,10 +4628,27 @@ namespace Bailun.DC.Services
         /// <param name="max">差异结束值</param>
         /// <param name="sku">sku编码</param>
         /// <returns></returns>
-        public List<dc_mid_skudeliver_weighdiff> ListWeighDiff(DateTime? start, DateTime? end, int? min, int? max, string sku)
+        public List<dc_mid_skudeliver_weighdiff> ListWeighDiff(DateTime? start, DateTime? end, int? min, int? max, string sku, string warehousetype, string warehousecode)
         {
             var sqlparam = new DynamicParameters();
-            var sql = @"select * from dc_mid_skudeliver_weighdiff where 1=1 ";
+            var sql = @"select t1.*,t3.warehouse_name from dc_mid_skudeliver_weighdiff t1 ";
+
+            sql += " join dc_base_oms_pick t2 on t1.pick_order_id=t2.pick_order_id and t1.bailun_sku=t2.bailun_sku ";
+            sql += " join dc_base_warehouse t3 on t2.warehouse_code=t3.warehouse_code ";
+
+            if (!string.IsNullOrWhiteSpace(warehousetype))
+            {
+                sql += " and t3.hq_type=@warehousetype";
+                sqlparam.Add("warehousetype", warehousetype);
+            }
+
+            if (!string.IsNullOrWhiteSpace(warehousecode))
+            {
+                sql += " and t3.warehouse_code=@warehousecode";
+                sqlparam.Add("warehousecode", warehousecode);
+            }
+
+            sql += " where t1.id>0 ";
 
             if (start.HasValue)
             {