增加调拨单号筛选

Bailun.DC.Services/OrdersServices.cs

@@ -7422,7 +7422,7 @@ namespace Bailun.DC.Services
         /// <param name="warehousecode"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        public List<dc_base_cost_first_finish> ListCostFirstJson(BtTableParameter request, string bailun_sku,string warehousetype, string warehousecode, int? type,ref int total)
+        public List<dc_base_cost_first_finish> ListCostFirstJson(BtTableParameter request, string transfer_order_id, string bailun_sku,string warehousetype, string warehousecode, int? type,ref int total)
         {
             var sql = "select t1.*,t2.warehouse_name from dc_base_cost_first_finish t1 join dc_base_warehouse t2 on t1.warehouse_code=t2.warehouse_code where 1=1 ";
             var sqlparam = new DynamicParameters();
@@ -7445,6 +7445,12 @@ namespace Bailun.DC.Services
                 sqlparam.Add("warehousecode", warehousecode);
             }
 
+            if(!string.IsNullOrEmpty(transfer_order_id))
+            {
+                sql += " and t1.transfer_order_id = @transfer_order_id";
+                sqlparam.Add("transfer_order_id", transfer_order_id);
+            }
+
             if(type.HasValue)
             {
                 sql += " and t1.exception_type=@type";

Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs

@@ -3839,12 +3839,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <param name="warehousecode">仓库编码</param>
         /// <param name="type">异常类型，0：正常，1：上升，2：下降</param>
         /// <returns></returns>
-        public string ListCostFirstFinishJson(BtTableParameter request, string bailun_sku,string warehousetype, string warehousecode, int? type)
+        public string ListCostFirstFinishJson(BtTableParameter request, string transfer_order_id, string bailun_sku,string warehousetype, string warehousecode, int? type)
         {
             var total = 0;
             var _service = new Services.OrdersServices();
 
-            var obj = _service.ListCostFirstJson(request, bailun_sku, warehousetype,warehousecode, type,ref total);
+            var obj = _service.ListCostFirstJson(request, transfer_order_id, bailun_sku, warehousetype,warehousecode, type,ref total);
 
             var list = obj.Select(a => new {
                 a.channel_order_id,

Bailun.DC.Web/Areas/Reports/Views/Orders/ListCostFirstFinish.cshtml

@@ -36,9 +36,14 @@
                             <option value="0">不变</option>
                         </select>
                     </div>
+                    
                     <div class="form-group">
                         <label>&nbsp;</label>
-                        <input id="bailun_sku" name="bailun_sku" class="form-control" style="width:130px" placeholder="请输入百伦sku编码" />
+                        <input id="transfer_order_id" name="transfer_order_id" class="form-control" style="width:130px" placeholder="调拨单号" />
+                    </div>
+                    <div class="form-group">
+                        <label>&nbsp;</label>
+                        <input id="bailun_sku" name="bailun_sku" class="form-control" style="width:130px" placeholder="请输入sku编码" />
                     </div>
                     <div class="form-group">
                         <label>&nbsp;</label>