调整物流供应商往来服务

Bailun.DC.DailyLogisticSupplierTransaction/Services.cs

@@ -56,9 +56,10 @@ namespace Bailun.DC.DailyLogisticSupplierTransaction
             }
         }
 
-        List<string> arrSanTong = new List<string> { "SPRING", "华得士国际货运代理有限公司", "DHL eCommerce (HK) Ltd", "Globavend", "华得士国际货运代理有限公司(中法)", "DHL  ECOMMERCE", "中国邮政集团公司广州市分公司", "华得士国际货运代理有限公司(西班牙)", "华得士国际货运代理有限公司(意大利)", "VALUE ADD SERVICE LIMITED（D）", "金羊城国际物流代理有限公司（T）", "深圳大森林国际货运代理有限公司（T）", "深圳市乐递供应链有限公司（T）", "深圳昊泽货运代理有限公司（T）", "深圳市天纵供应商管理有限公司（T）", "中外运－敦豪广东分公司（T）", "优比速包裹运送（广东）有限公司（T）", "天地国际运输代理（中国）有限公司广州分公司（T）", "HK TWELVE INTERNATIONAL CO., LIMITED（T）", "香港宇通供应链科技有限公司" };
-        List<string> arrXingXing = new List<string> { "WMS-物流账单出纳页面-备注（直发）", "WMS-物流账单出纳页面-备注（调拨）" };
+        List<string> arrSanTong = new List<string> { "SPRING", "华得士国际货运代理有限公司", "DHL eCommerce (HK) Ltd", "Globavend", "华得士国际货运代理有限公司(中法)", "DHL  ECOMMERCE", "中国邮政集团公司广州市分公司", "华得士国际货运代理有限公司(西班牙)", "华得士国际货运代理有限公司(意大利)", "VALUE ADD SERVICE LIMITED（D）", "金羊城国际物流代理有限公司（T）", "深圳大森林国际货运代理有限公司（T）", "深圳市乐递供应链有限公司（T）", "深圳昊泽货运代理有限公司（T）", "深圳市天纵供应商管理有限公司（T）", "中外运－敦豪广东分公司（T）", "优比速包裹运送（广东）有限公司（T）", "天地国际运输代理（中国）有限公司广州分公司（T）", "HK TWELVE INTERNATIONAL CO., LIMITED（T）", "香港宇通供应链科技有限公司", "深圳市天纵供应商管理有限公司", "香港杜斯塔克科技有限公司" };
+        List<string> arrMidland = new List<string> { "Midlands Associates Ltd", "Midlands Associates Ltd（B）" };
         List<string> arrHuaYu = new List<string> { "橙联平台充值", "江苏天地华宇物联科技有限公司" };
+        List<string> arrRongHeng = new List<string> { "深圳荣恒国际物流有限公司（美金）", "深圳荣恒国际物流有限公司（人民币）", "深圳荣恒国际物流有限公司" };
 
         public void Init(DateTime day)
         {
@@ -177,14 +178,14 @@ group by t1.receive_unit";
                 lastupdateusername = "admin"
             };
 
-            //合并猩猩国际的数据
-            var objXingXing = list.Where(a => arrXingXing.Contains(a.suppliername)).ToList();
-            var tempXingXing = new dc_daily_logistics_supplier_transaction {
-                amount_happen = objXingXing.Count>0?objXingXing.Sum(a=>a.amount_happen):0,
-                amount_pay = objXingXing.Count>0?objXingXing.Sum(a=>a.amount_pay):0,
-                amount_receipt = objXingXing.Count>0?objXingXing.Sum(a=>a.amount_receipt):0,
-                amount_other = objXingXing.Count>0?objXingXing.Sum(a=>a.amount_other):0,
-                suppliername = "深圳猩猩国际供应链科技有限公司",
+            //合并Midland国际的数据
+            var objMidland = list.Where(a => arrMidland.Contains(a.suppliername)).ToList();
+            var tempMidland = new dc_daily_logistics_supplier_transaction {
+                amount_happen = arrMidland.Count>0? objMidland.Sum(a=>a.amount_happen):0,
+                amount_pay = arrMidland.Count>0? objMidland.Sum(a=>a.amount_pay):0,
+                amount_receipt = arrMidland.Count>0? objMidland.Sum(a=>a.amount_receipt):0,
+                amount_other = arrMidland.Count>0? objMidland.Sum(a=>a.amount_other):0,
+                suppliername = "Midlands Associates",
                 supplierid = 0,
                 amount_end = 0,
                 amount_start = 0,
@@ -215,13 +216,34 @@ group by t1.receive_unit";
 
             };
 
-            //去除三通、华宇和猩猩的子公司数据
-            list = list.Where(a => !arrSanTong.Contains(a.suppliername) && !arrXingXing.Contains(a.suppliername) && !arrHuaYu.Contains(a.suppliername)).ToList();
+            var objRongHeng = list.Where(a => arrRongHeng.Contains(a.suppliername)).ToList();
+            var tempRongHeng = new dc_daily_logistics_supplier_transaction
+            {
+                amount_happen = objRongHeng.Count > 0 ? objRongHeng.Sum(a => a.amount_happen) : 0,
+                amount_pay = objRongHeng.Count > 0 ? objRongHeng.Sum(a => a.amount_pay) : 0,
+                amount_receipt = objRongHeng.Count > 0 ? objRongHeng.Sum(a => a.amount_receipt) : 0,
+                amount_other = objRongHeng.Count > 0 ? objRongHeng.Sum(a => a.amount_other) : 0,
+
+                suppliername = "深圳荣恒国际物流有限公司",
+                supplierid = 0,
+                amount_end = 0,
+                amount_start = 0,
+                createtime = DateTime.Now,
+                day = list.FirstOrDefault().day,
+                lastupdatetime = DateTime.Now,
+                lastupdateuserid = 0,
+                lastupdateusername = "admin"
+
+            };
+
+            //去除三通、华宇、荣恒的子公司数据
+            list = list.Where(a => !arrSanTong.Contains(a.suppliername) && !arrMidland.Contains(a.suppliername) && !arrHuaYu.Contains(a.suppliername) && !arrRongHeng.Contains(a.suppliername)).ToList();
 
-            //增加三通、华宇、猩猩国籍数据到列表
+            //增加三通、华宇、荣恒数据到列表
             list.Add(tempSanTong);
-            list.Add(tempXingXing);
+            list.Add(tempMidland);
             list.Add(tempHuaYu);
+            list.Add(tempRongHeng);
 
 
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))

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

@@ -49,7 +49,7 @@
                     </div>
                     <div class="form-group">
                         <label>采购员名称：</label>
-                        <input id="buyername" name="buyername" class="form-control" style="width:120px"/>
+                        <input id="buyername" name="buyername" class="form-control" style="width:120px" placeholder="采购员名称" />
                     </div>
                     <div class="form-group">
                         <label>&nbsp;</label>