From 2cc04d7fe4e7732006c56d6b21708e524d5cec1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Wed, 3 Jul 2024 17:23:19 +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 | 105 +++++++++++++++----------- 2 files changed, 62 insertions(+), 54 deletions(-) diff --git a/.collaboration b/.collaboration index 183d6d6a..7f198eb6 100644 --- a/.collaboration +++ b/.collaboration @@ -1434,16 +1434,7 @@ }, { "ModuleName": "ServerCommand/计算报工数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T17:22:51.2479265+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\计算报工数据.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/核定确认", diff --git a/ServerCommands/工时/计算报工数据.json b/ServerCommands/工时/计算报工数据.json index a0688b1f..08902920 100644 --- a/ServerCommands/工时/计算报工数据.json +++ b/ServerCommands/工时/计算报工数据.json @@ -61,7 +61,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "9b9c641d-ace3-42a2-99c2-ab2ccadc9c1c", + "GUID": "3ff4cc4e-d596-4a2b-9958-54728da2e5b7", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -70,7 +70,7 @@ "ColumnName": "项目ID" }, { - "GUID": "ae2c1290-3e32-4258-9c80-a04d56e728aa", + "GUID": "8c7e3e1a-49e3-45bf-a4d4-b935c069458a", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -84,7 +84,7 @@ "ColumnName": "严格模式" }, { - "GUID": "a84987bb-20e4-4636-931a-9948c65c0a4b", + "GUID": "bcfd1fd6-7578-4a0c-b5a1-431ed109a7c4", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -98,7 +98,7 @@ "ColumnName": "项目预算工时" }, { - "GUID": "a48c5450-9b1e-4bc1-af38-ac81ce0045b7", + "GUID": "60d77911-96d8-4a08-8d3b-7da8dda2bdee", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -112,7 +112,7 @@ "ColumnName": "项目预算费用" }, { - "GUID": "2d6b87a6-55e1-4d96-9dff-37587aa31e2e", + "GUID": "400d8442-94df-412a-aa19-064ba272fbc7", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -126,7 +126,7 @@ "ColumnName": "工时分配方式" }, { - "GUID": "e6cfe7ac-3434-4d5c-b619-9cea34950968", + "GUID": "8ea390e6-34bc-404e-ab74-e6c1d53f36b4", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -140,7 +140,7 @@ "ColumnName": "已消耗成本" }, { - "GUID": "56dd846a-08f7-4cd7-9142-062dc7a1027a", + "GUID": "4ca37659-7f96-4f76-8ff1-6ec1f66f35d1", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -149,7 +149,7 @@ "ColumnName": "任务名称" }, { - "GUID": "8de06cf5-7571-40bf-895d-f769469cd389", + "GUID": "59a50d7c-a5ad-4393-8bbd-4362022a8995", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "总分配工时", @@ -158,7 +158,7 @@ "ColumnName": "总分配工时" }, { - "GUID": "93877474-00de-40f5-9f19-538471c05315", + "GUID": "cf3d70c1-0116-4387-9f81-4f350f68355b", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -167,7 +167,7 @@ "ColumnName": "任务状态" }, { - "GUID": "d1b3e65f-3ea1-4329-9567-b580512261d8", + "GUID": "69a7cca1-a752-490d-85ff-4ac1a009ba08", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -181,7 +181,7 @@ "ColumnName": "任务状态文本" }, { - "GUID": "267a4d06-1e46-42b7-b110-e9b79a7de4a2", + "GUID": "3c6f4be6-8c0a-4331-8882-c22bc91c8de4", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务类型", @@ -195,7 +195,7 @@ "ColumnName": "提成系数" }, { - "GUID": "5326de1e-87e6-4a53-94fe-662c85dd84a3", + "GUID": "ff2a56f4-64f4-4b1f-acf6-2c6feece91e3", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "可分配工时", @@ -219,7 +219,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "02459cf2759c4a5c90aafb35c2b85f91" + "ID": "d3682110fe104a22a4b0080c5601666c" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -427,7 +427,7 @@ } ], "Comments": "项目成员设置的时薪", - "ID": "9151f169-389d-48a6-a9f1-bd25a7736a40" + "ID": "5ebf7587-e11b-4da9-8081-fafa3c603d48" }, { "Condition": { @@ -460,7 +460,7 @@ } ], "Comments": "项目岗位设置的时薪", - "ID": "6809b817-b411-490f-8177-b15732a541ef" + "ID": "24114d25-0665-472c-a458-23d48fa6853d" }, { "Condition": { @@ -493,7 +493,7 @@ } ], "Comments": "成员用户的默认时薪", - "ID": "81d22a36-4961-4fe7-ac6f-8566365fcfcd" + "ID": "fb890387-344a-4715-8751-47c6e3bf0146" }, { "CommandList": [ @@ -510,13 +510,13 @@ "ID": "1034a8bcf12a49328a31314e519829f0" } ], - "ID": "e94ab952-0dd2-49e3-90d8-465f140b5d29" + "ID": "2308695f-fc53-4d3f-a77d-014f496d9c53" } ] } ], "Comments": "优先使用手动指定的提成金额", - "ID": "f1ea67e0-0e21-4ae6-b59f-a8ed9b8e60e0" + "ID": "736d6307-2288-44b2-910e-6f46055c67df" }, { "CommandList": [ @@ -536,7 +536,7 @@ "ID": "c9b6eb8cb30e4eaa839a7e1e28ee50a1" } ], - "ID": "f1c2166c-7c5d-4121-9497-b6e56ed55b0c" + "ID": "fc1b75e2-c35e-4cb9-9d19-a26b890f3489" } ], "Comments": "计算成员的时薪" @@ -695,13 +695,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "497ea581-16e4-44c8-93fe-a614b360aac7" + "ID": "e318a5a7-9225-4312-be24-a4b8c0dd1338" } ] } ], "Comments": "如果分配到人头，则判断该人总计划工时还够不够", - "ID": "23ad2287-f0cb-4895-868c-e0be5f4a458b" + "ID": "0dcf28a1-56a3-4709-a914-a88fd47dedc7" }, { "Condition": { @@ -753,13 +753,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "8e604321-6f85-4230-baac-3be4a5aac90a" + "ID": "2be21253-c120-4b74-9626-f7be2e78e9c1" } ] } ], "Comments": "如果是共用任务工时，则查看任务计划工时够不够", - "ID": "e21ba54b-f918-4eb1-9a37-523c05c249a1" + "ID": "58caf833-b107-48a9-a6d7-601418c72205" } ] }, @@ -770,26 +770,43 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=计算时薪*工时数*任务信息.提成系数" }, - "ID": "e45c29f556d047c89679e3629d1bf07e" + "ID": "9cb2042d40ff4a6c953d95f591ec7fe7" }, { "$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": "=预测本次产生成本+任务信息.已消耗成本" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预测本次产生成本+任务信息.已消耗成本" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目预算费用" + }, + "compareType": 2 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目预算费用" + } + }, + "value": "0", + "compareType": 2 } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目预算费用" - }, - "compareType": 2 + ] }, "CommandList": [ { @@ -856,7 +873,7 @@ ] } ], - "ID": "c77ebe00-a148-458c-aee6-31e589a563e7" + "ID": "ef90f3ff-dc36-4212-879d-2f83d2a3e857" }, { "CommandList": [ @@ -924,12 +941,12 @@ ] } ], - "ID": "f5c11c90-24a9-49aa-8e72-d51836763d12" + "ID": "0b9809ba-cc7e-4ebe-bae1-b0e14092334b" } ] } ], - "ID": "52b54430-e0df-4346-a731-a3188d3ee488" + "ID": "ce5d5ed0-9977-4640-b2c0-d932749fee20" }, { "CommandList": [ @@ -965,13 +982,13 @@ ] } ], - "ID": "0a3ba843-4318-407f-82b3-4e4636de31e8" + "ID": "15a1a554-92c3-4ed2-8289-eb6623f43177" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标", - "ID": "c8326bf9-a17f-41d2-a405-9b9d37dc897e" + "ID": "857ce2da-b525-4f27-b330-7fab1bfaae31" }, { "CommandList": [ @@ -1031,12 +1048,12 @@ ] } ], - "ID": "8924c583-415b-42dc-999b-b5a08f518ff8" + "ID": "706f050e-51bd-45b8-a4d8-d368f6fef888" } ] } ], - "ID": "7f7d5744-3ff7-47b5-83a5-cc43a28eb472" + "ID": "e6e79620-a25d-4d6f-a3a0-9a6dac3babc3" }, { "CommandList": [ @@ -1072,7 +1089,7 @@ ] } ], - "ID": "39191b06-b4ce-45c3-93a8-f6c75431f562" + "ID": "4c0674cf-6c46-46be-aeab-0b289b79e1ab" } ] }