{"Message":"1","MessageType":2,"Modules":[{"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":31,"Name":"UserControlPage/工时记录列表"},{"State":1,"Type":15,"Name":"ServerCommand/上报实际工时"},{"State":1,"Type":15,"Name":"ServerCommand/计算报工数据"},{"State":1,"Type":1,"Name":"PCPage/核定确认"},{"State":1,"Type":23,"Name":"TableView/任务平行视图"}],"Version":"v1"}
This commit is contained in:
@@ -271,6 +271,9 @@
|
||||
"ResultTo": {
|
||||
"SerializeProperty": "工时核定说明"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ResultPropertyName": "报工人姓名"
|
||||
}
|
||||
],
|
||||
"RefreshAfterFinish": true,
|
||||
@@ -440,7 +443,7 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=ROUNDUP(核定工时/分配天数,1)"
|
||||
},
|
||||
"ID": "6861c18abaae4a64b85f27614c4c6480"
|
||||
"ID": "1d0a8e541f5a4d8792f0be39665a1f82"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
@@ -449,10 +452,10 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=ROUNDUP(核定工时/分配天数,1)"
|
||||
},
|
||||
"ID": "34efaeaa449044baadb2591bdb778751"
|
||||
"ID": "2d719d51ef5a46ee9aa64f113a34cce3"
|
||||
}
|
||||
],
|
||||
"ID": "1b2a41cd-59f2-4eb6-8722-502e9091fb35"
|
||||
"ID": "8449b93c-d291-4603-800e-244f55c4686b"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -463,7 +466,7 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=待分配上报工时"
|
||||
},
|
||||
"ID": "6cab8652a3e24a3b8b5892d1b1aa96de"
|
||||
"ID": "c812d51f95704a98b5b24d093a898de5"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
@@ -472,10 +475,10 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=待分配工时"
|
||||
},
|
||||
"ID": "737f988cc853421ba2604b8663caa91e"
|
||||
"ID": "11255bb1a556487e972cf64b9d1da58b"
|
||||
}
|
||||
],
|
||||
"ID": "bac1be11-862b-4214-b031-57e73855f119"
|
||||
"ID": "fd1683f4-7192-4383-b8a0-441c927930bd"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -519,45 +522,64 @@
|
||||
"ConditionAndCommandPairList": [
|
||||
{
|
||||
"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": "1"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.工时分配方式"
|
||||
}
|
||||
},
|
||||
"value": "2"
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.严格模式"
|
||||
}
|
||||
]
|
||||
},
|
||||
"value": "1"
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "本次核定工时",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=IF(计算上报工时>(个人工时情况.总计划工时-个人工时情况.总实际工时),(个人工时情况.总计划工时-个人工时情况.总实际工时),计算上报工时)"
|
||||
},
|
||||
"ID": "8d491a5ef74f4ee897d8f9bb342947c2"
|
||||
"$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": "2"
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "本次核定工时",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=IF(计算本次分配工时>(个人工时情况.总计划工时-个人工时情况.总实际工时),(个人工时情况.总计划工时-个人工时情况.总实际工时),计算本次分配工时)"
|
||||
},
|
||||
"ID": "6928da5ea67d4786a7f8c0215c904bd4"
|
||||
}
|
||||
],
|
||||
"ID": "3fbf82ed-ecee-4194-a936-158aefeeb58e"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "本次核定工时",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=计算本次分配工时"
|
||||
},
|
||||
"ID": "82c651b1c1424340b8c6b3ed1361b1fd"
|
||||
}
|
||||
],
|
||||
"ID": "35a7a387-e6b6-4682-95d5-d5b519b34925"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果是按天分配,则需要检测这一天的实际工时是否超出,",
|
||||
"ID": "c4f9fdb4-9a8e-45e1-82f6-3706c3b17408"
|
||||
"ID": "455323e1-5115-4edc-bfdb-7cec82e1b367"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -566,12 +588,12 @@
|
||||
"ParameterName": "本次核定工时",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=计算上报工时"
|
||||
"SerializeProperty": "=计算本次分配工时"
|
||||
},
|
||||
"ID": "0ded4e0b74d841e3b3fd855e20f27dac"
|
||||
"ID": "db70a34a0b184db296d7851c8b8a66ea"
|
||||
}
|
||||
],
|
||||
"ID": "5f7c012a-9219-4318-8b03-42cf4f42552b"
|
||||
"ID": "e3ce249d-6e09-42fe-a1a7-b122f547395e"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -709,15 +731,44 @@
|
||||
"ConditionAndCommandPairList": [
|
||||
{
|
||||
"Condition": {
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.工时分配方式"
|
||||
"$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
|
||||
"SubConditions": [
|
||||
{
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务信息.工时分配方式"
|
||||
}
|
||||
},
|
||||
"value": "3"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=本次核定工时"
|
||||
}
|
||||
},
|
||||
"value": "0",
|
||||
"compareType": 1
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=本次核定工时"
|
||||
}
|
||||
},
|
||||
"value": "0",
|
||||
"compareType": 1
|
||||
}
|
||||
},
|
||||
"value": "3"
|
||||
]
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
@@ -730,7 +781,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "961887ae-659c-4337-a98c-ae9e991f406c"
|
||||
"GUID": "89c692b0-3bbd-4628-bf3e-53b047e15f00"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -741,7 +792,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "1f066a99-5744-4544-85ac-0ab3dc160074"
|
||||
"GUID": "4aa7b0a5-f2ed-4317-88ff-aecaeb125f56"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -752,7 +803,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "工时日期",
|
||||
"GUID": "c235fd62-1dbd-43cb-9bfd-432025656e03"
|
||||
"GUID": "54e443df-b632-4462-9f96-2ab560dd6225"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -763,7 +814,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "工时类型",
|
||||
"GUID": "a67c10ac-aa54-4ffc-97e8-0375344361fd"
|
||||
"GUID": "c9d1abb2-6ed8-492c-9bc8-6968ffef114f"
|
||||
},
|
||||
"Value": "计划"
|
||||
},
|
||||
@@ -771,7 +822,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "执行人",
|
||||
"GUID": "06dcce45-051c-4277-80b3-d67838a0bdbc"
|
||||
"GUID": "beb850d5-e852-483b-be17-d82becedf00f"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -782,7 +833,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "执行内容",
|
||||
"GUID": "6fc34fb9-8e12-4abc-9b10-3b5eeeba365e"
|
||||
"GUID": "bd4b34ed-1acd-4d90-987a-5e2a92ef9c21"
|
||||
},
|
||||
"Value": "系统自动生成对应计划,保证任务可分配工时"
|
||||
},
|
||||
@@ -790,7 +841,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "工时",
|
||||
"GUID": "70556be8-7ff8-4b64-a6b7-666394855a59"
|
||||
"GUID": "ad118311-9589-45ae-9af0-36b92ae97a53"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -801,7 +852,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "上报工时",
|
||||
"GUID": "4be7efc6-344d-49e6-908e-ce772c45aa18"
|
||||
"GUID": "6db98948-73a9-43ff-8c16-78771f37e661"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -812,7 +863,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "时薪单价",
|
||||
"GUID": "8972f0f0-9282-4ce3-9c3b-bb6079acce49"
|
||||
"GUID": "8910d4e3-4356-4a79-a7a2-4cdf3810bb02"
|
||||
},
|
||||
"Value": "0"
|
||||
},
|
||||
@@ -820,7 +871,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "提成系数",
|
||||
"GUID": "b2920132-6d04-4ac1-9592-260e181e8ab7"
|
||||
"GUID": "4ba4ee8a-3cd0-4521-94bf-e3f8b802b8e0"
|
||||
},
|
||||
"Value": "0"
|
||||
},
|
||||
@@ -828,14 +879,14 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "时薪来源",
|
||||
"GUID": "8a0ff2f5-be57-4f51-b98f-c8675326fa3c"
|
||||
"GUID": "ec59c1bb-ff5b-4769-acf3-efd1a71808d7"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果是分配到任务,就补一条计划,保证任务可分配工时准确",
|
||||
"ID": "ff697dae-5961-406d-993f-7a733c0baa4d"
|
||||
"ID": "5bed4edb-fa9f-4982-80ed-d033a5574541"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -860,7 +911,7 @@
|
||||
"ID": "dfe08a493a80498e8915bc2fe710ad21"
|
||||
}
|
||||
],
|
||||
"ID": "743cffb8-d438-4c95-8527-1183b66e1b45"
|
||||
"ID": "c24ef391-2f26-43e0-a90c-8b52a04d9705"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -873,7 +924,7 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"ID": "fb7468a4-d48f-4f1e-a5e3-81e823c02157"
|
||||
"ID": "f760c5a5-fb43-4628-98ff-8652d1b9801d"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -925,7 +976,7 @@
|
||||
"Message": "报工成功"
|
||||
}
|
||||
],
|
||||
"ID": "2fa1520f-ce4f-4fbd-8dcf-7735a69a81e9"
|
||||
"ID": "35bd723b-4ff0-459e-a576-7c26386cf201"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -941,12 +992,12 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"ID": "af3cc7de-aa1a-4d82-986e-c50d58d08d34"
|
||||
"ID": "7a79a42e-c6d7-49cf-83c0-b8e307005db4"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "c89141bd-dba3-43ac-8c63-a744de63f27f"
|
||||
"ID": "80674810-32d1-45ac-8a08-cafb041bde43"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -959,7 +1010,7 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"ID": "6e537909-5b24-4981-ae33-218036cfc9dd"
|
||||
"ID": "5e38d651-9dc0-4b52-b52c-020ae46d961d"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user