diff --git a/.collaboration b/.collaboration index 0bb18223..37f861cc 100644 --- a/.collaboration +++ b/.collaboration @@ -1506,16 +1506,7 @@ }, { "ModuleName": "ServerCommand/计算报工数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T10:41:41.3344206+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\计算报工数据.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/核定确认", diff --git a/ServerCommands/工时/计算报工数据.json b/ServerCommands/工时/计算报工数据.json index 23b65a24..dc6e6b9e 100644 --- a/ServerCommands/工时/计算报工数据.json +++ b/ServerCommands/工时/计算报工数据.json @@ -61,7 +61,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "95889f2c-407e-4b58-b8eb-c7eb5e879a4a", + "GUID": "6f0fb962-60d7-4236-b5e8-06fabd785c92", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -70,7 +70,7 @@ "ColumnName": "项目ID" }, { - "GUID": "e0600daa-fd38-4fc7-8c8a-92aaef9e1b9f", + "GUID": "922dfd8e-8d2e-42d0-a17a-fd5d7cc6fc85", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -79,7 +79,7 @@ "ColumnName": "任务名称" }, { - "GUID": "d185e6d0-6604-4e8f-88d8-fe95df8c0090", + "GUID": "3f908112-9f20-46c3-b49e-a4e3c7776790", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总分配工时", @@ -88,7 +88,7 @@ "ColumnName": "总分配工时" }, { - "GUID": "6299fa5a-b50c-4983-809a-91031142323d", + "GUID": "ab977bc4-1084-424a-b187-21524f0c7c2b", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -97,7 +97,7 @@ "ColumnName": "任务状态" }, { - "GUID": "8859a2de-a0a8-4942-a71a-f84f39f00ed7", + "GUID": "3c83a686-f9b5-4dd6-95b2-66b7fe288fdd", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -111,7 +111,7 @@ "ColumnName": "任务状态文本" }, { - "GUID": "fbde045a-4658-4f0c-bb28-88983a027ac6", + "GUID": "94ee58e8-6fe6-404d-b581-a0fb4f2a0ab3", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -125,7 +125,7 @@ "ColumnName": "严格模式" }, { - "GUID": "9738956e-9050-4887-b7e4-d43affe5272a", + "GUID": "db723831-a27a-430b-9284-5393a5ce14b8", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -139,7 +139,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "0985789f-7c08-4439-bd60-0d6fe7176ab1", + "GUID": "876b99f7-f1b4-4733-9eef-fcbde22fc1d4", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -153,7 +153,7 @@ "ColumnName": "项目预算费用" }, { - "GUID": "cf077cde-0ae7-4440-bea0-cb8ff50b84a5", + "GUID": "9bf9a8a1-3a84-4c76-8b89-a34e7bf66942", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -167,7 +167,7 @@ "ColumnName": "工时分配方式" }, { - "GUID": "9dcdca43-2581-46cb-acf6-6b0f622e5e5c", + "GUID": "d8cf20bc-a9cc-482f-b40b-032233bbf789", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务类型", @@ -181,7 +181,7 @@ "ColumnName": "提成系数" }, { - "GUID": "201eb364-2514-4e50-bc54-a1d95b922927", + "GUID": "907604a1-b8f2-454b-aba1-80cd9faf4852", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "可分配工时", @@ -205,7 +205,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "6d034ee5d87f4991aafb8e5dc0b7e9c9" + "ID": "812b233a44554cd8b84f75c980f438c4" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -413,7 +413,7 @@ } ], "Comments": "项目成员设置的时薪", - "ID": "62dc3fdd-5786-40be-a3f1-43e706f15e9a" + "ID": "163b1d26-361c-4d12-8d46-0df41854f910" }, { "Condition": { @@ -446,7 +446,7 @@ } ], "Comments": "项目岗位设置的时薪", - "ID": "e73280c2-9a0a-4365-9288-184feaecbf5d" + "ID": "596edd83-fbba-4ef7-888e-71fbb8d12917" }, { "Condition": { @@ -479,7 +479,7 @@ } ], "Comments": "成员用户的默认时薪", - "ID": "9bfa3901-4bf0-42b0-a497-236460fd6397" + "ID": "c748fcac-a5c4-4e6c-ab3d-514957048510" }, { "CommandList": [ @@ -496,13 +496,13 @@ "ID": "1034a8bcf12a49328a31314e519829f0" } ], - "ID": "863cf643-953c-4ca0-9948-81672bad50bb" + "ID": "85153d45-7f76-43dc-91d1-8b842b6ef9d9" } ] } ], "Comments": "优先使用手动指定的提成金额", - "ID": "dcedba1d-9312-417b-8894-8715d6f1a998" + "ID": "0caf6e6b-2b53-44cc-85c5-9e9c93866486" }, { "CommandList": [ @@ -522,7 +522,7 @@ "ID": "c9b6eb8cb30e4eaa839a7e1e28ee50a1" } ], - "ID": "acbc5b5c-c45a-4e00-94e7-dae4808b26a5" + "ID": "723c6113-ee79-4aa9-9112-83b61b28301f" } ], "Comments": "计算成员的时薪" @@ -583,7 +583,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "7ba9ad71-19d0-4c44-bde8-61bf640eb2a7", + "GUID": "6522ba61-80e8-414a-85dd-a350ee0740e5", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总计划工时", @@ -592,7 +592,7 @@ "ColumnName": "总计划工时" }, { - "GUID": "a0e8cca8-cfb4-407d-ba93-9517cf57ac42", + "GUID": "3d8ba6c8-14ff-4946-8236-e584acd8c684", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总实际工时", @@ -632,7 +632,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "25784160778c4690b0e3bfef48e0a277", + "ID": "8662f7dbb85a461591528d74dbba18de", "Comments": "从视图统计项目的信息" }, { @@ -681,13 +681,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "4cec407b-9671-4f84-b2b9-b57a1ec4a2f0" + "ID": "7b965af5-8bd1-48db-a79f-73b61d428601" } ] } ], "Comments": "如果分配到人头，则判断该人总计划工时还够不够", - "ID": "58c9c042-b704-4faf-b04d-79dcb7fd6c06" + "ID": "42ee6064-2b39-422f-b88b-25bb8be888d1" }, { "Condition": { @@ -739,13 +739,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "da6d4340-bb40-4cae-a762-18d743014fcc" + "ID": "b12caafe-e800-44a2-9514-87efbf6c66ea" } ] } ], "Comments": "如果是共用任务工时，则查看任务计划工时够不够", - "ID": "ffa15652-79d8-4df6-a66c-6967db33261b" + "ID": "75c598aa-51be-487f-b73d-e5577fb65234" } ] }, @@ -797,9 +797,9 @@ "ParameterName": "预测本次产生成本", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)" + "SerializeProperty": "=计算时薪*工时数*任务信息.提成系数" }, - "ID": "1fc467f0e1674ebb93537f83530a0877" + "ID": "29f5e69fe1814d4cb586221dec465ad3" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -878,7 +878,7 @@ ] } ], - "ID": "b5cf4ed1-ed2a-405c-963f-6fc86cb4f604" + "ID": "f21a4866-842d-465f-9d9d-8ad880d21886" }, { "CommandList": [ @@ -939,12 +939,12 @@ ] } ], - "ID": "7a45ed77-0fad-47fd-8c10-dcb17aee93b7" + "ID": "f23e699c-9811-4be4-93b3-1dfbc1ba9a39" } ] } ], - "ID": "0018d44e-ba07-42de-802b-c4d6d18a1312" + "ID": "28296b97-b790-4140-a976-03e0adaec77d" }, { "CommandList": [ @@ -977,13 +977,13 @@ ] } ], - "ID": "9ee71a89-22c4-4276-a78d-a58d5eb799f3" + "ID": "cbaba218-ed2e-4de9-913c-e0fd775b17b1" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标", - "ID": "eeddc237-5387-48dc-b4aa-23ec869ed39c" + "ID": "d3df60c0-656c-4019-93a7-12bcb2028653" }, { "CommandList": [ @@ -1040,12 +1040,12 @@ ] } ], - "ID": "eaa19a22-1f7e-444b-8ce1-c69ffa07cf07" + "ID": "1d137532-3c06-4ae2-aae9-321d81fafb5d" } ] } ], - "ID": "24c817ab-b6f2-4d38-af84-a055f56042f4" + "ID": "8fefc739-0e6e-4912-a915-b1361fe53cd5" }, { "CommandList": [ @@ -1078,7 +1078,7 @@ ] } ], - "ID": "3e5378ed-6258-4053-8d12-d49828ae063d" + "ID": "1158a222-c0bf-4c31-a8cc-3ce9497fd712" } ] }