{"Message":"1. 简化成员时薪的来源，删除任务时薪概念，按项目定义。\r\n2. 优化任务参与人和项目成员的逻辑，任务成员必须来源于项目成员。","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/项目表"},{"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":1,"Type":1,"Name":"PCPage/分配计划工时"},{"State":1,"Type":1,"Name":"PCPage/MD编辑器"},{"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":2,"Type":1,"Name":"PCPage/财务中心"},{"State":1,"Type":1,"Name":"PCPage/收益中心"},{"State":1,"Type":3,"Name":"MasterPCPage/FGC_母版页"},{"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":15,"Name":"ServerCommand/分配任务工时"},{"State":1,"Type":15,"Name":"ServerCommand/移除项目成员"},{"State":1,"Type":15,"Name":"ServerCommand/同步项目成员"},{"State":2,"Type":15,"Name":"ServerCommand/同步项目参与人字段"},{"State":1,"Type":40,"Name":"Plugin"},{"State":1,"Type":1,"Name":"PCPage/首页"},{"State":1,"Type":31,"Name":"UserControlPage/聊天列表"},{"State":3,"Type":1,"Name":"PCPage/工时总览"},{"State":3,"Type":15,"Name":"ServerCommand/同步项目参与人列表"}],"Version":"v1"}
This commit is contained in:
SHAMUSPC\NINGMEI
@@ -270,36 +270,46 @@
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "任务时薪",
|
||||
"GUID": "93b2f1d8-fd53-468a-9211-87f51b6a5494"
|
||||
},
|
||||
"ColumnName": "任务默认时薪"
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "岗位ID",
|
||||
"GUID": "299a3d18-2733-483d-bcd6-09e057c343ef",
|
||||
"ColumnName": "项目成员ID",
|
||||
"GUID": "ab7cb84d-53aa-4ef4-9480-9dcf6c0081a1",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目岗位",
|
||||
"RelatedTable": "项目成员表",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "默认时薪"
|
||||
}
|
||||
},
|
||||
"ColumnName": "任务岗位时薪"
|
||||
"ColumnName": "成员时薪"
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "项目成员ID",
|
||||
"GUID": "5235f7aa-0a63-4bd3-8c41-f3a32d4c3a93",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目成员表",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "岗位ID",
|
||||
"NextRelationBinding": {
|
||||
"RelatedTable": "项目岗位",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "默认时薪"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ColumnName": "岗位时薪"
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务成员表",
|
||||
"ColumnName": "参与人",
|
||||
"GUID": "599afbfc-245b-40b1-b078-adb9ca71abef",
|
||||
"GUID": "b9b7cb37-08a6-4720-bddc-153de4068f89",
|
||||
"AttachType": {
|
||||
"$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
|
||||
"UserColumnAttachType": 5,
|
||||
"AttachTypeTag": "默认时薪"
|
||||
}
|
||||
},
|
||||
"ColumnName": "参与人默认时薪"
|
||||
"ColumnName": "用户时薪"
|
||||
}
|
||||
],
|
||||
"SqlCondition": {
|
||||
@@ -334,7 +344,7 @@
|
||||
"NullFormulaValueQueryPolicy": 0,
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "5d336b93a4df4cd08bf82c0216fd637b"
|
||||
"ID": "ddbdfdd0fa554a2fa5e51d9879d30174"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
@@ -414,7 +424,7 @@
|
||||
"NullFormulaValueQueryPolicy": 0,
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "c24060577e0143fdb16f1f374c7c895a"
|
||||
"ID": "8615b1487f3b4d1984fe1bac333cfc4d"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
@@ -423,7 +433,7 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.提成系数"
|
||||
},
|
||||
"ID": "cb367be8fb7748938fbb70bd84ece17b"
|
||||
"ID": "a2a37ae37d2d43eaa84993dec74c3f4c"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
@@ -432,7 +442,7 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=工时数"
|
||||
},
|
||||
"ID": "082f169b38f44fdda8b19e98912a9d4e"
|
||||
"ID": "01d0003c29094ae09dd6e64261457190"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
@@ -441,7 +451,7 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1"
|
||||
},
|
||||
"ID": "3116169271594431b3b1c7d31a006d8b"
|
||||
"ID": "d3163c87b76a40d8a3911d660b47f2fa"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
@@ -485,7 +495,7 @@
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务成员.任务默认时薪"
|
||||
"SerializeProperty": "=任务成员.成员时薪"
|
||||
}
|
||||
},
|
||||
"value": "%Null%",
|
||||
@@ -497,18 +507,18 @@
|
||||
"ParameterName": "计算时薪",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务成员.任务默认时薪"
|
||||
"SerializeProperty": "=任务成员.成员时薪"
|
||||
},
|
||||
"ID": "e313b6627e4d4f5c812c5385f1117e65"
|
||||
"ID": "cc82db30c405475598d3aa026d4ec0d9"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "时薪计算来源",
|
||||
"ParameterValue": "任务默认时薪",
|
||||
"ID": "76e6b1beb86d4cffa86d99da1b1b8d56"
|
||||
"ParameterValue": "成员时薪",
|
||||
"ID": "3c1021e484ee4ba0a86633071b42d8bd"
|
||||
}
|
||||
],
|
||||
"ID": "5892bb26-315d-4713-b965-a9c3a0c5aaf5"
|
||||
"ID": "8278602b-cbdd-437b-aa0e-e8f5315f75ea"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
@@ -517,7 +527,7 @@
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务成员.任务岗位时薪"
|
||||
"SerializeProperty": "=任务成员.岗位时薪"
|
||||
}
|
||||
},
|
||||
"value": "%Null%",
|
||||
@@ -529,142 +539,73 @@
|
||||
"ParameterName": "计算时薪",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务成员.任务岗位时薪"
|
||||
"SerializeProperty": "=任务成员.岗位时薪"
|
||||
},
|
||||
"ID": "196d48e7e7104eb89b1b40a31d20d3d9"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "时薪计算来源",
|
||||
"ParameterValue": "任务岗位时薪",
|
||||
"ID": "14e4ee83f2994475987fffe9fb3f8315"
|
||||
}
|
||||
],
|
||||
"ID": "560d1637-206c-428b-b348-0bc18e17414a"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
"$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
|
||||
"SubConditions": [
|
||||
{
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目成员"
|
||||
}
|
||||
},
|
||||
"value": "%Null%",
|
||||
"compareType": 1
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目成员.项目成员时薪"
|
||||
}
|
||||
},
|
||||
"value": "%Null%",
|
||||
"compareType": 1
|
||||
}
|
||||
]
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "计算时薪",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目成员.项目成员时薪"
|
||||
},
|
||||
"ID": "76cd36c904b74af7b79a09aded9e6834"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "时薪计算来源",
|
||||
"ParameterValue": "项目成员时薪",
|
||||
"ID": "6c7b7dc64b644d0cadaa3e58ae25fb27"
|
||||
}
|
||||
],
|
||||
"ID": "71243830-5216-40a3-a6b1-5939b0753a02"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
"$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
|
||||
"SubConditions": [
|
||||
{
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目成员"
|
||||
}
|
||||
},
|
||||
"value": "%Null%",
|
||||
"compareType": 1
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目成员.项目岗位时薪"
|
||||
}
|
||||
},
|
||||
"value": "%Null%",
|
||||
"compareType": 1
|
||||
}
|
||||
]
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "计算时薪",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目成员.项目岗位时薪"
|
||||
},
|
||||
"ID": "51752bfde1d24e229b44fe75bc41264a"
|
||||
"ID": "b103c2acb94742d88008cf0f5c4c2db4"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "时薪计算来源",
|
||||
"ParameterValue": "项目岗位时薪",
|
||||
"ID": "3ea9bb1ee1c34288bc51654ef1abf496"
|
||||
"ID": "0219a753cc25405babd85823afc50ec5"
|
||||
}
|
||||
],
|
||||
"ID": "122e532e-7bf9-416e-8429-2be97ef447db"
|
||||
"ID": "d9826fc4-2a66-449f-b29a-2452b63c72bf"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务成员.用户时薪"
|
||||
}
|
||||
},
|
||||
"value": "%Null%",
|
||||
"compareType": 1
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "计算时薪",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务成员.参与人默认时薪"
|
||||
"SerializeProperty": "=任务成员.用户时薪"
|
||||
},
|
||||
"ID": "1ae2836c5830462a84c4aacaa677c0ee"
|
||||
"ID": "f7dc4bc4ab82417fa9ed1963c9f0743d"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "时薪计算来源",
|
||||
"ParameterValue": "用户默认时薪",
|
||||
"ID": "2aef2dc2638a4d93b234647dbb3708be"
|
||||
"ID": "b63bc48e6b494c45846f26f65967743a"
|
||||
}
|
||||
],
|
||||
"ID": "e37a30f6-824b-4309-b099-b50321d85357"
|
||||
"ID": "c59d3f3d-1bd7-49ba-ab43-4dbc96ca337b"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "计算时薪",
|
||||
"ParameterValue": "0",
|
||||
"ID": "7cd27fcd25194f5f945c9f20531f3510"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "时薪计算来源",
|
||||
"ParameterValue": "无时薪配置",
|
||||
"ID": "fa7dce870a0f4f43982f5750b827a883"
|
||||
}
|
||||
],
|
||||
"ID": "16505a9b-f55a-4fec-9d40-1778bca56b9c"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "优先使用手动指定的提成金额",
|
||||
"ID": "3c4043b9-0284-477c-81f1-63f1c8d5119c"
|
||||
"ID": "b4f70a32-3855-4615-8543-d3692bcc3b15"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -675,16 +616,16 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=指定时薪单价"
|
||||
},
|
||||
"ID": "0cf4fd422ad24dab99b51a2dd7f131d9"
|
||||
"ID": "0c71d002bf8b487e8d5fc68160f1c319"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "时薪计算来源",
|
||||
"ParameterValue": "特殊指定",
|
||||
"ID": "c4fead524128456483f3f5a034ef3aac"
|
||||
"ID": "33c8559bb723411da60fd2e561aba45d"
|
||||
}
|
||||
],
|
||||
"ID": "12836376-7996-426b-89ac-c4d2903707c9"
|
||||
"ID": "62612070-353d-4b57-a5cd-e5dd910a0086"
|
||||
}
|
||||
],
|
||||
"Comments": "计算成员的时薪"
|
||||
@@ -783,7 +724,7 @@
|
||||
]
|
||||
}
|
||||
},
|
||||
"ID": "aa235f64d4ec4cd582472f40f84747c9",
|
||||
"ID": "1dd43cf317f3493b811af732e5ecadaa",
|
||||
"Comments": "从视图统计项目的信息"
|
||||
},
|
||||
{
|
||||
@@ -810,7 +751,7 @@
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "提成系数",
|
||||
"ParameterValue": "0",
|
||||
"ID": "e18f1034f12e41a7b90d2a1f58090f54"
|
||||
"ID": "c249f655db5648c5b51bd635c133cb01"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
@@ -819,17 +760,17 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=个人工时情况.总计划工时-个人工时情况.总实际工时"
|
||||
},
|
||||
"ID": "8d0e13be1d7c417b85a401d7241d5a80"
|
||||
"ID": "51190645683e490a89a814befe609269"
|
||||
}
|
||||
],
|
||||
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
|
||||
"ID": "62c323bb-a8fd-4f6a-bef3-c12ba2a4c36e"
|
||||
"ID": "e4e63a51-dcfa-4dc3-8364-8d603e88bf62"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果分配到人头，则判断该人总计划工时还够不够",
|
||||
"ID": "3008b6ad-c950-48cd-b0f1-8e43800742ad"
|
||||
"ID": "3c9d4a97-6a13-4418-b0f8-35395c03f392"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
@@ -889,7 +830,7 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"ID": "7ed3dcc708d241e7a556334560d7e374",
|
||||
"ID": "a23e3a6e89904ac8bea064d536514a50",
|
||||
"Comments": "从视图统计项目的信息"
|
||||
},
|
||||
{
|
||||
@@ -916,7 +857,7 @@
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "提成系数",
|
||||
"ParameterValue": "1",
|
||||
"ID": "5ce8a30a1b1f468cb65341bd59a033e0"
|
||||
"ID": "cf6d51b5888145e496e49f2588883112"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
@@ -925,17 +866,17 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务工时情况.总计划工时-任务工时情况.总实际工时"
|
||||
},
|
||||
"ID": "b03b8286df21427fbb48123ef003f896"
|
||||
"ID": "64c79293a58c4332a6ab84d956a1524b"
|
||||
}
|
||||
],
|
||||
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
|
||||
"ID": "5e7fd067-2fb4-4012-bbd2-c5dfa130297e"
|
||||
"ID": "e773c715-953c-45e2-9f4e-53f2fc081f9f"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果是共用任务工时，则查看任务计划工时够不够",
|
||||
"ID": "9388a07b-e142-40cd-916d-9e9611d3e10b"
|
||||
"ID": "55623e50-334f-4fd0-a5b0-a077569ac925"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -977,7 +918,7 @@
|
||||
},
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "9531597e7dd04790a8b3d8edf8a056fa",
|
||||
"ID": "54aa0a94cc96467d8def3d9040dfa058",
|
||||
"Comments": "从视图统计项目的信息"
|
||||
},
|
||||
{
|
||||
@@ -987,7 +928,7 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)"
|
||||
},
|
||||
"ID": "cff80ff8e246491abd5d9bfe2b4cb20f"
|
||||
"ID": "df9bee08799c444f8a091bc840ad8606"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
@@ -1015,13 +956,13 @@
|
||||
"Message": "该项目预算费用不足，为确保项目成本可控，请联系项目经理增加项目预算后再提交。"
|
||||
}
|
||||
],
|
||||
"ID": "94f1c942-3547-4a4f-b90c-80abf2f29da0"
|
||||
"ID": "a423dbbd-e703-4443-8fcd-7ae0637a1124"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标",
|
||||
"ID": "c218eb9f-1c2a-4ad1-94c2-f987d31caaa3"
|
||||
"ID": "9531c1de-fd10-4c2a-baff-e95a41c928da"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1032,7 +973,7 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=核定工时"
|
||||
},
|
||||
"ID": "44bf01bc4c6e4d15a68aa01810cc3a27"
|
||||
"ID": "45a519cbaf79430590daa0e0f12dcacf"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
|
||||
@@ -1056,7 +997,7 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=开始日期+(index-1)"
|
||||
},
|
||||
"ID": "172a3023cda9475a8a67528b152807c3"
|
||||
"ID": "56a1af3621d94e629a76af1da3b64d7e"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
@@ -1124,7 +1065,7 @@
|
||||
]
|
||||
}
|
||||
},
|
||||
"ID": "bc9f93f8c0874fefba55401ba5796ea6"
|
||||
"ID": "a34519403c17478d8f304509d1773d64"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
@@ -1156,7 +1097,7 @@
|
||||
"ID": "16367bf85236447fb1f75968ab5e3c35"
|
||||
}
|
||||
],
|
||||
"ID": "aec2fbae-83f7-48e5-ab7a-5fae797b336e"
|
||||
"ID": "6c6cc11e-8415-440b-b798-bd6138f8f155"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1170,7 +1111,7 @@
|
||||
"ID": "e94b98e14b7a4a5ba0254784a076d6cc"
|
||||
}
|
||||
],
|
||||
"ID": "4d5a916f-49ba-45ec-bce5-69454395a99c"
|
||||
"ID": "5571b65c-d4f6-4ad9-b36b-1035a2879dbb"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1218,7 +1159,7 @@
|
||||
}
|
||||
],
|
||||
"Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，",
|
||||
"ID": "07879862-2b57-48db-9176-57f5de797991"
|
||||
"ID": "634fd1b5-ae1e-42d9-bd06-59c68f564ba0"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1232,7 +1173,7 @@
|
||||
"ID": "f0457ba04eb3495e809ef050fb21fe4f"
|
||||
}
|
||||
],
|
||||
"ID": "32327428-2991-4210-94d0-fbdfc7587c44"
|
||||
"ID": "5c04802d-6a3d-441e-87d1-4e1f58c1353a"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1246,7 +1187,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "a3028e2b-e561-42c6-9ee0-c8eb03134e2e"
|
||||
"GUID": "767fbfcb-1360-4ab6-9f72-1ebf9d95e1fb"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1257,7 +1198,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "735e3d1d-b8b9-4ba3-a88a-0e21b9765cbb"
|
||||
"GUID": "f1f6eab1-9968-4c05-9d10-6f8c672e6c8c"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1268,7 +1209,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "工时日期",
|
||||
"GUID": "cffbc1e3-052a-486b-89ec-6078865f6e90"
|
||||
"GUID": "64787906-df7b-4ce8-aa3a-496cb71ee756"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1279,7 +1220,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "工时类型",
|
||||
"GUID": "e07c6e0d-1142-463c-a205-880c29183a0d"
|
||||
"GUID": "7b9d8bdd-fc57-4ea4-9ef2-498a8d845b6d"
|
||||
},
|
||||
"Value": "实际"
|
||||
},
|
||||
@@ -1287,7 +1228,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "执行人",
|
||||
"GUID": "58b7816a-560e-4ab2-95b5-b8a8f04d6c19"
|
||||
"GUID": "728355a2-4c2e-4550-b05c-dbe82160500e"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1298,7 +1239,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "执行内容",
|
||||
"GUID": "083276ff-58a1-47be-89fc-cd4989e8e4d4"
|
||||
"GUID": "6655c619-4df3-4cc3-9336-04204dd60f2d"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1309,7 +1250,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "工时",
|
||||
"GUID": "36adcdcf-f764-4fdd-8bf8-852b9d0af714"
|
||||
"GUID": "c0d0c203-56f8-4652-91a9-7163d5ecd5c5"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1320,7 +1261,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "上报工时",
|
||||
"GUID": "eb754d4a-fdd1-4610-8d64-80882781bdaf"
|
||||
"GUID": "60db6ae4-e852-41a3-8493-c10d6a804906"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1331,7 +1272,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "时薪单价",
|
||||
"GUID": "2787b855-d8ee-4214-8c5e-654f37c81bee"
|
||||
"GUID": "993683e9-e9ef-4c54-8439-82e0a265765c"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1342,7 +1283,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "提成系数",
|
||||
"GUID": "d3df389a-4ca3-4353-aefd-d8035b965e93"
|
||||
"GUID": "2fa54ac7-2777-4f42-bd30-9e43589c2e75"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1353,7 +1294,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "时薪来源",
|
||||
"GUID": "4c3d1a7c-5e48-48dd-9f2f-0e28f5bc1550"
|
||||
"GUID": "fa2a6e7e-b172-4087-86e6-f42a55d6bc70"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1369,10 +1310,10 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)"
|
||||
},
|
||||
"ID": "81a6634be71a43669cbaa18cb041393a"
|
||||
"ID": "e446ff2c85514cc681efe1c72c5c0700"
|
||||
}
|
||||
],
|
||||
"ID": "dc0a2408-a1e6-4094-84db-1d38ba286103"
|
||||
"ID": "92f856e7-b658-42f6-a4eb-240bd631136d"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1385,7 +1326,7 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"ID": "a1751d3f-23dc-4468-81ef-939d95acbd61"
|
||||
"ID": "52ddc999-8d00-4b25-9376-d97aca3cb66e"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1437,7 +1378,7 @@
|
||||
"Message": "报工成功"
|
||||
}
|
||||
],
|
||||
"ID": "b728b35b-37b0-4979-9b51-2f3bfcaac0e1"
|
||||
"ID": "b580b0b9-d9e3-46e2-bc37-c61b3cb2034a"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1450,12 +1391,12 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"ID": "14c3dd1e-b660-4b79-b4dc-8f55f163e0b4"
|
||||
"ID": "510fe1b5-99ae-47f9-8cbe-574accde54d2"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "f5991806-add2-4d20-b266-f17d2e60d061"
|
||||
"ID": "4cb9cd97-f93c-47f5-81b3-f39afa131276"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1465,7 +1406,7 @@
|
||||
"Message": "成员不在任务内，无法报工！"
|
||||
}
|
||||
],
|
||||
"ID": "447cf554-6508-427a-ace5-0592f83b8e2e"
|
||||
"ID": "9d15f4b2-4b91-4a4d-9b2a-4c2ec13ca9b3"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user