admin/clue
1
0
Fork 0
Code Pull Requests 1 Actions Activity

{"Message":"更新工时计算方式的BUG","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/项目反馈"},{"State":1,"Type":1,"Name":"PCPage/项目列表"},{"State":1,"Type":15,"Name":"ServerCommand/计算报工数据"},{"State":1,"Type":40,"Name":"Plugin"}],"Version":"v1"}

Browse Source
This commit is contained in:
cuckooent
2025-03-31 18:56:38 +08:00
parent 4138cbaf4e
commit da8ee4ae97
10 changed files with 147 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
ServerCommands/工时/计算报工数据.json
View File

@@ -91,7 +91,7 @@
"$values": [
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "4da229be-0e7c-4268-96b0-31fab7de3542",
"GUID": "837b629f-d38d-414e-a843-5cafe5ebf812",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "任务平行视图",
@@ -102,7 +102,7 @@
},
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "13c6f469-5d70-40b1-9bcb-f8c362a59427",
"GUID": "1f41ecb7-ad12-465e-a050-cca9d80a2b5f",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "任务平行视图",
@@ -119,7 +119,7 @@
},
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "0695854f-24c5-4ae3-8b66-a308a6159bde",
"GUID": "cdbf1fac-8333-4e84-87ed-727fa316b263",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "任务平行视图",
@@ -136,7 +136,7 @@
},
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "7ea9c6f8-973a-4b97-867a-cabb09ce5c24",
"GUID": "0b5b9621-db0b-4dec-aa91-7eec7fbfc522",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "任务平行视图",
@@ -153,7 +153,7 @@
},
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "cc663eec-f5d9-478e-a921-790b226cc119",
"GUID": "c3b3f3cd-d520-4e83-b3da-e8dd75b444eb",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "任务平行视图",
@@ -170,7 +170,7 @@
},
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "fd9bd072-be99-4999-b9ee-92fd40748bf4",
"GUID": "fe5c5be1-b647-4b20-9134-86e90ffd3f92",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "任务平行视图",
@@ -187,7 +187,7 @@
},
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "1edee222-5dc4-4451-a188-0f68ea210065",
"GUID": "e95cc5a8-e6bc-44fd-9016-f7a53117cd80",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "任务平行视图",
@@ -198,7 +198,7 @@
},
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "1ce94689-2da5-4361-9578-a1c6f8c55513",
"GUID": "502164b9-8fa9-4235-a99d-0d53502cd914",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "任务平行视图",
@@ -209,7 +209,7 @@
},
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "3c4dc6f8-572b-4e3e-a78a-0c9f9dbd8123",
"GUID": "d7e68a5d-421b-4138-90d4-49f4c778ff57",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "任务平行视图",
@@ -220,7 +220,7 @@
},
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "2eaee617-cf67-4cc9-98d5-c0be15415d4f",
"GUID": "98fa2286-a955-4580-baed-a35ff1618e9d",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "任务平行视图",
@@ -237,7 +237,7 @@
},
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "a43ac6fd-37e6-4502-a39b-e4841b1695bb",
"GUID": "63bb875f-ac18-4cf8-beea-db07a5cca68f",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "任务平行视图",
@@ -254,7 +254,7 @@
},
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "df068ea4-e310-4442-b9f1-86f9360f9e64",
"GUID": "f27d4bf7-044b-4f9c-8b7b-0b67ff04de89",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "任务平行视图",
@@ -281,7 +281,7 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
"ID": "d2db1f66567b49b28ea2194332f72261",
"ID": "9289b62448dc40eaa06b2340ae4e2db0",
"BreakpointIdentity": "9bb40356-64d2-45a0-834d-60e548bda3ef"
},
{
@@ -468,7 +468,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=工时数"
},
"ID": "513208670e2048768df441f7e683b0e1",
"ID": "10023bb2d04a4cbb9ec8d1aa36329a08",
"BreakpointIdentity": "d8cb051a-075a-4c55-ad96-ee89f101b82d"
},
{
@@ -534,7 +534,7 @@
]
},
"Comments": "项目成员设置的时薪",
"ID": "f2f7b935-0567-452b-a81b-73e987f3ae92"
"ID": "c3c68af2-b5fc-434e-a488-cef9bb5bc51e"
},
{
"$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -573,7 +573,7 @@
]
},
"Comments": "项目岗位设置的时薪",
"ID": "f9d872f0-38df-4c43-8c65-0bae466ec67c"
"ID": "74338e05-8f5f-4af1-b3e9-07cf76356699"
},
{
"$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -612,7 +612,7 @@
]
},
"Comments": "成员用户的默认时薪",
"ID": "9fdb4f09-7092-47ca-a3b6-63b57acf4de9"
"ID": "670fa340-3d47-4cbe-860c-a8d24c972be6"
},
{
"$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -635,7 +635,7 @@
}
]
},
"ID": "ef4b72fd-f477-4aec-aa08-1bf6cdd05b76"
"ID": "1bfa5fa2-6904-440a-a9e2-fb0f64d197ad"
}
]
},
@@ -644,7 +644,7 @@
]
},
"Comments": "优先使用手动指定的提成金额",
"ID": "c4ec5f89-93cb-4c5e-be59-b4262f2c8b5f"
"ID": "eef70f0e-24b4-43e3-b6e6-da84e8821b3b"
},
{
"$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -670,7 +670,7 @@
}
]
},
"ID": "41f678c3-eff8-4dfe-a108-01801d1c973a"
"ID": "05e20f4e-2312-41c9-a255-4e1568f81a71"
}
]
},
@@ -752,7 +752,7 @@
"$values": [
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "6522ba61-80e8-414a-85dd-a350ee0740e5",
"GUID": "db269596-e853-4fc3-b32b-00c19ef969e0",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "View_任务工时统计",
@@ -763,7 +763,7 @@
},
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
"GUID": "3d8ba6c8-14ff-4946-8236-e584acd8c684",
"GUID": "03be7e1c-aade-40ff-b739-5c319531b87c",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "View_任务工时统计",
@@ -810,7 +810,7 @@
},
"NullFormulaValueQueryPolicy": 0
},
"ID": "8662f7dbb85a461591528d74dbba18de",
"ID": "2763506807e446e88a269b79d2f9c2c0",
"Comments": "从视图统计项目的信息",
"BreakpointIdentity": "c896be89-9fd5-40d8-ae82-ff74243c2b88"
},
@@ -821,7 +821,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=个人工时情况.总计划工时-个人工时情况.总实际工时"
},
"ID": "6dc07a32702540ba8c1c8e67f4d7f66b",
"ID": "8414a40962a04614a033cbf5b304e599",
"BreakpointIdentity": "a46de59f-0453-4534-8096-6a9ba10058bf"
},
{
@@ -840,45 +840,98 @@
"SerializeProperty": "=个人剩余总工时"
}
},
"value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=工时数"
},
"compareType": 4
"value": "0",
"compareType": 2
},
"CommandList": {
"$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib",
"$values": [
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
"ConditionAndCommandPairList": {
"$type": "System.Collections.Generic.List`1[[Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon]], System.Private.CoreLib",
"$values": [
{
"$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
"Condition": {
"$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": 4
},
"CommandList": {
"$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib",
"$values": [
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "核定工时",
"ParameterValue": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=个人剩余总工时"
},
"ID": "151bdaf7bf2441cda180bad6c98ee979",
"BreakpointIdentity": "e233d267-d7db-4d95-9d96-88e59c0a59ef"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "核定工时说明",
"ParameterValue": "个人工时余额不足，按剩余工时核定！",
"ID": "901fb7311cf54ad2807f00370c244332",
"BreakpointIdentity": "49db70b4-bb84-4e03-9509-42d769f15a79"
}
]
},
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
"ID": "8c0ca144-a79c-46cb-9d26-6f2557ccc8d5"
}
]
},
"BreakpointIdentity": "263f4e3f-fbc2-4ac0-b548-6fcf3c6f834d"
}
]
},
"ID": "578861ae-c0b8-4917-9b48-506040ee05f4"
},
{
"$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
"CommandList": {
"$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib",
"$values": [
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "核定工时",
"ParameterValue": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=个人剩余总工时"
},
"ID": "9d3acc4ac63a4609981e0d4c77223315",
"BreakpointIdentity": "668d718f-c58a-4c5e-9f15-7e864034e6c5"
"ParameterValue": "0",
"ID": "d8b735e834f344d4ac98a25ae234b01c",
"BreakpointIdentity": "baffb6ad-bf13-41dd-9930-a43ef3593ec4"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "核定工时说明",
"ParameterValue": "个人工时余额不足，按剩余工时核定！",
"ID": "35f0050c10914815a69f515fbe6fcaae",
"BreakpointIdentity": "efda3a4a-6550-45ff-a1e0-565f309abc7c"
"ParameterValue": "个人工时余额不足，按本次核定为0！",
"ID": "5a1d3d3cf52a44d9aa5fc00e6cdf8407",
"BreakpointIdentity": "57452ebf-3277-4be3-be6b-31dab073e768"
}
]
},
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
"ID": "e5912933-c670-498e-9086-cc33a193b7fb"
"ID": "a678a5ce-3f7f-48e8-96d6-874e174b3901"
}
]
},
"BreakpointIdentity": "1dacd343-b46d-416f-8390-77365bbbb442"
"BreakpointIdentity": "de8454f9-8acf-4c80-acb9-a5f219be10cb"
}
]
},
"Comments": "如果分配到人头，则判断该人总计划工时还够不够",
"ID": "a06bd19a-519d-4d59-9074-633469266d3e"
"ID": "2587a22f-5dc5-424e-9374-71ebf5a3d449"
},
{
"$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -928,20 +981,20 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=IF(任务信息.可分配工时<0,0,任务信息.可分配工时)"
},
"ID": "13f9ccabb92d4ae484ab121e41955010",
"ID": "6fbe5ed67c1d41f8a888e1359e667075",
"BreakpointIdentity": "4b955436-f4e3-4c83-951a-55ee5c31a5aa"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "核定工时说明",
"ParameterValue": "任务工时余额不足，按剩余工时核定！",
"ID": "5afd6a71883042c2aa9bf0919d9e3c6c",
"ID": "7c0f5e0f877b4ad0966d8e00793d698b",
"BreakpointIdentity": "6a9e1918-7de8-4327-9c17-10148722207e"
}
]
},
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
"ID": "7bb9f38e-4ede-449a-a12e-37666e8940a0"
"ID": "a8673983-c3a5-46ef-8a75-66489dd0ed95"
}
]
},
@@ -950,7 +1003,7 @@
]
},
"Comments": "如果是共用任务工时，则查看任务计划工时够不够",
"ID": "92a56383-1988-4d3c-8a30-0f5d3e72889f"
"ID": "66194c03-5747-4022-8739-dda10f9e23f3"
}
]
},
@@ -1088,7 +1141,7 @@
}
]
},
"ID": "c0beba2d-531f-4bd5-92a3-36717bdb0e82"
"ID": "0baa2042-94da-48d3-a7c0-7e49ae3dea91"
},
{
"$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -1172,7 +1225,7 @@
}
]
},
"ID": "26908518-b535-4acd-a7fa-c703bf5bb7d2"
"ID": "987b789f-62af-4b59-841d-513763a909c5"
}
]
},
@@ -1180,7 +1233,7 @@
}
]
},
"ID": "d578f3d9-2103-4173-ac62-fb8d24636825"
"ID": "e5d27855-8014-4d9b-8381-58bee1e33328"
},
{
"$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -1232,7 +1285,7 @@
}
]
},
"ID": "0d27be88-7a3d-41ad-9f6d-3b249cbd27f5"
"ID": "fd847b7e-e9b8-4f1c-bee9-14586c4ca6ee"
}
]
},
@@ -1241,7 +1294,7 @@
]
},
"Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标",
"ID": "2a476589-39a0-4106-a218-9785ba359a36"
"ID": "8bcc411a-a52d-4b0f-92de-79c660710b63"
},
{
"$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -1325,7 +1378,7 @@
}
]
},
"ID": "88833066-8fbc-4460-9841-b8fbcb65faaf"
"ID": "c106a898-7401-48f7-abac-c9acb40fdc51"
}
]
},
@@ -1333,7 +1386,7 @@
}
]
},
"ID": "9bd36c9f-7bc4-465f-89a9-81e2c7ca04a9"
"ID": "ea0e40bc-14d9-4a0e-9061-1d83ce231e23"
},
{
"$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -1385,7 +1438,7 @@
}
]
},
"ID": "763f26ff-d7a3-44f1-9c9b-a2399dd3c323"
"ID": "269c8a39-5fb7-4146-a716-c27819f543a2"
}
]
},