耗材入库

Property.Modele.FixedAssets/PropertyModule.cs

@@ -2040,7 +2040,7 @@ namespace Property.Module.FixedAssets
                 //推送消息
                 if (sendAccount.Any())
                 {
-                    PushAuditMessage(sendAccount, demodel.Id, "您有待审核的耗材入库信息", "耗材审核通知", userInfo.EmployeeId, SysTemPushTypeEnum.PropertyAudit);
+                    PushAuditMessage(sendAccount, demodel.Id, "您有待审核的耗材入库信息", "耗材审核通知", userInfo.EmployeeId, SysTemPushTypeEnum.SuppliesAudit);
                 }
 
                 return ApiResult.Success("流程生成成功");
@@ -2060,9 +2060,13 @@ namespace Property.Module.FixedAssets
         public void PushAuditMessage(List<EmAccoutIdModel> account, int workFlowId, string content, string title, int? empId, SysTemPushTypeEnum type)
         {
             //Dictionary<string, object> appExtras = new Dictionary<string, object>();
+            string url = "";
+            if (type == SysTemPushTypeEnum.PropertyAudit) {
+                url = "AssetsShenpi?Id=" + workFlowId + "&compType=shenpi";
+            }
             Dictionary<string, object> webExtras = new Dictionary<string, object>
             {
-                { "jumpUrl", "AssetsShenpi?Id=" + workFlowId + "&compType=shenpi" }
+                { "jumpUrl", url }
             };
             //appExtras.Add("jumpUrl", "vt://financeApprovalDetail/view?ID=" + workFlowId + "&Conditon=3&Source=message&Type=" + Type);
 

Property.Modele.FixedAssets/WorkFlowModule.cs

@@ -2434,9 +2434,13 @@ namespace Property.Module.FixedAssets
         public void PushAuditMessage(List<EmAccoutIdModel> account, int workFlowId, string content, string title, int? empId, SysTemPushTypeEnum type)
         {
             //Dictionary<string, object> appExtras = new Dictionary<string, object>();
+            string url = "";
+            if (type == SysTemPushTypeEnum.PropertyAudit) {
+                url = "AssetsShenpi?Id=" + workFlowId + "&compType=shenpi";
+            }
             Dictionary<string, object> webExtras = new Dictionary<string, object>
             {
-                { "jumpUrl", "AssetsShenpi?Id=" + workFlowId + "&compType=shenpi" }
+                { "jumpUrl", url }
             };
             //appExtras.Add("jumpUrl", "vt://financeApprovalDetail/view?ID=" + workFlowId + "&Conditon=3&Source=message&Type=" + Type);
 

Property.Repository/Supplies/RB_Supplies_StockInRepository.cs

@@ -58,6 +58,9 @@ namespace Property.Repository
             if (dmodel.FinanceId > 0) {
                 where += " and p.FinanceId =" + dmodel.FinanceId;
             }
+            if (dmodel.StockInState > 0) {
+                where += " and ss." + nameof(RB_Supplies_StockIn_Extend.StockInState) + "=" + (int)dmodel.StockInState;
+            }
             
             string sql = $@" select ss.*,sw.Name as WareHouseName,p.FinanceId from RB_Supplies_StockIn ss
 left join rb_supplies_warehouse sw on ss.WarehouseId=sw.Id