From aad214aa832da19ea1dafa8676a339304b51e8de Mon Sep 17 00:00:00 2001 From: cuckooent Date: Fri, 6 Sep 2024 00:15:30 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":15,"Name":"ServerCommand/=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=95=B0=E6=8D=AE"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 11 +--- ServerCommands/工时/计算报工数据.json | 88 +++++++++++++++------------ 2 files changed, 49 insertions(+), 50 deletions(-) diff --git a/.collaboration b/.collaboration index 8b3333c3..6031f7d9 100644 --- a/.collaboration +++ b/.collaboration @@ -1398,16 +1398,7 @@ }, { "ModuleName": "ServerCommand/计算报工数据", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T17:48:29.1800108+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\计算报工数据.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/上报实际工时", diff --git a/ServerCommands/工时/计算报工数据.json b/ServerCommands/工时/计算报工数据.json index 78154829..2f224ebb 100644 --- a/ServerCommands/工时/计算报工数据.json +++ b/ServerCommands/工时/计算报工数据.json @@ -61,7 +61,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "3ff4cc4e-d596-4a2b-9958-54728da2e5b7", + "GUID": "4da229be-0e7c-4268-96b0-31fab7de3542", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -70,7 +70,7 @@ "ColumnName": "项目ID" }, { - "GUID": "8c7e3e1a-49e3-45bf-a4d4-b935c069458a", + "GUID": "13c6f469-5d70-40b1-9bcb-f8c362a59427", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -84,7 +84,7 @@ "ColumnName": "严格模式" }, { - "GUID": "bcfd1fd6-7578-4a0c-b5a1-431ed109a7c4", + "GUID": "0695854f-24c5-4ae3-8b66-a308a6159bde", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -98,7 +98,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "60d77911-96d8-4a08-8d3b-7da8dda2bdee", + "GUID": "7ea9c6f8-973a-4b97-867a-cabb09ce5c24", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -112,7 +112,7 @@ "ColumnName": "项目预算费用" }, { - "GUID": "400d8442-94df-412a-aa19-064ba272fbc7", + "GUID": "cc663eec-f5d9-478e-a921-790b226cc119", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -126,7 +126,7 @@ "ColumnName": "工时分配方式" }, { - "GUID": "8ea390e6-34bc-404e-ab74-e6c1d53f36b4", + "GUID": "fd9bd072-be99-4999-b9ee-92fd40748bf4", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -140,7 +140,7 @@ "ColumnName": "已消耗成本" }, { - "GUID": "4ca37659-7f96-4f76-8ff1-6ec1f66f35d1", + "GUID": "1edee222-5dc4-4451-a188-0f68ea210065", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -149,7 +149,7 @@ "ColumnName": "任务名称" }, { - "GUID": "59a50d7c-a5ad-4393-8bbd-4362022a8995", + "GUID": "1ce94689-2da5-4361-9578-a1c6f8c55513", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总分配工时", @@ -158,7 +158,7 @@ "ColumnName": "总分配工时" }, { - "GUID": "cf3d70c1-0116-4387-9f81-4f350f68355b", + "GUID": "3c4dc6f8-572b-4e3e-a78a-0c9f9dbd8123", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -167,7 +167,7 @@ "ColumnName": "任务状态" }, { - "GUID": "69a7cca1-a752-490d-85ff-4ac1a009ba08", + "GUID": "2eaee617-cf67-4cc9-98d5-c0be15415d4f", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -181,7 +181,7 @@ "ColumnName": "任务状态文本" }, { - "GUID": "3c6f4be6-8c0a-4331-8882-c22bc91c8de4", + "GUID": "a43ac6fd-37e6-4502-a39b-e4841b1695bb", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务类型", @@ -195,7 +195,7 @@ "ColumnName": "提成系数" }, { - "GUID": "ff2a56f4-64f4-4b1f-acf6-2c6feece91e3", + "GUID": "df068ea4-e310-4442-b9f1-86f9360f9e64", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "可分配工时", @@ -219,7 +219,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "d3682110fe104a22a4b0080c5601666c" + "ID": "d2db1f66567b49b28ea2194332f72261" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -229,7 +229,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "fa433705-3a1a-4ea6-bddb-412a5b92230f", + "GUID": "d331a396-4d47-4788-ac53-6b4060e6fc32", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "任务成员", @@ -238,7 +238,7 @@ "ColumnName": "参与人" }, { - "GUID": "c5b0add4-8302-4d3d-b419-6c13dfc274c4", + "GUID": "3788b9f0-99be-4e28-8913-679514b5c6f7", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "任务成员", @@ -251,7 +251,7 @@ "ColumnName": "参与人_全名" }, { - "GUID": "f6c62c31-03cf-4e57-a1ae-bb8de9557928", + "GUID": "b8161740-3b79-4f19-b825-3f8a8432382d", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "任务成员", @@ -265,7 +265,7 @@ "ColumnName": "参与人负荷" }, { - "GUID": "1a61af60-f5a7-4174-a60b-b81a75a63488", + "GUID": "198fdc8c-8eeb-4b74-b66d-2607f7970080", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "默认时薪", @@ -274,7 +274,7 @@ "ColumnName": "成员时薪" }, { - "GUID": "b52f2e30-bcee-4ed5-9645-c4d550003ded", + "GUID": "eae1743f-cf41-4707-b018-c7571213286d", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "岗位ID", @@ -288,7 +288,7 @@ "ColumnName": "岗位时薪" }, { - "GUID": "c5a1fce5-386f-4e9b-81ae-ba0faf7700d8", + "GUID": "da1c678a-9475-4a46-994e-6c0fb85fbd0f", "BindingInfo": { "TableName": "任务成员视图", "ColumnName": "任务成员", @@ -334,7 +334,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "6740763a538c4fccbad4947459cb8833" + "ID": "b70642e6d083400d98f82957a723401a" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -427,7 +427,7 @@ } ], "Comments": "项目成员设置的时薪", - "ID": "b254fba8-65ee-4032-86c3-f475497362a5" + "ID": "de24e94f-3dc9-40c5-a565-3cbf8c7dcbf0" }, { "Condition": { @@ -460,7 +460,7 @@ } ], "Comments": "项目岗位设置的时薪", - "ID": "2d81a9e3-b815-4860-b79a-7ac770c585bc" + "ID": "972761bd-c0b5-47e0-8d6d-a1908a70aed0" }, { "Condition": { @@ -493,7 +493,7 @@ } ], "Comments": "成员用户的默认时薪", - "ID": "c37d0107-cd3f-42ac-bb9c-38b153d49a4d" + "ID": "ea04bcc7-09ce-4dbc-ad56-0a4f44c4543f" }, { "CommandList": [ @@ -510,13 +510,13 @@ "ID": "1034a8bcf12a49328a31314e519829f0" } ], - "ID": "07c3529b-b3cb-46dd-a922-230163ac1021" + "ID": "6b764d5d-de9d-4f67-ae13-71b195632dfa" } ] } ], "Comments": "优先使用手动指定的提成金额", - "ID": "da9fbbb5-e2c0-416e-810f-02344f3a0fdc" + "ID": "cfb2dbbb-f3dd-485e-84fe-e74071fe98f6" }, { "CommandList": [ @@ -536,7 +536,7 @@ "ID": "c9b6eb8cb30e4eaa839a7e1e28ee50a1" } ], - "ID": "91f0625e-787b-4b24-bdee-1074a742eb07" + "ID": "67a6780f-223a-4531-a61f-3f4e5245cadf" } ], "Comments": "计算成员的时薪" @@ -695,13 +695,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "f676817b-1c78-4e43-9d04-70bf690f42fb" + "ID": "3f49c8d8-e39e-43c7-99eb-756e017c37ed" } ] } ], "Comments": "如果分配到人头，则判断该人总计划工时还够不够", - "ID": "b438cc2b-9244-41d2-a914-2857235908c1" + "ID": "04a6ea2a-9a63-41e5-a7f5-03ddb314e3ab" }, { "Condition": { @@ -753,13 +753,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "4553777e-ed91-4df3-aa7a-94a29fb61361" + "ID": "228e8e6f-ffc3-40db-9cc7-1e5c48c99d9e" } ] } ], "Comments": "如果是共用任务工时，则查看任务计划工时够不够", - "ID": "56bca871-4bce-475d-8c62-3c1e08ce1d26" + "ID": "b4ee8168-c556-4dea-b1bb-bcdc470241a8" } ] }, @@ -873,7 +873,7 @@ ] } ], - "ID": "c5771aba-ad77-4aa9-b18d-dfb3d8fc30e7" + "ID": "d637a303-e4d6-48c1-89cf-c27bcd6f4135" }, { "CommandList": [ @@ -941,12 +941,12 @@ ] } ], - "ID": "fc7b3360-1862-4b95-b0d3-3e2357df6439" + "ID": "69e87269-b2bd-4375-a9eb-44066c46bc0d" } ] } ], - "ID": "b3ec0df5-9249-4823-9978-e02b3dd9439b" + "ID": "fe2d2d7b-3b00-4e09-85c1-67c4ba13dbf0" }, { "CommandList": [ @@ -982,13 +982,13 @@ ] } ], - "ID": "cf9a484b-2d06-42a3-a3f7-f3fe19e157d3" + "ID": "76263f76-51eb-4bf4-b494-9199853afa81" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标", - "ID": "8b48ba67-7557-44b3-a980-e4a6e8cc98cf" + "ID": "7469f096-91ea-44d7-9ac7-9ba0725d05a6" }, { "CommandList": [ @@ -1040,20 +1040,28 @@ } }, { - "ReturnPropertyName": "核定工时说明" + "ReturnPropertyName": "核定工时说明", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=核定工时说明" + } }, { - "ReturnPropertyName": "报工人姓名" + "ReturnPropertyName": "报工人姓名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员.参与人_全名" + } } ] } ], - "ID": "10abd442-f24c-40c3-9731-94f3d5e0e303" + "ID": "c2d725ee-f0cd-4ba1-bcd0-5c28b8378fc1" } ] } ], - "ID": "418cc5a5-6845-4ed4-b564-dff6d5863518" + "ID": "198234b1-d6a6-43ca-9b15-78b750f07735" }, { "CommandList": [ @@ -1089,7 +1097,7 @@ ] } ], - "ID": "f4bef588-eacd-4fe8-8256-18726fd97c73" + "ID": "8e60b646-eace-4743-9037-e943724e5b81" } ] }