{"Message":"1","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/项目表"},{"State":1,"Type":23,"Name":"TableView/View_任务工时统计"},{"State":1,"Type":1,"Name":"PCPage/任务列表"},{"State":1,"Type":1,"Name":"PCPage/项目岗位配置"},{"State":1,"Type":1,"Name":"PCPage/任务首页"},{"State":1,"Type":1,"Name":"PCPage/任务部分"},{"State":1,"Type":1,"Name":"PCPage/任务-基本信息"},{"State":1,"Type":1,"Name":"PCPage/任务-子任务列表"},{"State":1,"Type":1,"Name":"PCPage/任务-工时"},{"State":1,"Type":1,"Name":"PCPage/新增任务"},{"State":1,"Type":1,"Name":"PCPage/切换项目"},{"State":1,"Type":15,"Name":"ServerCommand/变更任务状态"},{"State":1,"Type":11,"Name":"UserService"},{"State":1,"Type":15,"Name":"ServerCommand/计算报工数据"},{"State":1,"Type":15,"Name":"ServerCommand/同步一个仓库到表"},{"State":1,"Type":15,"Name":"ServerCommand/同步仓库的所有提交"},{"State":1,"Type":15,"Name":"ServerCommand/任务发起流程前校验"},{"State":1,"Type":28,"Name":"ProcessItem/新增任务流程"},{"State":1,"Type":23,"Name":"TableView/任务平行视图"},{"State":1,"Type":1,"Name":"PCPage/项目代码"},{"State":3,"Type":15,"Name":"ServerCommand/新增任务"},{"State":3,"Type":16,"Name":"TaskScheduler/仓库新增事件"}],"Version":"v1"}
This commit is contained in:
超哥
@@ -61,7 +61,7 @@
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"GUID": "51d29667-c8fa-4ac7-9a80-84635b43c671",
|
||||
"GUID": "39dab506-e2ad-412b-9975-9de2594ff0c5",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
@@ -70,7 +70,7 @@
|
||||
"ColumnName": "项目ID"
|
||||
},
|
||||
{
|
||||
"GUID": "1178509c-4606-4631-9f47-3ac0c387dd5c",
|
||||
"GUID": "0bf5e3d4-b8b3-48de-af22-cd832c4b4483",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务名称",
|
||||
@@ -79,7 +79,7 @@
|
||||
"ColumnName": "任务名称"
|
||||
},
|
||||
{
|
||||
"GUID": "595928d5-c5e2-4a0b-b9c5-1fb1b6994092",
|
||||
"GUID": "e31a79b4-5df6-4605-bf94-041384467291",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务预算工时",
|
||||
@@ -88,7 +88,7 @@
|
||||
"ColumnName": "任务预算工时"
|
||||
},
|
||||
{
|
||||
"GUID": "39dd63aa-a9c6-4646-a0a1-d16bad89b4ce",
|
||||
"GUID": "a86844a7-eaa6-40df-bf96-e4e505bd9a5b",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务状态",
|
||||
@@ -97,7 +97,7 @@
|
||||
"ColumnName": "任务状态"
|
||||
},
|
||||
{
|
||||
"GUID": "0f951348-a489-4498-b0df-c01a04a35554",
|
||||
"GUID": "fa19a3b2-6f1b-4d06-b704-a21bc83a679c",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务状态",
|
||||
@@ -111,7 +111,7 @@
|
||||
"ColumnName": "任务状态文本"
|
||||
},
|
||||
{
|
||||
"GUID": "b8d887d3-7e95-450e-8c41-55fe618bee11",
|
||||
"GUID": "3e739d34-6043-4507-a64a-bfd99fdf804c",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
@@ -125,7 +125,7 @@
|
||||
"ColumnName": "严格模式"
|
||||
},
|
||||
{
|
||||
"GUID": "df02b131-76d0-4fc6-8c7d-4a2485886371",
|
||||
"GUID": "8a5fde98-bfd2-49ec-a770-a31211258766",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
@@ -139,7 +139,7 @@
|
||||
"ColumnName": "项目预算工时"
|
||||
},
|
||||
{
|
||||
"GUID": "518fccab-2ffd-47eb-a849-fc448c36ed5d",
|
||||
"GUID": "b00b7fc4-00f6-467b-9475-2d387b010d54",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
@@ -153,7 +153,7 @@
|
||||
"ColumnName": "项目预算费用"
|
||||
},
|
||||
{
|
||||
"GUID": "b1e1ddce-0b10-4c9e-876b-8168a0b1827e",
|
||||
"GUID": "c318a143-56b7-4628-b82c-467f4f506d43",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
@@ -167,7 +167,7 @@
|
||||
"ColumnName": "工时分配方式"
|
||||
},
|
||||
{
|
||||
"GUID": "4b56bc02-6a36-44c9-861b-ef6f83ba1e51",
|
||||
"GUID": "0a1b96c1-f955-4ce8-ae6d-3d1ce15d3ad3",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务类型",
|
||||
@@ -181,7 +181,7 @@
|
||||
"ColumnName": "提成系数"
|
||||
},
|
||||
{
|
||||
"GUID": "74dfdd5f-cf5c-4a78-b999-d362ed94b09d",
|
||||
"GUID": "797a4cf1-880a-4657-bd17-166491e52aa6",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "总计划工时",
|
||||
@@ -190,7 +190,7 @@
|
||||
"ColumnName": "总计划工时"
|
||||
},
|
||||
{
|
||||
"GUID": "561c6627-404a-4cd6-8110-221e757e6fde",
|
||||
"GUID": "77eb05f5-194d-42b2-8ed0-24fe75365b7b",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "总实际工时",
|
||||
@@ -214,7 +214,7 @@
|
||||
"NullFormulaValueQueryPolicy": 0,
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "de7afa1d5ff1408fb92f64a23e648572"
|
||||
"ID": "9f98969e7d3c42dc958ba4881eba224b"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
@@ -487,7 +487,7 @@
|
||||
}
|
||||
],
|
||||
"Comments": "项目成员设置的时薪",
|
||||
"ID": "c9ed015e-b153-4a1e-90f9-f2b77fd41e7f"
|
||||
"ID": "4c12665c-c607-436f-89b5-5b4635f5db8c"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
@@ -520,7 +520,7 @@
|
||||
}
|
||||
],
|
||||
"Comments": "项目岗位设置的时薪",
|
||||
"ID": "02ae84f0-3eff-43e7-a7a6-3e2edc3780f9"
|
||||
"ID": "f6f21cf9-4adc-4539-ae48-51452fc9915c"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
@@ -553,7 +553,7 @@
|
||||
}
|
||||
],
|
||||
"Comments": "成员用户的默认时薪",
|
||||
"ID": "31512194-2720-46c4-a700-bc507e1e321c"
|
||||
"ID": "affca115-f5d7-43b7-a084-917a09a0f706"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -570,13 +570,13 @@
|
||||
"ID": "eb0ba1839ebc4ec58750e971080fc72b"
|
||||
}
|
||||
],
|
||||
"ID": "60c0485a-c34d-4729-af35-6c8a1ba45269"
|
||||
"ID": "8f632eec-184f-4795-9152-56faa3200eb8"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "优先使用手动指定的提成金额",
|
||||
"ID": "d12bb755-e110-459f-b338-04f09e322ecd"
|
||||
"ID": "0235a465-641e-4804-ad1d-8b56aab31dd3"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -596,7 +596,7 @@
|
||||
"ID": "2eafc4d65af44d18adfcd21c68734df8"
|
||||
}
|
||||
],
|
||||
"ID": "71c0233d-4246-4440-84ac-e996ce1ad688"
|
||||
"ID": "973d5a24-b65c-49c7-8f51-ff5129355e80"
|
||||
}
|
||||
],
|
||||
"Comments": "计算成员的时薪"
|
||||
@@ -627,89 +627,12 @@
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.工时分配方式"
|
||||
"SerializeProperty": "=任务信息.任务状态"
|
||||
}
|
||||
},
|
||||
"value": "1"
|
||||
"value": "2"
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "个人工时情况",
|
||||
"TableValue": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"GUID": "1b238274-dd6b-4c25-82ac-9b61d4efba32",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "976cf4f1-2ec3-4537-8ca8-aac1d965131e"
|
||||
},
|
||||
"ColumnName": "任务ID"
|
||||
},
|
||||
{
|
||||
"GUID": "1f313c9e-4960-484d-984f-75ab3965ccf5",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "总计划工时",
|
||||
"GUID": "37b1cd46-749c-4870-9e65-639974e237b4"
|
||||
},
|
||||
"ColumnName": "总计划工时"
|
||||
},
|
||||
{
|
||||
"GUID": "bd3ba593-9a1e-4864-b038-670ae01756f1",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "总实际工时",
|
||||
"GUID": "58613864-7f3d-4ab2-9b2e-f1e1b7a86879"
|
||||
},
|
||||
"ColumnName": "总实际工时"
|
||||
}
|
||||
],
|
||||
"SqlCondition": {
|
||||
"$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
|
||||
"SubConditions": [
|
||||
{
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "b732175b-c55c-4a15-b703-223f45ab07a1"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务ID"
|
||||
}
|
||||
},
|
||||
{
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "执行人",
|
||||
"GUID": "4bd4f915-e792-4219-ad86-6602ef9080bd"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=执行人"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"ID": "bd1036451d524ce98a641c7eac350ccb",
|
||||
"Comments": "从视图统计项目的信息"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "个人工时余额",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=个人工时情况.总计划工时-个人工时情况.总实际工时"
|
||||
},
|
||||
"ID": "29e1c2c06f2e427bad0ccd1c37772485"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
"ConditionAndCommandPairList": [
|
||||
@@ -720,113 +643,305 @@
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=个人工时余额"
|
||||
"SerializeProperty": "=任务信息.工时分配方式"
|
||||
}
|
||||
},
|
||||
"value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=工时数"
|
||||
},
|
||||
"compareType": 4
|
||||
"value": "1"
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "核定工时",
|
||||
"ParameterName": "个人工时情况",
|
||||
"TableValue": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"GUID": "1b238274-dd6b-4c25-82ac-9b61d4efba32",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "976cf4f1-2ec3-4537-8ca8-aac1d965131e"
|
||||
},
|
||||
"ColumnName": "任务ID"
|
||||
},
|
||||
{
|
||||
"GUID": "1f313c9e-4960-484d-984f-75ab3965ccf5",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "总计划工时",
|
||||
"GUID": "37b1cd46-749c-4870-9e65-639974e237b4"
|
||||
},
|
||||
"ColumnName": "总计划工时"
|
||||
},
|
||||
{
|
||||
"GUID": "bd3ba593-9a1e-4864-b038-670ae01756f1",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "总实际工时",
|
||||
"GUID": "58613864-7f3d-4ab2-9b2e-f1e1b7a86879"
|
||||
},
|
||||
"ColumnName": "总实际工时"
|
||||
}
|
||||
],
|
||||
"SqlCondition": {
|
||||
"$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
|
||||
"SubConditions": [
|
||||
{
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "b732175b-c55c-4a15-b703-223f45ab07a1"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务ID"
|
||||
}
|
||||
},
|
||||
{
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "执行人",
|
||||
"GUID": "4bd4f915-e792-4219-ad86-6602ef9080bd"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=执行人"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"ID": "bd1036451d524ce98a641c7eac350ccb",
|
||||
"Comments": "从视图统计项目的信息"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "个人工时余额",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=个人工时情况.总计划工时-个人工时情况.总实际工时"
|
||||
},
|
||||
"ID": "bde7738eb3154f93a0e189ea107db3ea"
|
||||
"ID": "d4e74f0bc6954a9db41a98ed631026b8"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
"ConditionAndCommandPairList": [
|
||||
{
|
||||
"Condition": {
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=个人工时余额"
|
||||
}
|
||||
},
|
||||
"value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=工时数"
|
||||
},
|
||||
"compareType": 4
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "核定工时",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=个人工时情况.总计划工时-个人工时情况.总实际工时"
|
||||
},
|
||||
"ID": "bde7738eb3154f93a0e189ea107db3ea"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "核定工时说明",
|
||||
"ParameterValue": "个人工时余额不足，按剩余工时核定！",
|
||||
"ID": "58bcc74765f1449baceb214856d42160"
|
||||
}
|
||||
],
|
||||
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
|
||||
"ID": "23553190-286f-4cf3-991d-056e1f5e0046"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果分配到人头，则判断该人总计划工时还够不够",
|
||||
"ID": "2d3c9a6e-0e1f-4be2-a275-4a7ea63fe36a"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.工时分配方式"
|
||||
}
|
||||
},
|
||||
"value": "3"
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "任务工时情况",
|
||||
"TableValue": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"GUID": "88e5a9aa-873c-46c3-b76f-69a424956526",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "976cf4f1-2ec3-4537-8ca8-aac1d965131e"
|
||||
},
|
||||
"ColumnName": "任务ID"
|
||||
},
|
||||
{
|
||||
"GUID": "5fed6798-5151-4540-b566-d913b4615d93",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "总计划工时",
|
||||
"GUID": "37b1cd46-749c-4870-9e65-639974e237b4"
|
||||
},
|
||||
"ColumnName": "总计划工时"
|
||||
},
|
||||
{
|
||||
"GUID": "a30f02c0-4c0f-4308-a747-49bd5ac545dc",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "总实际工时",
|
||||
"GUID": "58613864-7f3d-4ab2-9b2e-f1e1b7a86879"
|
||||
},
|
||||
"ColumnName": "总实际工时"
|
||||
}
|
||||
],
|
||||
"SqlCondition": {
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "b732175b-c55c-4a15-b703-223f45ab07a1"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务ID"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ID": "9dac211ac8804f90a07ac0a1924d99ca",
|
||||
"Comments": "从视图统计项目的信息"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "核定工时说明",
|
||||
"ParameterValue": "个人工时余额不足，按剩余工时核定！",
|
||||
"ID": "58bcc74765f1449baceb214856d42160"
|
||||
"ParameterName": "任务工时余额",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务工时情况.总计划工时-任务工时情况.总实际工时"
|
||||
},
|
||||
"ID": "b8f71de2a6994493970617644965cf31"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
"ConditionAndCommandPairList": [
|
||||
{
|
||||
"Condition": {
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务工时余额"
|
||||
}
|
||||
},
|
||||
"value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=工时数"
|
||||
},
|
||||
"compareType": 4
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "核定工时",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务工时情况.总计划工时-任务工时情况.总实际工时"
|
||||
},
|
||||
"ID": "08d1a4cf3838487ea7f3a88f433c1b4a"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "核定工时说明",
|
||||
"ParameterValue": "任务工时余额不足，按剩余工时核定！",
|
||||
"ID": "8ebb8fba5ce4400ca854cb1156c86f66"
|
||||
}
|
||||
],
|
||||
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
|
||||
"ID": "129f7c42-0004-452e-b3c0-c474309dbf62"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
|
||||
"ID": "347f6c15-2879-4049-9c22-9b1fe9ac797d"
|
||||
"Comments": "如果是共用任务工时，则查看任务计划工时够不够",
|
||||
"ID": "82893b6d-1788-4486-8364-9d8c7b3f300a"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果分配到人头，则判断该人总计划工时还够不够",
|
||||
"ID": "4189a1c9-c394-4568-a101-a494d9410881"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.工时分配方式"
|
||||
}
|
||||
},
|
||||
"value": "3"
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "任务工时情况",
|
||||
"ParameterName": "项目统计信息",
|
||||
"TableValue": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"TableName": "View_项目统计信息",
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"GUID": "88e5a9aa-873c-46c3-b76f-69a424956526",
|
||||
"GUID": "5c1bf627-4570-41ca-b626-c506b3a2d24f",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "976cf4f1-2ec3-4537-8ca8-aac1d965131e"
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "项目预算费用",
|
||||
"GUID": "1f23c586-e318-41f8-9e2c-f9fc47949199"
|
||||
},
|
||||
"ColumnName": "任务ID"
|
||||
"ColumnName": "项目预算费用"
|
||||
},
|
||||
{
|
||||
"GUID": "5fed6798-5151-4540-b566-d913b4615d93",
|
||||
"GUID": "839f4ce0-15f4-4ac3-b60a-ac60f4f97665",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "总计划工时",
|
||||
"GUID": "37b1cd46-749c-4870-9e65-639974e237b4"
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "总成本",
|
||||
"GUID": "7c3a493f-d2ac-49b3-957f-7a772d5138bf"
|
||||
},
|
||||
"ColumnName": "总计划工时"
|
||||
},
|
||||
{
|
||||
"GUID": "a30f02c0-4c0f-4308-a747-49bd5ac545dc",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "总实际工时",
|
||||
"GUID": "58613864-7f3d-4ab2-9b2e-f1e1b7a86879"
|
||||
},
|
||||
"ColumnName": "总实际工时"
|
||||
"ColumnName": "总成本"
|
||||
}
|
||||
],
|
||||
"SqlCondition": {
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "b732175b-c55c-4a15-b703-223f45ab07a1"
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "0aa2d908-82fb-4233-a1e8-eb5a36cecaa2"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务ID"
|
||||
"SerializeProperty": "=任务信息.项目ID"
|
||||
}
|
||||
}
|
||||
},
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "9dac211ac8804f90a07ac0a1924d99ca",
|
||||
"ID": "65e64feb95fa49a69eff18abf13b2d81",
|
||||
"Comments": "从视图统计项目的信息"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "任务工时余额",
|
||||
"ParameterName": "预测本次产生成本",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务工时情况.总计划工时-任务工时情况.总实际工时"
|
||||
"SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)"
|
||||
},
|
||||
"ID": "b8f71de2a6994493970617644965cf31"
|
||||
"ID": "83e6abcf3cd543139068512f4079445a"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
@@ -838,240 +953,179 @@
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务工时余额"
|
||||
"SerializeProperty": "=预测本次产生成本+项目统计信息.总成本"
|
||||
}
|
||||
},
|
||||
"value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=工时数"
|
||||
"SerializeProperty": "=项目统计信息.项目预算费用"
|
||||
},
|
||||
"compareType": 4
|
||||
"compareType": 2
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "核定工时",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务工时情况.总计划工时-任务工时情况.总实际工时"
|
||||
},
|
||||
"ID": "4fafcec6dc9b424a9a9caff2cb9c43af"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "核定工时说明",
|
||||
"ParameterValue": "任务工时余额不足，按剩余工时核定！",
|
||||
"ID": "8ebb8fba5ce4400ca854cb1156c86f66"
|
||||
"$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
|
||||
"ErrorCode": "400",
|
||||
"Message": "该项目预算费用不足，为确保项目成本可控，请联系项目经理增加项目预算后再提交。",
|
||||
"CustomReturns": [
|
||||
{
|
||||
"ReturnPropertyName": "提交工时",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=工时数"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "核定工时",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "提成系数",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.提成系数"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "计算时薪",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=计算时薪"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "核定收益",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时*计算时薪*提成系数"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "时薪来源",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=时薪计算来源"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "核定工时说明",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时说明"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
|
||||
"ID": "0b981156-3a4e-4de7-930e-a6822be0525a"
|
||||
"ID": "a3c3f585-bd40-4e88-a513-02a355850bc0"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
|
||||
"ErrorCode": "0",
|
||||
"Message": "以下是本次报工的核定数据，请确认无误后提交",
|
||||
"CustomReturns": [
|
||||
{
|
||||
"ReturnPropertyName": "提交工时",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=工时数"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "核定工时",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "提成系数",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.提成系数"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "计算时薪",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=计算时薪"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "核定收益",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时*计算时薪*提成系数"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "时薪来源",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=时薪计算来源"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "核定工时说明",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时说明"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "7ea538ef-829c-44cc-b74a-261128ed5c8e"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果是共用任务工时，则查看任务计划工时够不够",
|
||||
"ID": "fcfde3f5-0254-416d-8ddd-0a3ab08323dc"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "项目统计信息",
|
||||
"TableValue": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"GUID": "75d4b655-e599-47e4-8c9c-a27eafa7a9cb",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "项目预算费用",
|
||||
"GUID": "1f23c586-e318-41f8-9e2c-f9fc47949199"
|
||||
},
|
||||
"ColumnName": "项目预算费用"
|
||||
},
|
||||
{
|
||||
"GUID": "4657e91e-3cd7-4a82-a79c-a0fab2e0cac9",
|
||||
"BindingInfo": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "总成本",
|
||||
"GUID": "7c3a493f-d2ac-49b3-957f-7a772d5138bf"
|
||||
},
|
||||
"ColumnName": "总成本"
|
||||
}
|
||||
],
|
||||
"SqlCondition": {
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "0aa2d908-82fb-4233-a1e8-eb5a36cecaa2"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.项目ID"
|
||||
}
|
||||
"ID": "984ece6b-a304-4ed3-b74a-f4468f884e7f"
|
||||
},
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "9d817f8a12e0490faa4817839ddd3330",
|
||||
"Comments": "从视图统计项目的信息"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "预测本次产生成本",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)"
|
||||
},
|
||||
"ID": "0b80da88679c4f178aa22d6333666401"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
"ConditionAndCommandPairList": [
|
||||
{
|
||||
"Condition": {
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=预测本次产生成本+项目统计信息.总成本"
|
||||
}
|
||||
},
|
||||
"value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目统计信息.项目预算费用"
|
||||
},
|
||||
"compareType": 2
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
|
||||
"ErrorCode": "400",
|
||||
"Message": "该项目预算费用不足，为确保项目成本可控，请联系项目经理增加项目预算后再提交。",
|
||||
"Message": "当前任务状态尚不允许报工",
|
||||
"CustomReturns": [
|
||||
{
|
||||
"ReturnPropertyName": "提交工时",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=工时数"
|
||||
}
|
||||
"ReturnPropertyName": "提交工时"
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "核定工时",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时"
|
||||
}
|
||||
"ReturnPropertyName": "核定工时"
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "提成系数",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.提成系数"
|
||||
}
|
||||
"ReturnPropertyName": "提成系数"
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "计算时薪",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=计算时薪"
|
||||
}
|
||||
"ReturnPropertyName": "计算时薪"
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "核定收益",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时*计算时薪*提成系数"
|
||||
}
|
||||
"ReturnPropertyName": "核定收益"
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "时薪来源",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=时薪计算来源"
|
||||
}
|
||||
"ReturnPropertyName": "时薪来源"
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "核定工时说明",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时说明"
|
||||
}
|
||||
"ReturnPropertyName": "核定工时说明"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "935dd64c-f2b8-4028-8f0f-ce63ef2489cc"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
|
||||
"ErrorCode": "0",
|
||||
"Message": "以下是本次报工的核定数据，请确认无误后提交",
|
||||
"CustomReturns": [
|
||||
{
|
||||
"ReturnPropertyName": "提交工时",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=工时数"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "核定工时",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "提成系数",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.提成系数"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "计算时薪",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=计算时薪"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "核定收益",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时*计算时薪*提成系数"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "时薪来源",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=时薪计算来源"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ReturnPropertyName": "核定工时说明",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时说明"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "bc661f54-29f0-4057-8a35-2ab125f2de75"
|
||||
"ID": "145f4305-61e9-4e3e-82b7-01adbab2c9ef"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标",
|
||||
"ID": "2feed033-ba7d-4f12-ab19-6291a2e35524"
|
||||
"ID": "e470f225-553e-4875-95a1-1284b95da293"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1128,12 +1182,12 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "4d2d8bc6-9ed2-4de0-b162-702afb3d01cf"
|
||||
"ID": "ca5d6b97-14f4-4d16-8eea-fafd5a276082"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "1c07d0f0-a59d-472c-856b-77b65143d27b"
|
||||
"ID": "65a59501-45ac-46d8-b085-4362b20c3e50"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1166,7 +1220,7 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "b59cbb75-8ff9-4413-8ecd-2886d5a1e03c"
|
||||
"ID": "35a4d139-2b65-46f4-aa60-5ff1a634b67a"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user