发货重量差异报表增加发货仓库筛选条件

Bailun.DC.Services/OrdersServices.cs

@@ -4553,40 +4553,60 @@ namespace Bailun.DC.Services
         /// <param name="sku">sku编码</param>
         /// <param name="total">符合条件的记录数</param>
         /// <returns></returns>
-        public List<dc_mid_skudeliver_weighdiff> ListWeighDiff(BtTableParameter request, DateTime? start, DateTime? end, int? min, int? max, string sku, ref int total)
+        public List<dc_mid_skudeliver_weighdiff> ListWeighDiff(BtTableParameter request, DateTime? start, DateTime? end, int? min, int? max, string sku, ref int total,string warehousetype,string warehousecode)
         {
             var sqlparam = new DynamicParameters();
-            var sql = @"select * from dc_mid_skudeliver_weighdiff where 1=1 ";
+            var sql = @"select t1.* from dc_mid_skudeliver_weighdiff t1 ";
+
+            if (!string.IsNullOrWhiteSpace(warehousetype) || !string.IsNullOrWhiteSpace(warehousecode))
+            {
+                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 += " t3.warehouse_code=@warehousecode";
+                    sqlparam.Add("warehousecode", warehousecode);
+                }
+            }
+
+            sql += " where t1.id>0 ";
 
             if (start.HasValue)
             {
-                sql += " and day>=@start";
+                sql += " and t1.day>=@start";
                 sqlparam.Add("start", start.Value);
             }
             if (end.HasValue)
             {
-                sql += " and day<@end";
+                sql += " and t1.day<@end";
                 sqlparam.Add("end", end.Value.AddDays(1));
             }
             if (min.HasValue)
             {
-                sql += " and diffweigh>=@min";
+                sql += " and t1.diffweigh>=@min";
                 sqlparam.Add("min", min.Value);
             }
             if (max.HasValue)
             {
-                sql += " and diffweigh<@max";
+                sql += " and t1.diffweigh<@max";
                 sqlparam.Add("max", max.Value);
             }
             if (!string.IsNullOrEmpty(sku))
             {
-                sql += " and bailun_sku=@sku";
+                sql += " and t1.bailun_sku=@sku";
                 sqlparam.Add("sku", sku.Trim());
             }
 
             if (!string.IsNullOrEmpty(request.sort))
             {
-                sql += (" order by " + request.sort + " " + request.order);
+                sql += (" order by t1." + request.sort + " " + request.order);
             }
 
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))

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

@@ -98,10 +98,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <param name="max">差异结束值</param>
         /// <returns></returns>
         [BailunAuthentication(LoginMode.Enforce)]
-        public string ListSkuDiffWeighJson(BtTableParameter parameter, string sku, DateTime? shipstart, DateTime? shipend, int? min, int? max)
+        public string ListSkuDiffWeighJson(BtTableParameter parameter, string sku, string warehousetype,string warehousecode,DateTime? shipstart, DateTime? shipend, int? min, int? max)
         {
             var total = 0;
-            var obj = new Services.OrdersServices().ListWeighDiff(parameter, shipstart, shipend, min, max, sku, ref total).Select(a=>new {
+            var obj = new Services.OrdersServices().ListWeighDiff(parameter, shipstart, shipend, min, max, sku, ref total, warehousetype,warehousecode).Select(a=>new {
                 a.bailun_sku,
                 a.bailun_sku_outbound_weight,
                 day = a.day.ToString("yyyy-MM-dd"),

Bailun.DC.Web/Areas/Reports/Views/Sku/ListSkuDiffWeigh.cshtml

@@ -21,7 +21,23 @@
                         <input id="min" name="min" type="number" class="form-control" style="width:140px" placeholder="差异范围开始值" />
                         <span>至</span>
                         <input id="max" name="max" type="number" class="form-control" style="width:140px" placeholder="差异范围结束值" />
-                    </div> 
+                    </div>
+                    <div class="form-group">
+                        <label>仓库类型：</label>
+                        <select id="warehousetype" name="warehousetype" class="form-control">
+                            <option value="">选择仓库类型</option>
+                            <option value="国内仓">国内仓</option>
+                            <option value="海外仓">海外仓</option>
+                            <option value="FBA仓">FBA仓</option>
+                            <option value="第三方仓库">第三方仓库</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label>仓库：</label>
+                        <select id="warehousecode" name="warehousecode" class="form-control" style="width:160px;">
+                            <option value="">选择仓库</option>
+                        </select>
+                    </div>
                     <div class="form-group">
                         <label>sku</label>
                         <input type="text" id="sku" name="sku" class="form-control" style="width:130px" placeholder="sku编码" />
@@ -48,6 +64,10 @@
             laydate.render({ elem: '#shipstart' });
             laydate.render({ elem: '#shipend' });
             list();
+
+            $('#warehousetype').change(function () {
+                listwarehouse();
+            })
         })
 
         function list() {
@@ -82,6 +102,24 @@
             }
         }
 
+        function listwarehouse() {
+            var type = $('#warehousetype').val();
+
+            $.submit({
+                url: '@Url.Content("~/Home/ListWarehouseFromStockAndSales")',
+                paramData: 'warehousetype=' + type,
+                type:'POST',
+                func: function (result) {
+                    if (result != null && result != undefined) {
+                        $('#warehousecode').html('<option value="">仓库不限</option>');
+                        for (var i = 0; i < result.length; i++) {
+                            $('#warehousecode').append('<option value="' + result[i].warehouse_code + '">' + result[i].warehouse_name + '</option>');
+                        }
+                    }
+                }
+            })
+        }
+
         function exportxls() {
             window.open("@Url.Content("~/Reports/Sku/ExportSkuDiffWeigh")" + '?' + $("#toolbar").serialize(), '_blank');
         }