新增监控状态权限配置管理

.gitignore

@@ -330,4 +330,5 @@ ASALocalRun/
 .mfractor/
 
 */bin
-*/obj
\ No newline at end of file
+*/obj
+/Bailun.CodeGenerator.Web

Bailun.Oms.WindowsService/Task/JobManager.cs

@@ -75,7 +75,8 @@ namespace Bailun.Oms.WindowsService.Task
                 .Build();//创建一个作业
             ITrigger MonitorOrderSalesJobTrigger = TriggerBuilder.Create()
                 .WithIdentity("MonitorOrderSaleTrigger", "SynchronizeOrderSale")
-                .WithCronSchedule("0 0 1 * * ? *")        //每天凌晨一点执行
+                .StartNow()
+                .WithCronSchedule("0 0 23 * * ? *")        //每天晚上十一点执行
                 .Build();
             scheduler.ScheduleJob(MonitorOrderSalesJob, MonitorOrderSalesJobTrigger);       //把作业，触发器加入调度器。 
             #endregion

Bailun.Oms.WindowsService/Task/SynchronizeOrderSalesService.cs

@@ -43,7 +43,9 @@ namespace Bailun.Oms.WindowsService.Task
         }
         public override void Execute(IJobExecutionContext context)
         {
+            Logger.Info("SynchronizeOrderSaleInMonitor自动采购单监控列表sku销量统计开始");
             _purchaseProductAppService.SynchronizeOrderSaleInMonitor();
+            Logger.Info("SynchronizeOrderSaleInMonitor自动采购单监控列表sku销量统计结束");
         }
     }
 

Bailun.Statistics.Application/OrderList/OrderAppService.cs

@@ -1728,7 +1728,7 @@ namespace Bailun.Statistics.Application.OrderList
                                 //_orderShippingDomainService.AddOrderShippings(item);
                                 var ordershipinfo = _orderShippingDomainService.AddOrUpdateOrderShippingInfo(item, "");
                                 DateTime? outtime = Convert.ToDateTime("1990-01-01");
-                                if (ordershipinfo != null&&ordershipinfo.OutWarehouseTime!=null)
+                                if (ordershipinfo != null && ordershipinfo.OutWarehouseTime != null)
                                 {
                                     outtime = ordershipinfo.OutWarehouseTime;
                                 }
@@ -2573,7 +2573,7 @@ namespace Bailun.Statistics.Application.OrderList
 
                                         //先新增订单发货信息，避免拆分订单时，还未获取到发货信息，无法匹配发货仓库
                                         //var orderShipping = _orderShippingDomainService.AddOrUpdateOrderShippingInfo(oriOrderResult.OrderNoSystem, oriOrderResult.ShipWarehouse);
-                                        
+
                                         //拆分订单sku
                                         SplitOrderProduct(oriOrderResult, null);
 
@@ -3552,11 +3552,11 @@ namespace Bailun.Statistics.Application.OrderList
             {
                 return new OutputResult<string>() { IsSuccessed = false, Message = "仓库编码为空！" };
             }
-            if (model.data.Count>0)
+            if (model.data.Count > 0)
             {
-                foreach(var item in model.data)
+                foreach (var item in model.data)
                 {
-                    if (item.ShipWarehouseCode.ToLower() != model.WareHouseCode.ToLower())
+                    if (item.ShipWarehouseCode != model.WareHouseCode)
                     {
                         ExcuteUpdateProductWarehouse(item, model.WareHouseCode);
                     }
@@ -3589,7 +3589,7 @@ namespace Bailun.Statistics.Application.OrderList
                 oldwarehousecode = model.ShipWarehouseCode
             });
 
-            int result=_orderProductRepository.ExecuteSqlCommand($"update t_order_product set ShipWarehouseCode =@ShipWarehouseCode,UpdateTime=Now() where Hid=@Hid and ProductCode=@ProductCode", new List<MySqlParameter>()
+            int result = _orderProductRepository.ExecuteSqlCommand($"update t_order_product set ShipWarehouseCode =@ShipWarehouseCode,UpdateTime=Now() where Hid=@Hid and ProductCode=@ProductCode", new List<MySqlParameter>()
             {
                 new MySqlParameter()
                 {

Bailun.Statistics.Application/OrderList/OrderProductService.cs

@@ -686,7 +686,7 @@ namespace Bailun.Statistics.Application.OrderApi
                                  from t_order_product t1 
                                 LEFT JOIN t_order_shipping t3 on t1.Hid = t3.Hid
                                 LEFT JOIN t_order_original t2  on t2.Hid = t1.Hid 
-                                where  t2.IsSystemShip = 1 and t2.InterceptStatus!=1 and t2.OrderStatus not in ('已取消') and (t1.ShipWarehouseCode = '' or t1.ShipWarehouseCode is null) and (t2.ShipWarehouse ='' or t2.ShipWarehouse is null)");
+                                where  t2.IsSystemShip = 1 and t2.InterceptStatus!=1 and t2.OrderStatus not in ('已取消') and (t1.ShipWarehouseCode = '' or t1.ShipWarehouseCode is null)");
             var orderskuList = _orderProductRepository.FindList<OrderSkuDto>(sqlstr.ToString(), null, 2000);
             var skulist = orderskuList.Where(d => d.CategoryId == 0).ToList();
             List<OrderProduct> pmsProductList = new List<OrderProduct>();

Bailun.Statistics.Application/PurchaseAdvice/PurchaseProductAppService.cs

@@ -484,7 +484,7 @@ namespace Bailun.Statistics.Application.PurchaseAdvice
                 _purchaseMonitorRepository.Update(purchaseMonitorModel.Id, d =>
                 {
                     d.UpdateTime = DateTime.Now;
-                    d.UpdateName = "系统更新";
+                    d.UpdateName = "系统任务更新";
                 });
             }
         }

Bailun.Statistics.Domain/PurchaseAdvice/PurchaseMonitorDomainService.cs

@@ -815,8 +815,8 @@ namespace Bailun.Statistics.Domain.PurchaseAdvice
                     actualQuantity += turnoverDto.SupplierShipQuantity.Value;
                 if (turnoverDto.NoWarehousingQuantity != null)//待入库数
                     actualQuantity += turnoverDto.NoWarehousingQuantity.Value;
-                if (turnoverDto.ProcessStock != null)//wms在途数
-                    actualQuantity += turnoverDto.ProcessStock.Value;
+                //if (turnoverDto.ProcessStock != null)//wms在途数
+                //    actualQuantity += turnoverDto.ProcessStock.Value;
                 if (turnoverDto.AvailableStock != null)//可配库存数
                     actualQuantity += turnoverDto.AvailableStock.Value;
 
@@ -832,8 +832,8 @@ namespace Bailun.Statistics.Domain.PurchaseAdvice
                     actualQuantity += turnoverDto.SupplierShipQuantity.Value;
                 if (turnoverDto.NoWarehousingQuantity != null)//待入库数
                     actualQuantity += turnoverDto.NoWarehousingQuantity.Value;
-                if (turnoverDto.ProcessStock != null)//wms在途数
-                    actualQuantity += turnoverDto.ProcessStock.Value;
+                //if (turnoverDto.ProcessStock != null)//wms在途数
+                //    actualQuantity += turnoverDto.ProcessStock.Value;
                 if (turnoverDto.AvailableStock != null)//可配库存数
                     actualQuantity += turnoverDto.AvailableStock.Value;
                 //待调拨数+调拨在途数

Bailun.Statistics.Web/Areas/OrderList/Controllers/OrderController.cs

@@ -426,7 +426,7 @@ namespace Bailun.Statistics.Web.Areas.OrderList.Controllers
                     delayTimeStr.Append($"{delayHours}小时");
                     item.DelayDays = delayTimeStr.ToString();
                 }
-                item.OrderCountQuantity = item.OrderQuantity.ToInt() + item.SupplierShipQuantity + item.NoWarehousingQuantity + item.WaitTransferQuantity + item.TransferOnWayQuantity + item.WmsProcessStock;
+                item.OrderCountQuantity = item.OrderQuantity.ToInt() + item.SupplierShipQuantity + item.NoWarehousingQuantity + item.WaitTransferQuantity + item.TransferOnWayQuantity;
                 if (purlist.Any())
                 {
                     item.PurchaseModel = purlist.Where(d => d.ProductCode == item.ProductCode && d.WareHouseCode == item.ShipWarehouseCode).OrderBy(d => d.CreateTime).FirstOrDefault();
@@ -507,7 +507,7 @@ namespace Bailun.Statistics.Web.Areas.OrderList.Controllers
                         delayTimeStr.Append($"{delayHours}小时");
                         item.DelayDays = delayTimeStr.ToString();
                     }
-                    item.OrderCountQuantity = item.OrderQuantity.ToInt() + item.SupplierShipQuantity + item.NoWarehousingQuantity + item.WaitTransferQuantity + item.TransferOnWayQuantity + item.WmsProcessStock;
+                    item.OrderCountQuantity = item.OrderQuantity.ToInt() + item.SupplierShipQuantity + item.NoWarehousingQuantity + item.WaitTransferQuantity + item.TransferOnWayQuantity;
                     if (purlist.Any())
                     {
                         item.PurchaseModel = purlist.Where(d => d.ProductCode == item.ProductCode && d.WareHouseCode == item.ShipWarehouseCode).OrderBy(d => d.CreateTime).FirstOrDefault();

Bailun.Statistics.Web/Areas/PurchaseAdvice/Controllers/PurchaseMonitorController.cs

@@ -24,6 +24,7 @@ using System;
 using Abp.Web.Mvc.Models;
 using Abp.Web.Models;
 using Bailun.Statistics.Domain.BaseData;
+using Bailun.Abp.Extension.Runtime;
 
 namespace Bailun.Statistics.Web.Areas.PurchaseAdvice.Controllers
 {
@@ -43,6 +44,13 @@ namespace Bailun.Statistics.Web.Areas.PurchaseAdvice.Controllers
         // GET: OrderStatistics/SellStatistics
         public ActionResult Index()
         {
+            bool ismonitor = false;
+            var MonitorRole = ConfigurationManager.AppSettings["MonitorRole"];
+            if (MonitorRole.Contains(AbpSession.GetUserName()))
+            {
+                ismonitor = true;
+            }
+            ViewData["ismonitor"] = ismonitor;
             return View("PurchaseMonitorIndex");
         }
         public ActionResult ManualOrderIndex()

Bailun.Statistics.Web/Areas/PurchaseAdvice/Views/PurchaseMonitor/PurchaseMonitorIndex.cshtml

 @{
     ViewBag.Title = "产品周转分析";
     Layout = "~/Views/Shared/_Index.cshtml";
+    bool ismonitor = (bool)ViewData["ismonitor"];
 }
 <link rel="stylesheet" href="~/Content/scripts/zTree/zTreeStyle.css" type="text/css">
 <style>
@@ -127,13 +128,15 @@
                 <div class="btn-group">
                     <a class="btn btn-primary" onclick="selectFields()"><i class="fa fa-list"></i>&nbsp;<span id="sp_hide_field">我要选列</span></a>
                 </div>
-
-                <div class="btn-group">
-                    <a class="btn btn-default" onclick="stopMonitor(1)"><i class="fa fa-hand-pointer-o"></i>&nbsp;<span>停止监控</span></a>
-                </div>
-                <div class="btn-group">
-                    <a class="btn btn-default" onclick="stopMonitor(2)"><i class="fa fa-hand-pointer-o"></i>&nbsp;<span>开启监控</span></a>
-                </div>
+                @if (ismonitor)
+                {
+                    <div class="btn-group">
+                        <a class="btn btn-default" onclick="stopMonitor(1)"><i class="fa fa-hand-pointer-o"></i>&nbsp;<span>停止监控</span></a>
+                    </div>
+                    <div class="btn-group">
+                        <a class="btn btn-default" onclick="stopMonitor(2)"><i class="fa fa-hand-pointer-o"></i>&nbsp;<span>开启监控</span></a>
+                    </div>
+                }
                 <div class="btn-group">
                     <a class="btn btn-danger" onclick="clearOutOrders()"><i class="fa fa-hand-pointer-o"></i>&nbsp;<span>清除出单数据</span></a>
                 </div>

Bailun.Statistics.Web/Web.config

@@ -117,6 +117,8 @@
     <add key="ApiCenter" value="http://api.sku.bailuntec.com" />
     <add key="ApiCenAppId" value="SystemOMS" />
     <add key="ApiCenAppKey" value="YmFpbHVuT01T" />
+    <!--监控状态控制权限人员-->
+    <add key="MonitorRole" value="林红英,胡敏,李志洪,李静雯,罗杰森,陈杰森,王万昌" />
   </appSettings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />