功能调整

.gitignore

@@ -21,3 +21,4 @@ Property.WebApi/bin/
 Property.WebApi/obj/
 REBORN.DataAccess/obj/
 REBORN.DataHelper/obj/
+.vs/

Property.Modele.FixedAssets/PropertyModule.cs

@@ -1814,7 +1814,7 @@ namespace Property.Module.FixedAssets
             //Dictionary<string, object> appExtras = new Dictionary<string, object>();
             Dictionary<string, object> webExtras = new Dictionary<string, object>();
             
-            webExtras.Add("jumpUrl", "BasicDocuments?id=" + workFlowId + "&Conditon=3&Type=1" );
+            webExtras.Add("jumpUrl", "AssetsShenpi?Id=" + workFlowId + "&compType=shenpi");
             //appExtras.Add("jumpUrl", "vt://financeApprovalDetail/view?ID=" + workFlowId + "&Conditon=3&Source=message&Type=" + Type);
 
             //IMService.PushFinanceMessage(account, empId, content, title, type, SystemPushLogTypeEnum.XMApp, appExtras);

Property.Repository/Supplies/RB_Supplies_StockInRepository.cs

@@ -87,7 +87,7 @@ left join rb_supplies_material sm on ssd.SuppliesId=sm.Id
                 {
                     where += $@" and sid.SuppliesId in({dmodel.SuppliesIds})";
                 }
-                string sql = $@" SELECT sid.SuppliesId,DATE_FORMAT(si.StockInDate,'%Y-%m') AS StartTime,COUNT(0) AS SuppliesNumber
+                string sql = $@" SELECT sid.SuppliesId,DATE_FORMAT(si.StockInDate,'%Y-%m') AS StartTime,SUM(IFNULL(sid.Number,0)) AS SuppliesNumber
  FROM rb_supplies_stockin si
 LEFT JOIN rb_supplies_stockindetail sid on si.Id=sid.StockInId
 {where} and sid.`Status`=0 and si.`Status`=0 AND si.StockInState=1
@@ -109,7 +109,7 @@ GROUP BY sid.SuppliesId,DATE_FORMAT(si.StockInDate,'%Y-%m')";
                 {
                     where += $@" and sid.SuppliesId in({dmodel.SuppliesIds})";
                 }
-                string sql = $@" SELECT sid.SuppliesId,DATE_FORMAT(si.StockOutDate,'%Y-%m') AS StartTime,COUNT(0) AS SuppliesNumber
+                string sql = $@" SELECT sid.SuppliesId,DATE_FORMAT(si.StockOutDate,'%Y-%m') AS StartTime,SUM(IFNULL(sid.Number,0)) AS SuppliesNumber
  FROM rb_supplies_stockout si
 LEFT JOIN rb_supplies_stockoutdetail sid on si.Id=sid.StockOutId
 {where} and sid.`Status`=0 and si.`Status`=0 AND si.StockOutState=1

Property.WebApi/Controllers/Login/LoginController.cs

@@ -53,6 +53,10 @@ namespace Property.WebApi.Controllers.Login
             {
                 return ApiResult.ParamIsNull();
             }
+            if (Domain.Contains("zc"))
+            {
+                Domain = Domain.Replace("zc", "");//资产管理专用
+            }
             var gmodel = loginModule.GetGroupByDomain(new RB_Group_Extend { Domain = Domain }).FirstOrDefault();
             if (gmodel == null)
             {
@@ -160,7 +164,7 @@ namespace Property.WebApi.Controllers.Login
 
                     GroupName = GroupName,
                     GroupPic = GroupPic,
-                    Domain = Domain,
+                    Domain = "zc"+ Domain,
                     VersionsName = versionsName,
                     BranchName = BranchName,
                     DepartName = DepartName,

Property.WebApi/Startup.cs

@@ -42,7 +42,7 @@ namespace Property.WebApi
                 options.JsonSerializerOptions.PropertyNamingPolicy = null;
             });
 
-            services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(new[] { "http://www.test.com:8080", "http://www.test.com:8081", "http://www.test.com:8082" })));
+            services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(new[] { "http://www.test.com:8080", "http://www.test.com:8081", "http://www.test.com:8082", "http://zcyx.oytour.com" })));
             //services.AddCors(options =>
             //{
             //    options.AddPolicy("AllowCors",