From 101f1e15780bc6a13fa95c62ab142656379adfd0 Mon Sep 17 00:00:00 2001
From: wangky <m1561510467@163.com>
Date: 星期二, 05 十一月 2024 15:07:13 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
common.h | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/common.h b/common.h
index 525f1f0..fb8ffa3 100644
--- a/common.h
+++ b/common.h
@@ -613,10 +613,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;//鐢熶骇杩涘害
@@ -626,7 +627,9 @@
struct MonoutputInfo
{
int month;//鏈堜唤
- double output;//鏈堜骇閲�
+ double aOutput;//a浜у搧鏈堜骇閲�
+ double bOutput;//b浜у搧鏈堜骇閲�
+ double cOutput;//c浜у搧鏈堜骇閲�
};
//娣诲姞涓�鏉＄敓浜ц鍒掔殑璇锋眰缁撴瀯浣�
@@ -700,12 +703,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;
@@ -798,7 +803,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