From 57a751d8991b4e5c608f69de73f72f506f32ffc5 Mon Sep 17 00:00:00 2001 From: "SHAMUSPC\\NINGMEI" Date: Sat, 2 Mar 2024 17:10:21 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=A2=9E=E5=8A=A0=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=97=B6=E8=96=AA=E5=8D=95=E4=BB=B7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95","MessageType":2,"Modules":[{"State":1,"Type":7,"Name?= =?UTF-8?q?":"Table/=E4=BB=BB=E5=8A=A1=E5=B7=A5=E6=97=B6=E8=A1=A8"},{"Stat?= =?UTF-8?q?e":1,"Type":1,"Name":"PCPage/=E6=96=B0=E5=A2=9E=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5"},{"State":1,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E6=97=B6"},{"State":1,"Type":15,"Na?= =?UTF-8?q?me":"ServerCommand/=E4=BF=AE=E6=94=B9=E5=B7=A5=E6=97=B6"}],"Ver?= =?UTF-8?q?sion":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 44 +------ Pages/任务/工时/新增报工.json | 6 +- ServerCommands/工时/修改工时.json | 30 ++++- ServerCommands/工时/新增工时.json | 210 +++++++++++++++++++++--------- Tables/工时/任务工时表.json | 7 + 5 files changed, 190 insertions(+), 107 deletions(-) diff --git a/.collaboration b/.collaboration index 34badd48..95fbb007 100644 --- a/.collaboration +++ b/.collaboration @@ -358,16 +358,7 @@ }, { "ModuleName": "Table/任务工时表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T17:06:37.8683404+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\工时\\任务工时表.json" - ] + "ModuleType": 7 }, { "ModuleName": "PCPage/工时详情", @@ -395,16 +386,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T17:09:20.9860114+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommands/工时", @@ -412,16 +394,7 @@ }, { "ModuleName": "ServerCommand/新增工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T17:09:20.9858368+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\新增工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "TableView/子任务视图", @@ -441,16 +414,7 @@ }, { "ModuleName": "ServerCommand/修改工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T17:09:20.9860306+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\修改工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/新增任务", diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index ce94f563..9c9e1b60 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -514,6 +514,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=新增报工!L4" } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "指定时薪单价" } ], "ResultErrorCodeTo": { @@ -927,4 +931,4 @@ "Formula": "新增报工!$L$4" } ] -}//EEHNpAcOSfI/4Ae0yQBPmuN4P9E2HSBVEVplsCDovV46qCNdaQ4IhYB/RfGQgUbaJMy8fBh7rSRd0fgszzNUpbPPc3wIJDlhCpQgvG7XYcWI/MdVFGPcTCwen4hYWWVr+mUkbfv5eHVi//ht0rjbToM+kc57cGgy5/3AlrykGPiBLrJbGqcVUDeMEtUviFe3mTNHBFp4cCeiGbj+A8HzI4xNJtjzvegP6Zul/TYYip/vejI9PEX0slNCjMBQAy/rHj+voWhed2nUlPbJT9+tqGePBmY8z2nDCdqB7p0YYAEHeFjww0Elwd68tsjHirPjZkeW3Af91n5ZOfGklt7lehchwPMBtVOlaJaGMN80W14v58BWKrvmUCOZFtpiSF+StCv9Nhv3BEMrYRW118CeQN5Ry5NHS9iJ4dI/nm2UX4foSKBJPicKubSMh02ZyMsZplJ+pLdkd/qRKELWNCm5uN5+qmLQrkxD6cypBTtopTgKy2DrgE5IW2m3FjJJTYOlbcdrIB8yxrVYrm1VOd1zr1eJpAst8Omg5QTv5KiSNwz9Y65ZJ+6fPGyDp1ItdP54Qfyf9HVBGqgj5in3fGMdvGkyT7JHHGTwO6KWKAAwIgLAtE6U53scIPqSy77OYQd6irxDhXARfJRnNWcQBae/hEjXaw4veK3Fj4P58Q7wVOTjDzi6dGEyahmmnOEgxcc/ZWJ4P7Gh9NG5Gph+hnAhJdt89Bv7m2vMdY4T+2WN+ERO32EKkNbeLrUD0W/kAyXF0rfLNtZPkLKi6U4LB5H1AV+J7ev1B3ds0qYO+9ND9ZIQxofX5A7qs1yWUPr0JYVgV51I6qmndhi50mf0x1wxVvskhRZtQMvLlYElejKUDAnxtYEbDAuf+GgDrG/KBoW9dQ5S2AykqK31HlrH6ZpXpA==|920 \ No newline at end of file +}//hv3bXY2+GO496JJ3IKdQtHSsh4c6uS2iVSUJWpYYeP3SFypFsV6oO6eXwd0lnwcV2QAG6ltBFQhdlQuAz1IArZ13UaH8z9RYneYGzH8xMreiFf5b796kvEJp67m5dxp/FT9n1MTohNgwX+4oCPyiQfREisQzYwLqiTlWY/SWxAVtL2zOdW380GMNF3pS34D8qZ3ucvzAiyk1w/9of+ioSBt/7JduJgvErKn828UVLYvB+vC0dtMrB3sdxrIj2CfQFJTigDJRww3IY84ViFEVwcKaw78EfFbafKEWfurf2R0x6bFSpi2wMvgnX3cy+Vz3XbhK3P4k9grNrYkod0Jonn2BiVO7fGJAtqC9TkFXZYBopqW9MUSOb3oR3WRmJRYHNA5SsFyW2QKt6J5VvKMCLhxVnvyzKezUyf690/QQ8KzGitMUQh7UH9+xJhqRp15bh89qhVhiZDVZOwFTpxFJhnBLRAkR98Ghw0yulmhzIOARef82n+Y2hSV2j6D4ItajHIge2Py7YmP2R29ZwaiQtrAP2B4q2gj5SQKyH/4j/WMAzFA8TQc9ru6Ygh744iL6ighsTUrtvJSY5tNMnudvEhdiW5Zp+wHXxW4lsapTo27y5JFKUplEa961jzn8h9fPLTgpiXEkRdw3KXcCfrt3fPsnlAD80ftrn+ncajpVj/bd9neIUkwAjtgoNIlcCuraJEanuCZ6UjxCbql5wMZQiGxYWQ2aUEXTii1/tN/ncgfYKd+b0vyc5IXDmYnZJIeK++Pkf8mgx4jx6EUhrm68HLlgNRaOb0QWsgW/zTckBRDgCySgmiaeG/ttgTr78ArTC3bPYkjDVxeTOWqY2wrGOYVOpbFRr2+UGqi4883zKmXYn6pNz93IbPKYYliVd13jSKZwWv3OGgkK5rU1bV4b/w==|920 \ No newline at end of file diff --git a/ServerCommands/工时/修改工时.json b/ServerCommands/工时/修改工时.json index a5146a29..bc168c5b 100644 --- a/ServerCommands/工时/修改工时.json +++ b/ServerCommands/工时/修改工时.json @@ -75,7 +75,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "e7ac8f1b-36f9-43b7-ace8-1dd7719b9aa9" + "GUID": "2cd79881-6fd5-477c-b106-487785603f1c" }, "ColumnName": "任务ID" }, @@ -83,7 +83,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "35f864d9-6a77-41d4-95aa-0d19f8edbd8b" + "GUID": "b2aa0ce9-5a5c-4058-bfa4-385bab8ead16" }, "ColumnName": "工时类型" }, @@ -91,7 +91,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "66fc6430-8f59-4f1d-a59d-9c65493210f6", + "GUID": "265bb9bf-bdba-4755-b63d-97332c30707d", "RelationBinding": { "RelatedTable": "任务表", "RelatedColumn": "ID", @@ -104,7 +104,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "086151c5-f4b2-4325-82e7-8457e1eb681d", + "GUID": "2e895211-7dfa-40fc-afa6-2c67d5791222", "RelationBinding": { "RelatedTable": "任务表", "RelatedColumn": "ID", @@ -117,6 +117,14 @@ } }, "ColumnName": "任务状态文本" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "时薪单价", + "GUID": "9ab501cd-0e19-41f8-bde0-79b71492d3c4" + }, + "ColumnName": "时薪单价" } ], "SqlCondition": { @@ -124,7 +132,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "ID", - "GUID": "9b3d5fb4-44ad-4a4f-8d86-9e0659149b83" + "GUID": "158686a9-ef15-42db-8fd3-1286f356d514" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -134,7 +142,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "0b0135ff570b49d785ee52145a8d1354" + "ID": "b3486434c4354cb2aef1ba93be0f48e7" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -151,7 +159,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "ID", - "GUID": "7ad7c09e-adb8-424f-86da-b50fe4b72c0f" + "GUID": "6ab72e04-6550-45cb-86b2-72bad68b72e3" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -218,6 +226,14 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=报工信息.工时类型" } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "指定时薪单价", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=报工信息.时薪单价" + } } ], "ResultErrorCodeTo": { diff --git a/ServerCommands/工时/新增工时.json b/ServerCommands/工时/新增工时.json index 9cf235c5..51b267ff 100644 --- a/ServerCommands/工时/新增工时.json +++ b/ServerCommands/工时/新增工时.json @@ -66,6 +66,9 @@ "IgnoreBlank": false }, "TestData": "计划" + }, + { + "Name": "指定时薪单价" } ], "InvokeTriggerTestData": { @@ -89,7 +92,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "d6b6824a-a3d5-44d3-bef2-34b3561cbe6a" + "GUID": "30658003-478f-40bc-bec5-21323cc4acb9" }, "ColumnName": "项目ID" }, @@ -97,7 +100,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "be3c9952-34a3-4915-97ac-340dca60f67a" + "GUID": "bd55e51c-f8c0-4411-b7c8-3e50c87bdd7e" }, "ColumnName": "任务状态" }, @@ -105,7 +108,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "89014ca0-175a-4817-9b63-9d1d819f777a", + "GUID": "5bf81dab-5b37-4eb0-be4e-18037fd35888", "RelationBinding": { "RelatedTable": "任务状态", "RelatedColumn": "状态码", @@ -118,7 +121,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "3b56f3a2-20fc-47ea-bc61-2de38614800a", + "GUID": "426ce019-dcb5-46a3-8147-1bffb07a0b18", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -131,7 +134,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "8b21bb41-cba8-4063-bce6-654ce97c4208", + "GUID": "53087541-fe0b-413b-8f8e-1779bf6bd16c", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -144,7 +147,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "b3370de2-8e76-453c-956c-66ee0e4fbf16", + "GUID": "84fc268c-bf7b-4147-bed7-155011320551", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -157,7 +160,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "19d450ec-d2ee-4640-b4f5-0cb10cd2d797", + "GUID": "f2452327-3883-4cf3-8413-6203bb7b43b9", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -172,7 +175,7 @@ "ColumnBindingInfo": { "TableName": "任务表", "ColumnName": "ID", - "GUID": "54cd58a8-21ad-4171-91d5-3b122e25bcf1" + "GUID": "b756dff3-adfe-4149-bcf5-11b9c40ef0e6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -182,7 +185,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "da510110eedd4b1b9707dfd37852471a" + "ID": "929f17779e0c4d99aaf4f46aa7264abb" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -195,7 +198,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "9a5e191a-1702-4e0e-9aa3-9bde3875efe8" + "GUID": "59aedf59-110e-485a-b423-bcd39b775e75" }, "ColumnName": "参与人" }, @@ -203,7 +206,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "fbd6dea1-5ca9-47ff-96eb-b9940b927304", + "GUID": "98aa8733-230d-4c50-899a-3f9191834e67", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 5, @@ -211,6 +214,40 @@ } }, "ColumnName": "参与人负荷" + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务时薪", + "GUID": "2015c0d5-1299-4d27-b8b6-ff4a26cce7d7" + }, + "ColumnName": "任务默认时薪" + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "岗位ID", + "GUID": "6519575a-3bbe-4c37-9da9-1aef4ba06859", + "RelationBinding": { + "RelatedTable": "项目岗位", + "RelatedColumn": "ID", + "DisplayColumn": "默认时薪" + } + }, + "ColumnName": "岗位默认时薪" + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "f48e0ea1-c309-4cb5-9c32-87020502b86a", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 5, + "AttachTypeTag": "默认时薪" + } + }, + "ColumnName": "参与人默认时薪" } ], "SqlCondition": { @@ -218,7 +255,7 @@ "ColumnBindingInfo": { "TableName": "任务成员表", "ColumnName": "ID", - "GUID": "6efd1b18-859e-4ec6-a731-bf8fd9bcfe02" + "GUID": "20e214aa-5692-4637-a78c-216bfc9708b3" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -228,7 +265,51 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "5392853d39164a9eb658391557796b84" + "ID": "71614a0f129141b5bde65657df1d0bfd" + }, + { + "$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": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算时薪", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(任务成员.任务默认时薪>0,任务成员.任务默认时薪,IF(任务成员.岗位默认时薪>0,任务成员.岗位默认时薪,IF(任务成员.参与人默认时薪>0,任务成员.参与人默认时薪,0)))" + }, + "ID": "8da0f282ca844012842bd0beecb5ed92" + } + ], + "ID": "814e11f3-9661-4fb9-948c-964c735db926" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算时薪", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=指定时薪单价" + }, + "ID": "e60f8982826348f182313c0fb4b84f3a" + } + ], + "ID": "b89eb085-b0c8-411e-a6c6-96db03a20492" + } + ] }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -293,7 +374,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", - "GUID": "ed609fb6-3202-43b6-b725-5bf94aed3446" + "GUID": "4a9d56c8-57ea-4e91-b39f-1abddfff05e3" }, "ColumnName": "总工时" } @@ -306,7 +387,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "ID", - "GUID": "db82b94a-603e-42c9-94fb-64b10011c044" + "GUID": "16004d07-1b90-4d20-860d-b97019f2829c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -318,14 +399,14 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "8ea1007d-e0f2-4a14-98d2-8dbbbf6037cf" + "GUID": "c9a1b4db-dc37-457f-9fd2-593dd9487b8b" }, "Value": "计划" } ] } }, - "ID": "8a326bb3f5e14ad4a1d0f195ba26c5f6", + "ID": "9b9825bc5aa24e159d27259c07a9ebbf", "Comments": "检查工时是否超支" }, { @@ -357,7 +438,7 @@ } } ], - "ID": "c5c7aac0-dd9d-4706-8ee4-c005ce24d766" + "ID": "4c5503c2-583d-40c1-b74d-ebf56887982e" } ] }, @@ -371,7 +452,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "成员ID", - "GUID": "e2865898-e911-4984-af03-a632533958f1", + "GUID": "0da8b305-24c1-4de1-ac04-bd4c4f3bf0c3", "RelationBinding": { "RelatedTable": "任务成员表", "RelatedColumn": "ID", @@ -384,7 +465,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "成员ID", - "GUID": "de51f79d-6019-4e75-8385-023cc8e19249", + "GUID": "7a8bdedb-03ec-478d-be75-97a5a5a2095b", "RelationBinding": { "RelatedTable": "任务成员表", "RelatedColumn": "ID", @@ -397,7 +478,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", - "GUID": "6462a6b8-bb0b-41c9-8483-7a006ffbc538" + "GUID": "b28ed0ac-3392-494f-9906-e0e37d91bea1" }, "ColumnName": "总工时" } @@ -410,7 +491,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "ID", - "GUID": "56e375d1-b201-4b44-9aac-2621262c6e29" + "GUID": "18302667-d429-4d0f-b620-fa6903b1bdff" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -422,7 +503,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "9021677f-d0bd-48a5-8462-cefd2ff6e02a" + "GUID": "5e9a67b3-4db6-4a54-bdc0-004844401b1a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -432,14 +513,14 @@ ] } }, - "ID": "df6f78761b1249f78144e101115282e7", + "ID": "f84fe0844214461fbdd56060934dfa24", "Comments": "检查预算是否超支" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "总消耗金额", "ParameterValue": "0", - "ID": "3443b1c570584aaea455f4f7fb79eed1" + "ID": "ea3316190a0d490fa5b64c2be167533d" }, { "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", @@ -459,7 +540,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=总消耗金额+(Item.任务时薪*Item.总工时)" }, - "ID": "504fbfc09a2b4656b4bbcc9f38604960" + "ID": "299d3687c3d1429791f73507bea2d5e6" } ] }, @@ -492,18 +573,18 @@ } } ], - "ID": "47bf4734-aece-421e-b41a-a6d0eff5fc1a" + "ID": "c1223bd2-b2d4-41eb-8f10-f543c38f1df8" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式", - "ID": "1534bc82-d82f-4186-967d-c3bac1031f0c" + "ID": "2a0cc0b3-1b76-4dbc-a2fa-0653012c057b" } ] } ], - "ID": "404ab964-9c86-46e2-bdf4-9366a7d6f2f3" + "ID": "2a7b87a4-8485-4290-9259-e7cd590d159d" } ] }, @@ -514,7 +595,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=工时数" }, - "ID": "181e4cf6c6f14d98b7bbad5f1a76839c" + "ID": "d63b795db2da442a826146ac7d87d239" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -523,7 +604,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1" }, - "ID": "eb8e1b79731e4e8f91be8550ffa3e68b" + "ID": "c050ca8a42f34ec0a7b4ebfbda3c2a47" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -547,7 +628,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=开始日期+(index-1)" }, - "ID": "b9b5ba8e100b4e46940ad640cdb69a1a" + "ID": "aec022bc176243ac8935e01cdc2e6cbd" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -560,7 +641,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", - "GUID": "f911f362-c418-4e69-9cf9-a54058b9ba65" + "GUID": "94b49e51-4abc-4781-945f-1a44c5cf2048" }, "ColumnName": "总工时" } @@ -573,7 +654,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "3c3ddeda-accd-4fa6-bfcc-3a7ec1211ada" + "GUID": "609e8eb1-c8d4-4888-81ff-fed104c1dcc7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -585,7 +666,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "5cd28f80-f30d-405a-a8a9-5a055ce78348" + "GUID": "98133852-dd53-4274-aa8d-760332dd12a6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -597,7 +678,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "9da43b76-13c1-4475-85f7-b3d3f21a7969" + "GUID": "e42f6081-4cbe-4467-80e4-01d754edd4b5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -608,7 +689,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "0c1eccf143b14acbab9d4f4a3e3851b6" + "ID": "ca5ea7f6ea644851b29b2a59813bb41e" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -637,10 +718,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" }, - "ID": "740a550bb158456e8be9a90f65ca36c3" + "ID": "cb85c2cb59854a3fbf833f96a3acd658" } ], - "ID": "302c7551-ea18-47fe-bb85-aa7b43c3a752" + "ID": "bd2d2e56-e0ec-40a2-ad29-0a3d4e8b1484" }, { "CommandList": [ @@ -651,10 +732,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=待分配工时" }, - "ID": "fc07533dafce4f5aaeaa7eaf961939f1" + "ID": "5574195e75eb4eef8f2e352e0e1614da" } ], - "ID": "63594e0b-c901-480e-a2d0-d03a28a78dea" + "ID": "5c13fbe4-5acc-4b1f-a4f9-dad79a18762d" } ] }, @@ -681,10 +762,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(OR(任务成员.参与人负荷=\"\",任务成员.参与人负荷=0,任务成员.参与人负荷>24),24,任务成员.参与人负荷)" }, - "ID": "1e53b7b9e8a04c129e342b45e3c47d54" + "ID": "1d64577832de466897d1c9a953717594" } ], - "ID": "d352a4cd-8204-42d0-80f3-e831bf67125f" + "ID": "8b9b2eb3-1503-424d-951e-980100744035" }, { "Condition": { @@ -703,10 +784,10 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "执行人负荷", "ParameterValue": "24", - "ID": "0f3ac37afb4749209bea30938a910663" + "ID": "518ad3dadbf649fa9409382d3c7209bf" } ], - "ID": "be05c5f0-f7c5-4d3f-aa3e-3d82e74bea92" + "ID": "50b18a15-5e90-4cfc-aa4d-a801c1aa1806" } ] }, @@ -717,7 +798,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+计算本次分配工时" }, - "ID": "98fea5cb661f497bb382b80dde04f07c" + "ID": "452168f697db479aaf2e519ffb7e824a" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -746,7 +827,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" }, - "ID": "b9eea0e94cf94ac488b37d8dcdf5edaa" + "ID": "0bddc8cfd55c4c2c92dab2ad91ea5ff4" }, { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", @@ -758,7 +839,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "成员ID", - "GUID": "b6d5eb08-a115-4f80-9d9e-fa5b7423f967" + "GUID": "9d9f1cc1-16f2-4806-b4cf-b4018d0fa411" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -769,7 +850,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "aed1cf5e-031c-4368-a844-878a85358b4e" + "GUID": "aee3ecdd-3e2d-40f4-87d9-64eb28fc7da2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -780,7 +861,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "3aba7d32-b856-4517-9cf0-7b47a686cbe0" + "GUID": "dd897598-9e8f-41d5-87ba-1204a02fe873" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -791,7 +872,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "08a8a09b-0eb6-448c-ade1-ff8fd2a81e20" + "GUID": "af2e2347-3dcd-4495-a5cc-29dc7b10d7fa" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -802,7 +883,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "8bba0c26-5b4c-491a-8791-b278aca28a67" + "GUID": "a02bb91a-4c83-4797-b7fe-e6546548fa2d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -813,7 +894,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "1e35b016-8e3f-46ee-92c9-71e0ee277d69" + "GUID": "39b2029e-52a9-4338-afc5-305a95d0cbc6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -824,7 +905,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "d4f76905-219c-43b0-888f-2bfee023a802" + "GUID": "abf4b9bb-ff79-42e7-a3e5-d6cd5393010c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -835,17 +916,28 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "f9998452-573f-4e93-9444-76d1a69dc894" + "GUID": "29ab3f03-9006-4fa3-b2c0-bb08e4aca8d8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=计算本次分配工时" } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "时薪单价", + "GUID": "95a3adbb-b9ba-4922-969b-1655ebfd738a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算时薪" + } } ] } ], - "ID": "6553c41b-585c-45e3-ae30-fde01272f2b1" + "ID": "a25fb449-e0f1-4eda-af74-f0bbb0fce524" }, { "CommandList": [ @@ -858,7 +950,7 @@ } } ], - "ID": "d73b9976-948d-4d5b-bba9-12310d0a4494" + "ID": "beeaf738-6851-4f9a-b488-4cf61794e40c" } ] } @@ -872,7 +964,7 @@ "Message": "提交工时成功" } ], - "ID": "5a018d8e-9938-45df-857d-2b9bdb6ffff5" + "ID": "1cdf6748-407f-4f0f-b616-e1d5006f3f5f" }, { "CommandList": [ @@ -885,7 +977,7 @@ } } ], - "ID": "e858b937-99d5-4d7a-b2e8-1feb8a808a8d" + "ID": "a62187b1-5de9-4d78-9420-5cf793bb5ad8" } ] } diff --git a/Tables/工时/任务工时表.json b/Tables/工时/任务工时表.json index 17570c2c..c3dcfb66 100644 --- a/Tables/工时/任务工时表.json +++ b/Tables/工时/任务工时表.json @@ -67,6 +67,13 @@ "Name": "工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "时薪单价", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",