From f1603411544ac50b732d4542d650a8721f18a205 Mon Sep 17 00:00:00 2001
From: wxx <1321839169@qq.com>
Date: 星期一, 04 十一月 2024 12:22:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Client/冀浩昶/log/日志_冀浩昶_1104.doc | 0
common.h | 23 +++++++++++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git "a/Client/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1104.doc" "b/Client/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1104.doc"
new file mode 100644
index 0000000..3ea0cc8
--- /dev/null
+++ "b/Client/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1104.doc"
Binary files differ
diff --git a/common.h b/common.h
index 8c1266d..e52d8d8 100644
--- a/common.h
+++ b/common.h
@@ -605,10 +605,11 @@
//鐢熶骇璁″垝绠＄悊
struct PdplanInfo
{
- int id;//鐢熶骇璁″垝缂栧彿
- char planName[32];//鐢熶骇璁″垝鍚嶅瓧
+ int planId;//璁㈠崟缂栧彿
+ char planName[32];//璁㈠崟鍚嶅瓧
char startDate[32];//璧峰鏃ユ湡
- char closingDate[32];//鎴嚦鏃ユ湡
+ char closingDate[32];//浜や粯鏃ユ湡
+ char pdName[8];//浜у搧鍚�
double plannedPd;//璁″垝鐢熶骇閲�
double actualPd;//瀹為檯鐢熶骇閲�
double progress;//鐢熶骇杩涘害
@@ -618,7 +619,9 @@
struct MonoutputInfo
{
int month;//鏈堜唤
- double output;//鏈堜骇閲�
+ double aOutput;//a浜у搧鏈堜骇閲�
+ double bOutput;//b浜у搧鏈堜骇閲�
+ double cOutput;//c浜у搧鏈堜骇閲�
};
//娣诲姞涓�鏉＄敓浜ц鍒掔殑璇锋眰缁撴瀯浣�
@@ -692,12 +695,14 @@
struct QueryPdplanReq
{
Head head;
- int id;//鐢熶骇璁″垝缂栧彿
- char planName[32];//鐢熶骇璁″垝鍚嶅瓧
+ int planId;//璁㈠崟缂栧彿
+ char planName[32];//璁㈠崟鍒掑悕瀛�
char startDate[32];//璧峰鏃ユ湡
- char closingDate[32];//鎴嚦鏃ユ湡
+ char closingDate[32];//浜や粯鏃ユ湡
+ char pdName[8];//浜у搧鍚�
double plannedPd;//璁″垝鐢熶骇閲�
double actualPd;//瀹為檯鐢熶骇閲�
+ double progress;//鐢熶骇杩涘害
int finishOntime;//鏄惁鎸夋湡瀹屾垚
QueryPdplanReq() {
head.type = QUERY_PDPLAN_REQ;
@@ -790,7 +795,9 @@
{
Head head;
int month;//鏈堜唤
- double output;//鏈堜骇閲�
+ double aOutput;//a浜у搧鏈堜骇閲�
+ double bOutput;//b浜у搧鏈堜骇閲�
+ double cOutput;//c浜у搧鏈堜骇閲�
QueryMonoutputReq() {
head.type = QUERY_MONOUTPUT_REQ;
head.len = sizeof(QueryMonoutputReq);
--
Gitblit v1.8.0