{"Message":"1. 增加项目、任务平行视图，解决子表成员的权限问题；\r\n2. 重新整理页面绑定，取消原表的统计字段；\r\n3. 优化任务、项目的人员管理；","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/项目任务分组"},{"State":1,"Type":7,"Name":"Table/任务成员表"},{"State":1,"Type":7,"Name":"Table/任务表"},{"State":1,"Type":7,"Name":"Table/任务进展"},{"State":1,"Type":7,"Name":"Table/任务评论表"},{"State":1,"Type":23,"Name":"TableView/View_任务工时统计"},{"State":1,"Type":7,"Name":"Table/任务工时表"},{"State":1,"Type":7,"Name":"Table/需求反馈登记表"},{"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":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":4,"Type":1,"Name":"PCPage/参与成员管理"},{"State":2,"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":15,"Name":"ServerCommand/修改任务预算工时"},{"State":1,"Type":15,"Name":"ServerCommand/移除任务成员"},{"State":2,"Type":15,"Name":"ServerCommand/更新任务参与人"},{"State":2,"Type":15,"Name":"ServerCommand/同步任务参与人字段"},{"State":1,"Type":15,"Name":"ServerCommand/上报实际工时"},{"State":1,"Type":15,"Name":"ServerCommand/分配任务工时"},{"State":1,"Type":15,"Name":"ServerCommand/移除项目成员"},{"State":2,"Type":15,"Name":"ServerCommand/同步项目成员"},{"State":1,"Type":27,"Name":"ServerCommandPrivate/后端新增项目反馈"},{"State":1,"Type":36,"Name":"ShareCommandContainer/打开任务详情"},{"State":1,"Type":9,"Name":"Theme"},{"State":1,"Type":40,"Name":"Plugin"},{"State":1,"Type":15,"Name":"ServerCommand/计算报工数据"},{"State":2,"Type":15,"Name":"ServerCommand/上报实际工时(备份)"},{"State":1,"Type":7,"Name":"Table/汇报状态"},{"State":1,"Type":7,"Name":"Table/EmojiTable"},{"State":1,"Type":15,"Name":"ServerCommand/任务发起流程前校验"},{"State":1,"Type":28,"Name":"ProcessItem/新增任务流程"},{"State":1,"Type":15,"Name":"ServerCommand/发起任务流程"},{"State":3,"Type":23,"Name":"TableView/项目平行视图"},{"State":3,"Type":6,"Name":"Pages/任务/任务成员"},{"State":3,"Type":23,"Name":"TableView/任务成员视图"},{"State":3,"Type":23,"Name":"TableView/任务平行视图"},{"State":3,"Type":6,"Name":"Pages/任务/任务类型管理"}],"Version":"v1"}
This commit is contained in:
超哥
File diff suppressed because it is too large
Load Diff
@@ -80,51 +80,51 @@
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "任务信息",
|
||||
"TableValue": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"GUID": "77f9cb0d-8fcc-41a0-94de-19307751018f",
|
||||
"GUID": "2c2767fc-9c55-4efe-b6b2-224ecc020029",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "1b1dfe53-8569-419b-9ac7-4bb4e54e5cb3"
|
||||
"GUID": "7fdb06e2-cdb4-4b14-96e5-b16a0dc7ebf8"
|
||||
},
|
||||
"ColumnName": "项目ID"
|
||||
},
|
||||
{
|
||||
"GUID": "7ca24749-276d-49f1-9649-71869718982c",
|
||||
"GUID": "c530784c-9ec7-4b10-8b13-2a2e2313ed0f",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务名称",
|
||||
"GUID": "2f0ff2cf-b0cf-49ba-99c2-9b8636152c54"
|
||||
"GUID": "67c8366a-f017-4613-ab85-45f9735a09e9"
|
||||
},
|
||||
"ColumnName": "任务名称"
|
||||
},
|
||||
{
|
||||
"GUID": "21fa0fd9-690e-4a7c-8928-6a935df1ef08",
|
||||
"GUID": "a5925b6c-d337-4cbe-8923-c518ef23d291",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务预算工时",
|
||||
"GUID": "503e9dd2-fc8c-4426-a37f-c7d582c9577a"
|
||||
"GUID": "88baaaea-577c-4e64-ac91-fc6821062c8e"
|
||||
},
|
||||
"ColumnName": "任务预算工时"
|
||||
},
|
||||
{
|
||||
"GUID": "65be7a74-e004-437d-86cf-ad2dd54380b0",
|
||||
"GUID": "76a3c299-61b1-4dba-a237-9afee0c01605",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务状态",
|
||||
"GUID": "93ff9848-29c1-4cf6-a3cd-d33eb1d033c4"
|
||||
"GUID": "dbce198e-cb11-4ac9-96e3-d3747a2ca23b"
|
||||
},
|
||||
"ColumnName": "任务状态"
|
||||
},
|
||||
{
|
||||
"GUID": "34bbb8c2-2e15-4b2b-bc53-daf981b7757e",
|
||||
"GUID": "74266711-61bf-4bed-8222-9b4e6266bb1c",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务状态",
|
||||
"GUID": "da675aa2-3619-422b-817f-eed8c7c118c7",
|
||||
"GUID": "b316af2a-362c-4368-87f3-06a450cf885f",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "任务状态",
|
||||
"RelatedColumn": "状态码",
|
||||
@@ -134,13 +134,13 @@
|
||||
"ColumnName": "任务状态文本"
|
||||
},
|
||||
{
|
||||
"GUID": "fa7ff311-79ec-46ae-84a5-ba0ff58bee19",
|
||||
"GUID": "791f2501-5a1c-4ffd-9005-1cc0715b34de",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "038a41fb-93fa-46f8-b259-87eb94cc28ad",
|
||||
"GUID": "7c382f44-2671-42e4-bcb6-54391d8ca5c1",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedTable": "项目平行视图",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "严格模式"
|
||||
}
|
||||
@@ -148,13 +148,13 @@
|
||||
"ColumnName": "严格模式"
|
||||
},
|
||||
{
|
||||
"GUID": "057de8af-5cf4-4f1c-b90e-771b7947019c",
|
||||
"GUID": "167a9561-3e96-4434-84bc-48fe9e2ebb6b",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "f4212e88-f2aa-4d8f-8ba8-b7c518505bb7",
|
||||
"GUID": "b4ff6da3-d41f-42f4-a431-d660f7993661",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedTable": "项目平行视图",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "项目预算工时"
|
||||
}
|
||||
@@ -162,13 +162,13 @@
|
||||
"ColumnName": "项目预算工时"
|
||||
},
|
||||
{
|
||||
"GUID": "6f278154-955f-4c1e-b665-1ed7a11133a4",
|
||||
"GUID": "0e30f9f8-40aa-492f-a9dc-d1b865a53a5c",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "31040160-fc88-459c-b67b-8621acbc0920",
|
||||
"GUID": "1b694496-49f0-4511-ab3d-00cdd03bc6c8",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedTable": "项目平行视图",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "项目预算费用"
|
||||
}
|
||||
@@ -176,11 +176,25 @@
|
||||
"ColumnName": "项目预算费用"
|
||||
},
|
||||
{
|
||||
"GUID": "1dae03a1-20c2-4acd-b0ef-eba768e2de31",
|
||||
"GUID": "0f4ec208-cb60-4f19-a38f-710e101dfceb",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "e7579388-e204-4b20-80bb-252f08702dcb",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目平行视图",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "工时分配方式"
|
||||
}
|
||||
},
|
||||
"ColumnName": "工时分配方式"
|
||||
},
|
||||
{
|
||||
"GUID": "d374362a-62bf-4271-9401-da087b8ad5e6",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务类型",
|
||||
"GUID": "f6fb60c7-0ba6-450b-9cda-28eb2412e296",
|
||||
"GUID": "c0e462ce-e3de-494a-bcf8-309a62d6279a",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "任务类型",
|
||||
"RelatedColumn": "ID",
|
||||
@@ -190,44 +204,30 @@
|
||||
"ColumnName": "提成系数"
|
||||
},
|
||||
{
|
||||
"GUID": "214fd064-3d97-4409-b292-576dbd24c74c",
|
||||
"GUID": "2380db01-cfa4-414b-87d6-1c6b1851e275",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "总计划工时",
|
||||
"GUID": "4bdf7858-40b1-495e-be0d-109aaaf4f69f"
|
||||
"GUID": "8607fe01-1f38-41f0-a9d2-ac602ee7f344"
|
||||
},
|
||||
"ColumnName": "总计划工时"
|
||||
},
|
||||
{
|
||||
"GUID": "3b3ff248-588b-4323-b133-b81cdebc9114",
|
||||
"GUID": "939b27b6-1d20-44b2-a1a4-f100a4b5c510",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "总实际工时",
|
||||
"GUID": "8505a216-3aee-4056-affe-6c760e35c844"
|
||||
"GUID": "51709060-4e4c-4a5f-8e70-ee6a68823f4d"
|
||||
},
|
||||
"ColumnName": "总实际工时"
|
||||
},
|
||||
{
|
||||
"GUID": "56d11f70-4e28-4205-9327-08e180245352",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "b5020b4b-8e2e-4b31-a2ac-53ca31b14b8e",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "工时分配方式"
|
||||
}
|
||||
},
|
||||
"ColumnName": "工时分配方式"
|
||||
}
|
||||
],
|
||||
"SqlCondition": {
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "ID",
|
||||
"GUID": "6ffb7caa-1cd8-4373-b2bf-8a03556c1866"
|
||||
"GUID": "24d636d8-dc6e-4105-aad7-e3fcb17e77cb"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -237,7 +237,7 @@
|
||||
"NullFormulaValueQueryPolicy": 0,
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "53e325bc9aa44df7b5955e76b3c9cef2"
|
||||
"ID": "0d9ae2153be64cb98c234c175b166743"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
@@ -497,7 +497,7 @@
|
||||
"ID": "ca981e56b58e4a889cce1e811fc89764"
|
||||
}
|
||||
],
|
||||
"ID": "2a2dcbce-eaa2-492c-8452-7f9b7230139f"
|
||||
"ID": "88e79a14-c58e-467e-bb9e-d08a9992bf10"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -511,7 +511,7 @@
|
||||
"ID": "5e88c98d260e4a2bacdc4d385f1855f1"
|
||||
}
|
||||
],
|
||||
"ID": "497e2404-5de8-4faf-978e-28251fd827ed"
|
||||
"ID": "569f1523-a560-4d2b-8a29-228c39a3e1da"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -559,7 +559,7 @@
|
||||
}
|
||||
],
|
||||
"Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，",
|
||||
"ID": "a0c85fdd-1245-4888-9545-162695c5016d"
|
||||
"ID": "fca1b2d6-54f4-4565-8604-8d8614a2bfc0"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -573,7 +573,7 @@
|
||||
"ID": "9f4c8206193a47cfa79333c2dbb3d2a7"
|
||||
}
|
||||
],
|
||||
"ID": "18e342f5-ce39-4f00-b61d-1c08c6466733"
|
||||
"ID": "84459d53-9392-4771-9058-7e77386f8ced"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -713,7 +713,7 @@
|
||||
"ID": "d9e13b85ae5640d5972aeb4ea3180a34"
|
||||
}
|
||||
],
|
||||
"ID": "b1b27665-29a3-465f-b7a6-b603280245ca"
|
||||
"ID": "df8a7a6d-1c71-48dd-8584-d9bbb1f86460"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -726,7 +726,7 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"ID": "c500eaae-1b60-4481-be25-6582a85f8897"
|
||||
"ID": "a1c69d1d-002b-472c-a7dd-79628870581f"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -778,7 +778,7 @@
|
||||
"Message": "报工成功"
|
||||
}
|
||||
],
|
||||
"ID": "06444ed7-e40d-4883-bc15-a7a84b5a2ccd"
|
||||
"ID": "904a25fd-f4ad-4289-91c7-47445727e2d3"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -794,12 +794,12 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"ID": "e355a7fb-7cda-48ad-90e4-60447b43690f"
|
||||
"ID": "6f50c329-4ab8-415c-9a0a-0d465b51d856"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "3c8e9e78-2065-488c-ad12-1d8f83d019e2"
|
||||
"ID": "bc625af4-ce67-445e-b9bb-2506acba7dab"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -812,7 +812,7 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"ID": "7c064d69-e661-4c92-991e-a5bddf46ff57"
|
||||
"ID": "08cc418b-c996-4c53-a5c5-dca13abf61f7"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -72,51 +72,51 @@
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "任务信息",
|
||||
"TableValue": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"GUID": "988487e3-0b7d-4415-b979-215de5984733",
|
||||
"GUID": "38530c9c-55ce-4b58-aeb6-41fd0cd410ca",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "1b1dfe53-8569-419b-9ac7-4bb4e54e5cb3"
|
||||
"GUID": "305361b8-995e-48bc-99d6-f008471584ca"
|
||||
},
|
||||
"ColumnName": "项目ID"
|
||||
},
|
||||
{
|
||||
"GUID": "71c699a7-bdbd-4362-a91c-3dda44736bb4",
|
||||
"GUID": "75a0c7ab-3df4-41d5-9d5c-3c76c7faf0e4",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务名称",
|
||||
"GUID": "2f0ff2cf-b0cf-49ba-99c2-9b8636152c54"
|
||||
"GUID": "1514429a-cb4c-433a-a448-a452f6e330dd"
|
||||
},
|
||||
"ColumnName": "任务名称"
|
||||
},
|
||||
{
|
||||
"GUID": "d774e054-62b5-4ccd-90b4-abc0112906e2",
|
||||
"GUID": "9bc18e2f-094e-4c66-b126-11d2ed71e566",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务预算工时",
|
||||
"GUID": "503e9dd2-fc8c-4426-a37f-c7d582c9577a"
|
||||
"GUID": "8520efd4-9787-45fb-9ff8-62d895ac5d91"
|
||||
},
|
||||
"ColumnName": "任务预算工时"
|
||||
},
|
||||
{
|
||||
"GUID": "f9a8ba2a-6d40-4da0-8e1f-edb1273799f8",
|
||||
"GUID": "9f12fb1e-573e-4f5e-8390-60aa0e2d7bd7",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务状态",
|
||||
"GUID": "93ff9848-29c1-4cf6-a3cd-d33eb1d033c4"
|
||||
"GUID": "b0c6d3c7-733a-4b63-a511-f4f3299b9e05"
|
||||
},
|
||||
"ColumnName": "任务状态"
|
||||
},
|
||||
{
|
||||
"GUID": "5dab9388-4830-4724-bb45-b3c6a4f28d3c",
|
||||
"GUID": "bd611fd0-85d4-40d2-94c1-e18624451231",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务状态",
|
||||
"GUID": "da675aa2-3619-422b-817f-eed8c7c118c7",
|
||||
"GUID": "4fe7e2d7-474c-4257-9186-51fd7c25b219",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "任务状态",
|
||||
"RelatedColumn": "状态码",
|
||||
@@ -126,13 +126,13 @@
|
||||
"ColumnName": "任务状态文本"
|
||||
},
|
||||
{
|
||||
"GUID": "61dd6c69-9cd5-4573-855b-e37c2a5bfe23",
|
||||
"GUID": "8dc3ccf2-e6f7-4ba3-9431-e2f8061fdc5f",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "038a41fb-93fa-46f8-b259-87eb94cc28ad",
|
||||
"GUID": "7ce07b47-d21f-4abe-8a7a-3e0ec69b559d",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedTable": "项目平行视图",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "严格模式"
|
||||
}
|
||||
@@ -140,13 +140,13 @@
|
||||
"ColumnName": "严格模式"
|
||||
},
|
||||
{
|
||||
"GUID": "b096e43d-ab53-452e-8d14-5c49cb087215",
|
||||
"GUID": "867a17b9-b513-4a95-b51a-3d54fefeff42",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "f4212e88-f2aa-4d8f-8ba8-b7c518505bb7",
|
||||
"GUID": "65e3a033-3a0b-4c52-901a-9618d6a0e040",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedTable": "项目平行视图",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "项目预算工时"
|
||||
}
|
||||
@@ -154,13 +154,13 @@
|
||||
"ColumnName": "项目预算工时"
|
||||
},
|
||||
{
|
||||
"GUID": "9d613060-917b-4271-901b-fb59da71474a",
|
||||
"GUID": "a6c64613-6b4c-48e2-b5f6-8dbf4dfcd97f",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "31040160-fc88-459c-b67b-8621acbc0920",
|
||||
"GUID": "c3d0bc58-22c8-42ad-82f4-10d13ecb7b7a",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedTable": "项目平行视图",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "项目预算费用"
|
||||
}
|
||||
@@ -168,11 +168,11 @@
|
||||
"ColumnName": "项目预算费用"
|
||||
},
|
||||
{
|
||||
"GUID": "8a7d57e1-1a41-422e-9539-d061a2f985bd",
|
||||
"GUID": "c0a645c0-4604-4fa9-b081-1152376d75cf",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务类型",
|
||||
"GUID": "f6fb60c7-0ba6-450b-9cda-28eb2412e296",
|
||||
"GUID": "bea8ca1b-c9c4-4681-940b-d701f4944130",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "任务类型",
|
||||
"RelatedColumn": "ID",
|
||||
@@ -182,13 +182,13 @@
|
||||
"ColumnName": "提成系数"
|
||||
},
|
||||
{
|
||||
"GUID": "cf013bf8-8172-47ec-98f3-9854de7a6ed8",
|
||||
"GUID": "3909f85c-a724-46ce-b341-b75f2c5d9352",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "b5020b4b-8e2e-4b31-a2ac-53ca31b14b8e",
|
||||
"GUID": "e76d70e2-a2fe-48eb-bd6e-e28af6b71990",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedTable": "项目平行视图",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "工时分配方式"
|
||||
}
|
||||
@@ -196,38 +196,38 @@
|
||||
"ColumnName": "工时分配方式"
|
||||
},
|
||||
{
|
||||
"GUID": "c5b87436-b855-4184-a267-1b6252742680",
|
||||
"GUID": "73bd10b2-6cbb-4c92-93a0-ed1db85cf781",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "开始时间",
|
||||
"GUID": "0c228fe1-2060-41dc-b283-9e6de6475ddd"
|
||||
"GUID": "862b87e2-946e-40a0-896e-09a97d96f51c"
|
||||
},
|
||||
"ColumnName": "开始时间"
|
||||
},
|
||||
{
|
||||
"GUID": "e0fb3cb5-d5ec-48a2-8cdd-b45d99b71b89",
|
||||
"GUID": "ecf738aa-2e2d-4b4e-9a0a-52b60bcf8d7e",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"ColumnName": "执行者",
|
||||
"GUID": "040c1732-e12c-49b9-8709-0d72a08f5a14"
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务负责人",
|
||||
"GUID": "a2e73ddf-4af8-436f-8a01-997bff966952"
|
||||
},
|
||||
"ColumnName": "执行者"
|
||||
},
|
||||
{
|
||||
"GUID": "ff042399-1fce-46d4-8649-b1b9f8681ac1",
|
||||
"GUID": "a87c068d-26b1-44c8-8b58-5514df5a139a",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "总计划工时",
|
||||
"GUID": "4bdf7858-40b1-495e-be0d-109aaaf4f69f"
|
||||
"GUID": "f355236f-a6cc-49a5-8ce3-a184a4a90b78"
|
||||
},
|
||||
"ColumnName": "总计划工时"
|
||||
},
|
||||
{
|
||||
"GUID": "265d5c80-6ff0-4977-bc75-f12b39e46ec9",
|
||||
"GUID": "23318a88-ce48-4abb-afe9-9b6f2914b87b",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "总实际工时",
|
||||
"GUID": "8505a216-3aee-4056-affe-6c760e35c844"
|
||||
"GUID": "85ccdc21-2211-4e56-914f-90445409db03"
|
||||
},
|
||||
"ColumnName": "总实际工时"
|
||||
}
|
||||
@@ -235,9 +235,9 @@
|
||||
"SqlCondition": {
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "ID",
|
||||
"GUID": "6ffb7caa-1cd8-4373-b2bf-8a03556c1866"
|
||||
"GUID": "565ce7a5-e5aa-434e-aecf-d7e00ac509fd"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -247,7 +247,7 @@
|
||||
"NullFormulaValueQueryPolicy": 0,
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "03a074c6e5a64bd38fbfd1eba61d9737"
|
||||
"ID": "05d2877d0b384aa5b7afc3b3f2225489"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
@@ -314,7 +314,7 @@
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"GUID": "d7686ba8-d4cf-495f-ac24-d3be98c2cf6d",
|
||||
"GUID": "8dc569c6-5d7d-435c-9e25-9384593acfdd",
|
||||
"BindingInfo": {
|
||||
"TableName": "项目成员表",
|
||||
"ColumnName": "ID",
|
||||
@@ -323,7 +323,7 @@
|
||||
"ColumnName": "ID"
|
||||
},
|
||||
{
|
||||
"GUID": "292de573-5142-4c37-8a35-b9e10930723c",
|
||||
"GUID": "900d917f-11e0-42c7-8ce2-44783dea1cb6",
|
||||
"BindingInfo": {
|
||||
"TableName": "项目成员表",
|
||||
"ColumnName": "项目成员",
|
||||
@@ -332,7 +332,7 @@
|
||||
"ColumnName": "项目成员"
|
||||
},
|
||||
{
|
||||
"GUID": "20c831c4-fc58-481f-8f08-08954d2b23c7",
|
||||
"GUID": "a22fbeeb-ea30-4420-b3c1-c4a7f7600491",
|
||||
"BindingInfo": {
|
||||
"TableName": "项目成员表",
|
||||
"ColumnName": "默认时薪",
|
||||
@@ -341,7 +341,7 @@
|
||||
"ColumnName": "成员时薪"
|
||||
},
|
||||
{
|
||||
"GUID": "2ba2a655-703f-4dfc-9f0b-8b46b07bcfbc",
|
||||
"GUID": "35ccd89d-5316-4952-88cf-42403f181492",
|
||||
"BindingInfo": {
|
||||
"TableName": "项目成员表",
|
||||
"ColumnName": "岗位ID",
|
||||
@@ -355,7 +355,7 @@
|
||||
"ColumnName": "岗位时薪"
|
||||
},
|
||||
{
|
||||
"GUID": "adffe320-84c3-452a-a59d-5bfcb54fca62",
|
||||
"GUID": "b55c41c6-2f85-474b-b253-f5a5fcc733f5",
|
||||
"BindingInfo": {
|
||||
"TableName": "项目成员表",
|
||||
"ColumnName": "项目成员",
|
||||
@@ -369,7 +369,7 @@
|
||||
"ColumnName": "用户时薪"
|
||||
},
|
||||
{
|
||||
"GUID": "24e7cb89-477b-4bf8-92f7-b9566afca1dc",
|
||||
"GUID": "0ff49b9c-2d0d-45db-92a1-25bc5c083363",
|
||||
"BindingInfo": {
|
||||
"TableName": "项目成员表",
|
||||
"ColumnName": "项目成员",
|
||||
@@ -415,7 +415,7 @@
|
||||
"NullFormulaValueQueryPolicy": 0,
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "b87de6ee98134b0db9c488c3f53802aa"
|
||||
"ID": "1ce0f23ab033498c9e4cf43fef25e86d"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
@@ -441,7 +441,7 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.提成系数"
|
||||
},
|
||||
"ID": "7b355b509372477787f4dc070f69c5bf"
|
||||
"ID": "58c7218ea48d4bf088891cc7a0af834a"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
@@ -468,7 +468,7 @@
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "参与人",
|
||||
"ColumnName": "任务成员",
|
||||
"GUID": "40488a39-9df7-4064-80ab-e9f36af4a0e3"
|
||||
},
|
||||
"Value": {
|
||||
@@ -480,7 +480,7 @@
|
||||
},
|
||||
"NullFormulaValueQueryPolicy": 0
|
||||
},
|
||||
"ID": "dae25d13dbca4709833847e7abf40991"
|
||||
"ID": "85f05fa8d3b844e9afb58b9ac148bf1a"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
@@ -504,22 +504,11 @@
|
||||
"UpdateType": "add",
|
||||
"ShowConfirm": false,
|
||||
"UpdateBindingValues": [
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "项目成员ID",
|
||||
"GUID": "9ad41ba8-bc38-4b80-a3e6-7b3baef78fb1"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目成员.ID"
|
||||
}
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "4969a0f4-00f4-41a1-ad82-277791beaf98"
|
||||
"GUID": "754d8031-358c-4e31-b85c-a32646177485"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -530,7 +519,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "1d940b10-f4ff-4dd8-8af9-e92cda35a119"
|
||||
"GUID": "9e181156-cf0c-4f43-afd6-a9b9e1bf6a24"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -540,8 +529,8 @@
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "参与人",
|
||||
"GUID": "b0150daf-ecd7-490f-aaa1-df618a441107"
|
||||
"ColumnName": "任务成员",
|
||||
"GUID": "d674cbcf-a85a-4265-820f-d8b4645be281"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -552,7 +541,7 @@
|
||||
"ParamNameToSaveNewRowValue": ""
|
||||
}
|
||||
],
|
||||
"ID": "0bd18cbb-a844-4095-a00f-6a877d53665a"
|
||||
"ID": "10766095-aa5e-4936-bd6f-9f87476fe932"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -607,7 +596,7 @@
|
||||
"ID": "91295edff0c44f608a14d5c9f9594f3e"
|
||||
}
|
||||
],
|
||||
"ID": "7ff31778-96c4-49d8-a32e-181f1b88b2e6"
|
||||
"ID": "cb65382f-c010-4af6-a20a-77026cce8abc"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
@@ -641,7 +630,7 @@
|
||||
"ID": "727f49edcb914303adf91ed9a40e4355"
|
||||
}
|
||||
],
|
||||
"ID": "a3eacd5e-5297-4364-929a-a379f9d176a2"
|
||||
"ID": "8b041455-c4ba-4e60-b2de-ab076be0ecd0"
|
||||
}
|
||||
],
|
||||
"Comments": "如果是按人分配，则把计划工时分到一天中"
|
||||
@@ -777,7 +766,7 @@
|
||||
"ID": "622dd1eb09094e29b7b7201423479597"
|
||||
}
|
||||
],
|
||||
"ID": "d270ce8e-1204-4687-9a4d-14ee1ddc0691"
|
||||
"ID": "43f34e40-4a0b-4f45-af34-815255acc8e1"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -791,7 +780,7 @@
|
||||
"ID": "22bbafd761814075a115c7c935a993c0"
|
||||
}
|
||||
],
|
||||
"ID": "ed8387f8-b258-40e1-9195-4e4712d18e37"
|
||||
"ID": "b68ec59e-a39c-46e4-a0b5-f829865c6e33"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -872,7 +861,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "d25bba73-7774-4b30-9b25-78e66b663cb1"
|
||||
"GUID": "bf8f469d-4b9b-4904-bacf-1496956bda22"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -883,7 +872,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "a57a627a-5fb0-4678-9b76-35da70121b50"
|
||||
"GUID": "518a4412-a28d-4938-a3cb-6099930a0b6f"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -894,7 +883,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "工时日期",
|
||||
"GUID": "cf10d3fa-8308-4d82-aa1a-24cae3e4cdd4"
|
||||
"GUID": "ad1c8f81-00b1-4c33-b49c-8a43c27b1fc8"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -905,7 +894,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "工时类型",
|
||||
"GUID": "308096da-5797-4c9c-b872-6ca8fedfb98e"
|
||||
"GUID": "3adc128c-6b4f-4636-aaec-5e69f3ffb08d"
|
||||
},
|
||||
"Value": "计划"
|
||||
},
|
||||
@@ -913,7 +902,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "执行人",
|
||||
"GUID": "e8894d5f-bd6e-43ee-80d6-7e617ea28f40"
|
||||
"GUID": "78a763a5-332c-4cd7-86e6-bb1fbed3e553"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -924,7 +913,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "执行内容",
|
||||
"GUID": "cc408d25-c0b6-42b9-8907-1a5d56b0c0be"
|
||||
"GUID": "8fcd4935-3c9d-49ca-aa1d-6de6ae29d21a"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -935,7 +924,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "工时",
|
||||
"GUID": "aa83ea70-5672-4ce4-be7c-6312ab30ba82"
|
||||
"GUID": "b74e9a17-2d24-4156-88b7-eb2f41f00ced"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -946,7 +935,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "时薪单价",
|
||||
"GUID": "0b60ffc6-9883-4b22-b4c1-e8b77cc439b7"
|
||||
"GUID": "48b863e9-ca60-4d29-a23d-de37e0b00c08"
|
||||
},
|
||||
"Value": "0"
|
||||
},
|
||||
@@ -954,7 +943,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "提成系数",
|
||||
"GUID": "2d74b0e6-3b2e-48dc-a448-cb14325448b0"
|
||||
"GUID": "2f756808-6964-4e0b-9ecf-262337984419"
|
||||
},
|
||||
"Value": "0"
|
||||
},
|
||||
@@ -962,7 +951,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "时薪来源",
|
||||
"GUID": "129b380c-2f05-4f1f-904d-4bb4fb46bb2c"
|
||||
"GUID": "09a998b1-3b57-4d29-ae08-58e215b1502d"
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -977,7 +966,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "项目动态",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "2030c959-552e-4bd3-b1c0-db65b1a2a8f6"
|
||||
"GUID": "dbda7c11-89e3-46b3-9878-6542c1573be8"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -988,7 +977,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "项目动态",
|
||||
"ColumnName": "项目动态",
|
||||
"GUID": "c7ddc3f1-2e25-4688-90e2-ab52bdbc38f1"
|
||||
"GUID": "85746779-19f7-4a95-9e17-c874ad036526"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -999,7 +988,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "项目动态",
|
||||
"ColumnName": "执行人",
|
||||
"GUID": "c79cf25a-e2c3-4666-85d4-db2096a27097"
|
||||
"GUID": "9310fd02-1c73-480f-b38d-ec60a02a6964"
|
||||
},
|
||||
"Value": "%CurrentUser%"
|
||||
}
|
||||
@@ -1009,7 +998,7 @@
|
||||
}
|
||||
],
|
||||
"Comments": "如果不是按人分配，且分配后的工时超过负荷，则报错",
|
||||
"ID": "71e79c72-7c77-4b1e-aab2-62c9e03840ef"
|
||||
"ID": "2ee2defe-1ee0-4b1a-81ba-3c3c7ee41092"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1022,7 +1011,7 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"ID": "3d1a9493-f089-4e32-a390-edf55b9e0b03"
|
||||
"ID": "c3926374-5d7e-4d95-b0f8-c0cae13866f0"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1036,7 +1025,7 @@
|
||||
"Message": "分配计划工时成功"
|
||||
}
|
||||
],
|
||||
"ID": "94615ed0-db4a-4df9-bdcc-984dbb65c8ac"
|
||||
"ID": "c0584a51-0fa8-4921-9584-6d283b15e2ef"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1049,12 +1038,12 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"ID": "e0664fed-3947-4260-a369-10fccfdb3ef8"
|
||||
"ID": "3e9956c9-42e0-4ff5-b044-222b4bf77cff"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "18650228-2adb-4ffe-aa61-43a756ea484d"
|
||||
"ID": "57f1b080-ec1a-4753-a7d7-0f854f188607"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1064,13 +1053,13 @@
|
||||
"Message": "该用户不是项目成员"
|
||||
}
|
||||
],
|
||||
"ID": "03fd3568-5f3f-4c67-87d9-371faf16c203"
|
||||
"ID": "3597654d-7876-4aae-a0d4-823d38fd0b1f"
|
||||
}
|
||||
],
|
||||
"Comments": "如果任务成员中没有，则自动加一个"
|
||||
}
|
||||
],
|
||||
"ID": "dfbf8fce-7699-473c-9cf1-df9213ac03eb"
|
||||
"ID": "7d3c7e2a-4b00-48b9-8169-87d968e1a4e3"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1080,12 +1069,12 @@
|
||||
"Message": "您提交的工时超过任务预算工时，请修改后重新提交"
|
||||
}
|
||||
],
|
||||
"ID": "b4fa3949-72a8-49c5-8c2a-558650f2a1c9"
|
||||
"ID": "00a26394-ea2d-4137-a912-238597032be9"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "33a1a0f8-ce40-4316-b8d0-60764e4a6b41"
|
||||
"ID": "bdf5bcf4-1d4c-4a7a-a8ec-ff8d7474877f"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1095,7 +1084,7 @@
|
||||
"Message": "任务不存在"
|
||||
}
|
||||
],
|
||||
"ID": "7947ba67-09bd-4337-aba3-8c658c79bea4"
|
||||
"ID": "ee54214e-973d-463a-ade5-08d37df75c44"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -57,51 +57,51 @@
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "任务信息",
|
||||
"TableValue": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"GUID": "a4525178-4350-49a0-9b74-eafe7c58f7ad",
|
||||
"GUID": "51d29667-c8fa-4ac7-9a80-84635b43c671",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "1b1dfe53-8569-419b-9ac7-4bb4e54e5cb3"
|
||||
"GUID": "7a775562-0089-4f89-b487-adb6c325aae7"
|
||||
},
|
||||
"ColumnName": "项目ID"
|
||||
},
|
||||
{
|
||||
"GUID": "28277e69-51c0-44d2-aaf4-8a64d47540f5",
|
||||
"GUID": "1178509c-4606-4631-9f47-3ac0c387dd5c",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务名称",
|
||||
"GUID": "2f0ff2cf-b0cf-49ba-99c2-9b8636152c54"
|
||||
"GUID": "82947834-93d4-4141-ae13-ac868718c9e3"
|
||||
},
|
||||
"ColumnName": "任务名称"
|
||||
},
|
||||
{
|
||||
"GUID": "de559be7-424c-4c8c-a544-b9fe4a979b82",
|
||||
"GUID": "595928d5-c5e2-4a0b-b9c5-1fb1b6994092",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务预算工时",
|
||||
"GUID": "503e9dd2-fc8c-4426-a37f-c7d582c9577a"
|
||||
"GUID": "9eadb3da-071f-490d-9a93-52bd6ab236c9"
|
||||
},
|
||||
"ColumnName": "任务预算工时"
|
||||
},
|
||||
{
|
||||
"GUID": "f8e2c444-6df2-4419-bea1-e1964f5c417d",
|
||||
"GUID": "39dd63aa-a9c6-4646-a0a1-d16bad89b4ce",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务状态",
|
||||
"GUID": "93ff9848-29c1-4cf6-a3cd-d33eb1d033c4"
|
||||
"GUID": "8ab893d0-a983-49c5-83d4-f924307b44d8"
|
||||
},
|
||||
"ColumnName": "任务状态"
|
||||
},
|
||||
{
|
||||
"GUID": "7b06a1fd-184e-4654-9737-ffcdb46fbf9c",
|
||||
"GUID": "0f951348-a489-4498-b0df-c01a04a35554",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务状态",
|
||||
"GUID": "da675aa2-3619-422b-817f-eed8c7c118c7",
|
||||
"GUID": "7dd81639-004a-4e1f-8801-bdb573d4689f",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "任务状态",
|
||||
"RelatedColumn": "状态码",
|
||||
@@ -111,13 +111,13 @@
|
||||
"ColumnName": "任务状态文本"
|
||||
},
|
||||
{
|
||||
"GUID": "1251e695-ecf1-4bc6-96c1-141385475459",
|
||||
"GUID": "b8d887d3-7e95-450e-8c41-55fe618bee11",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "038a41fb-93fa-46f8-b259-87eb94cc28ad",
|
||||
"GUID": "e7c38242-5a9e-4a27-9f2e-e7310190db0e",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedTable": "项目平行视图",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "严格模式"
|
||||
}
|
||||
@@ -125,13 +125,13 @@
|
||||
"ColumnName": "严格模式"
|
||||
},
|
||||
{
|
||||
"GUID": "ae8749c3-3c07-4bd6-9cda-3d6676493a35",
|
||||
"GUID": "df02b131-76d0-4fc6-8c7d-4a2485886371",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "f4212e88-f2aa-4d8f-8ba8-b7c518505bb7",
|
||||
"GUID": "0c95b352-574d-479b-b97d-6216b400ee70",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedTable": "项目平行视图",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "项目预算工时"
|
||||
}
|
||||
@@ -139,13 +139,13 @@
|
||||
"ColumnName": "项目预算工时"
|
||||
},
|
||||
{
|
||||
"GUID": "eff04df7-1d05-4aa8-8b4a-69bda7b01609",
|
||||
"GUID": "518fccab-2ffd-47eb-a849-fc448c36ed5d",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "31040160-fc88-459c-b67b-8621acbc0920",
|
||||
"GUID": "4bc603a4-f90b-4160-abf6-efd30574f3db",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedTable": "项目平行视图",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "项目预算费用"
|
||||
}
|
||||
@@ -153,11 +153,25 @@
|
||||
"ColumnName": "项目预算费用"
|
||||
},
|
||||
{
|
||||
"GUID": "ddb0a421-4a62-4b26-b13f-dab5a964e89e",
|
||||
"GUID": "b1e1ddce-0b10-4c9e-876b-8168a0b1827e",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "27e931f9-2c3b-4d36-9d31-f513387b9366",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目平行视图",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "工时分配方式"
|
||||
}
|
||||
},
|
||||
"ColumnName": "工时分配方式"
|
||||
},
|
||||
{
|
||||
"GUID": "4b56bc02-6a36-44c9-861b-ef6f83ba1e51",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "任务类型",
|
||||
"GUID": "f6fb60c7-0ba6-450b-9cda-28eb2412e296",
|
||||
"GUID": "ccd2fb35-e336-4b95-a031-480e1b81d7e4",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "任务类型",
|
||||
"RelatedColumn": "ID",
|
||||
@@ -167,44 +181,30 @@
|
||||
"ColumnName": "提成系数"
|
||||
},
|
||||
{
|
||||
"GUID": "3c7ef327-7f18-4452-be72-a221854f6ba7",
|
||||
"GUID": "74dfdd5f-cf5c-4a78-b999-d362ed94b09d",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "总计划工时",
|
||||
"GUID": "4bdf7858-40b1-495e-be0d-109aaaf4f69f"
|
||||
"GUID": "9b9f88c0-c367-46c7-948c-5b43579844d0"
|
||||
},
|
||||
"ColumnName": "总计划工时"
|
||||
},
|
||||
{
|
||||
"GUID": "3d4e1b59-74f6-4c1f-ab7d-7885ee230e52",
|
||||
"GUID": "561c6627-404a-4cd6-8110-221e757e6fde",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "总实际工时",
|
||||
"GUID": "8505a216-3aee-4056-affe-6c760e35c844"
|
||||
"GUID": "980d85ec-3b78-448b-b4de-3987fd4e4f28"
|
||||
},
|
||||
"ColumnName": "总实际工时"
|
||||
},
|
||||
{
|
||||
"GUID": "6e41f3a4-30a4-4893-a08c-25fa63f7abf3",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "b5020b4b-8e2e-4b31-a2ac-53ca31b14b8e",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "工时分配方式"
|
||||
}
|
||||
},
|
||||
"ColumnName": "工时分配方式"
|
||||
}
|
||||
],
|
||||
"SqlCondition": {
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"TableName": "任务平行视图",
|
||||
"ColumnName": "ID",
|
||||
"GUID": "6ffb7caa-1cd8-4373-b2bf-8a03556c1866"
|
||||
"GUID": "9e13ce69-9a90-4903-b1bc-191e78046201"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -214,30 +214,30 @@
|
||||
"NullFormulaValueQueryPolicy": 0,
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "b58da3c8bfef4ca68be4a6994359c1e1"
|
||||
"ID": "de7afa1d5ff1408fb92f64a23e648572"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "任务成员",
|
||||
"TableValue": {
|
||||
"TableName": "任务成员表",
|
||||
"TableName": "任务成员视图",
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"GUID": "fe0babb8-290f-4984-98e8-b9b65fbec016",
|
||||
"GUID": "95107486-9b29-4c73-8f89-62be80d0240d",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "参与人",
|
||||
"GUID": "20d5971e-0ac3-4236-9e5f-0e67e2034b35"
|
||||
"TableName": "任务成员视图",
|
||||
"ColumnName": "任务成员",
|
||||
"GUID": "c9f1bc1f-0740-4216-ac99-e79dd41fef88"
|
||||
},
|
||||
"ColumnName": "参与人"
|
||||
},
|
||||
{
|
||||
"GUID": "6c6a6ff8-1d75-4169-b865-7dbb8bbcb47f",
|
||||
"GUID": "6723495f-8637-4d58-bdb2-649aa4fb1d93",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "参与人",
|
||||
"GUID": "671ec8a8-ebc7-42d3-8fda-f2686d841ead",
|
||||
"TableName": "任务成员视图",
|
||||
"ColumnName": "任务成员",
|
||||
"GUID": "5f56fb6d-7c2e-4270-94c8-ab56bc9b6ae7",
|
||||
"AttachType": {
|
||||
"$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
|
||||
"UserColumnAttachType": 1
|
||||
@@ -246,11 +246,11 @@
|
||||
"ColumnName": "参与人_全名"
|
||||
},
|
||||
{
|
||||
"GUID": "631a0727-4b42-42b7-8d71-cb7dc03c5012",
|
||||
"GUID": "27eded30-6e46-43a3-865e-519f92fcb92f",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "参与人",
|
||||
"GUID": "b0fb9e47-ca43-45d0-bb54-cf7ac8edce15",
|
||||
"TableName": "任务成员视图",
|
||||
"ColumnName": "任务成员",
|
||||
"GUID": "781a90fc-9c77-43ca-a831-8006774fd4da",
|
||||
"AttachType": {
|
||||
"$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
|
||||
"UserColumnAttachType": 5,
|
||||
@@ -260,44 +260,34 @@
|
||||
"ColumnName": "参与人负荷"
|
||||
},
|
||||
{
|
||||
"GUID": "7735fa98-f0e3-4055-81b9-14cc489d9d5a",
|
||||
"GUID": "655461f1-c357-428f-990d-5cbb79baf4ed",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "项目成员ID",
|
||||
"GUID": "ab7cb84d-53aa-4ef4-9480-9dcf6c0081a1",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目成员表",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "默认时薪"
|
||||
}
|
||||
"TableName": "任务成员视图",
|
||||
"ColumnName": "默认时薪",
|
||||
"GUID": "4d44146b-7124-4f18-aa8d-17da23a4c0b3"
|
||||
},
|
||||
"ColumnName": "成员时薪"
|
||||
},
|
||||
{
|
||||
"GUID": "627e2b07-d512-4f1e-8d76-321e226fa1f3",
|
||||
"GUID": "8d8eef54-67cd-4ecd-beac-5635c6f5134e",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "项目成员ID",
|
||||
"GUID": "5235f7aa-0a63-4bd3-8c41-f3a32d4c3a93",
|
||||
"TableName": "任务成员视图",
|
||||
"ColumnName": "岗位ID",
|
||||
"GUID": "faf4cb38-75c8-4741-8b38-cefcb863754d",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目成员表",
|
||||
"RelatedTable": "项目岗位",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "岗位ID",
|
||||
"NextRelationBinding": {
|
||||
"RelatedTable": "项目岗位",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "默认时薪"
|
||||
}
|
||||
"DisplayColumn": "默认时薪"
|
||||
}
|
||||
},
|
||||
"ColumnName": "岗位时薪"
|
||||
},
|
||||
{
|
||||
"GUID": "74144ece-f4d7-40c6-9f4c-c0370f7074a2",
|
||||
"GUID": "3ccae4c3-7547-4909-8821-4bacc610fa9b",
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "参与人",
|
||||
"GUID": "b9b7cb37-08a6-4720-bddc-153de4068f89",
|
||||
"TableName": "任务成员视图",
|
||||
"ColumnName": "任务成员",
|
||||
"GUID": "30da9fdf-e11e-4efe-94ec-0a98cc6fff27",
|
||||
"AttachType": {
|
||||
"$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
|
||||
"UserColumnAttachType": 5,
|
||||
@@ -313,9 +303,9 @@
|
||||
{
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"TableName": "任务成员视图",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "7d139430-ab2a-40df-98d0-38bc039435e2"
|
||||
"GUID": "4cadf610-6894-4d43-a84b-ca682a8ebd1c"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -325,9 +315,9 @@
|
||||
{
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "参与人",
|
||||
"GUID": "2b46a973-8db3-40e7-b10b-93ddb666b812"
|
||||
"TableName": "任务成员视图",
|
||||
"ColumnName": "任务成员",
|
||||
"GUID": "232ca578-e6be-4684-a198-81c16c892591"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -339,7 +329,7 @@
|
||||
"NullFormulaValueQueryPolicy": 0,
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "5aca1277f99d40a5b327a846fe0dde87"
|
||||
"ID": "29b01c80875b4c53b56afeb8829c0df6"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
@@ -372,7 +362,7 @@
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"GUID": "f1fd9018-3cc6-4910-883a-66e03bee6e48",
|
||||
"GUID": "81cfbfdb-2497-4c80-8969-4d3a0e6a8e74",
|
||||
"BindingInfo": {
|
||||
"TableName": "项目成员表",
|
||||
"ColumnName": "岗位ID",
|
||||
@@ -386,7 +376,7 @@
|
||||
"ColumnName": "项目岗位时薪"
|
||||
},
|
||||
{
|
||||
"GUID": "113de3b5-551e-4d43-bfc6-ecd139d58ed5",
|
||||
"GUID": "906b9a8e-10ce-4c3c-9d1b-55de074e0938",
|
||||
"BindingInfo": {
|
||||
"TableName": "项目成员表",
|
||||
"ColumnName": "默认时薪",
|
||||
@@ -427,7 +417,7 @@
|
||||
"NullFormulaValueQueryPolicy": 0,
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "919180f493fd46d4927d25dc48fa0e16"
|
||||
"ID": "17f1d03afb8745f49c7c4bb15b1cb482"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
@@ -497,7 +487,7 @@
|
||||
}
|
||||
],
|
||||
"Comments": "项目成员设置的时薪",
|
||||
"ID": "196360f2-7520-4373-a5c6-569e78ef6607"
|
||||
"ID": "c9ed015e-b153-4a1e-90f9-f2b77fd41e7f"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
@@ -530,7 +520,7 @@
|
||||
}
|
||||
],
|
||||
"Comments": "项目岗位设置的时薪",
|
||||
"ID": "a6e9b625-8a97-483d-8ddb-5ac946126350"
|
||||
"ID": "02ae84f0-3eff-43e7-a7a6-3e2edc3780f9"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
@@ -563,7 +553,7 @@
|
||||
}
|
||||
],
|
||||
"Comments": "成员用户的默认时薪",
|
||||
"ID": "07c39884-8926-4a0b-acb4-eb8832e8c1ba"
|
||||
"ID": "31512194-2720-46c4-a700-bc507e1e321c"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -580,13 +570,13 @@
|
||||
"ID": "eb0ba1839ebc4ec58750e971080fc72b"
|
||||
}
|
||||
],
|
||||
"ID": "3e5fdd55-d865-4147-9294-996b4c6ad1f1"
|
||||
"ID": "60c0485a-c34d-4729-af35-6c8a1ba45269"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "优先使用手动指定的提成金额",
|
||||
"ID": "03a5ef08-ca90-48dd-a97b-497445585504"
|
||||
"ID": "d12bb755-e110-459f-b338-04f09e322ecd"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -606,7 +596,7 @@
|
||||
"ID": "2eafc4d65af44d18adfcd21c68734df8"
|
||||
}
|
||||
],
|
||||
"ID": "bfd527d9-f865-4d28-8f53-d0597bc99bf7"
|
||||
"ID": "71c0233d-4246-4440-84ac-e996ce1ad688"
|
||||
}
|
||||
],
|
||||
"Comments": "计算成员的时薪"
|
||||
@@ -757,13 +747,13 @@
|
||||
}
|
||||
],
|
||||
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
|
||||
"ID": "ba878135-8e02-406f-af6b-cccb447eca45"
|
||||
"ID": "347f6c15-2879-4049-9c22-9b1fe9ac797d"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果分配到人头，则判断该人总计划工时还够不够",
|
||||
"ID": "32052fab-784c-419e-86dd-1f40cb25407d"
|
||||
"ID": "4189a1c9-c394-4568-a101-a494d9410881"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
@@ -875,13 +865,13 @@
|
||||
}
|
||||
],
|
||||
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
|
||||
"ID": "6a83bcdf-756e-4c92-b42e-d0e32495a504"
|
||||
"ID": "0b981156-3a4e-4de7-930e-a6822be0525a"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果是共用任务工时，则查看任务计划工时够不够",
|
||||
"ID": "13321a98-7059-4cc4-b1cd-3609329f079c"
|
||||
"ID": "fcfde3f5-0254-416d-8ddd-0a3ab08323dc"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1014,7 +1004,7 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "b029ab62-2ed4-450b-93da-1aa7e32aeb5a"
|
||||
"ID": "935dd64c-f2b8-4028-8f0f-ce63ef2489cc"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1075,13 +1065,13 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "f5618930-6c00-45a7-96d2-66a48f878063"
|
||||
"ID": "bc661f54-29f0-4057-8a35-2ab125f2de75"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标",
|
||||
"ID": "4435ea5c-76f7-4074-9a3f-67efdeaa7958"
|
||||
"ID": "2feed033-ba7d-4f12-ab19-6291a2e35524"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1138,12 +1128,12 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "805cb12e-065e-49a6-bd5a-2f2581c3458f"
|
||||
"ID": "4d2d8bc6-9ed2-4de0-b162-702afb3d01cf"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "412221e1-a820-4a0b-963a-d57a9b3ffa10"
|
||||
"ID": "1c07d0f0-a59d-472c-856b-77b65143d27b"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1176,7 +1166,7 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "5ec5ed41-9521-4a99-8f5a-cbe9da2543fb"
|
||||
"ID": "b59cbb75-8ff9-4413-8ecd-2886d5a1e03c"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user