From b8c2edb43cf778ca0203a3a592815aeeb6bcdcde Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 10 七月 2023 21:42:39 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/项目管理/项目阶段/Gy_ProjectStageController.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs"
index 856cc03..18bcc3f 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs"
@@ -392,7 +392,7 @@
public string HStageNote;
public int HPMGoodsID;
public string HPMGoodsName;
- public int HIsKey;
+ public bool HIsKey;
public double HRate;
//public int HEmpID;
//public string HEmpName;
@@ -489,6 +489,8 @@
string HRemark = mainList[0].HRemark;
string HMaker = mainList[0].HMaker;
string HMakerDate = mainList[0].HMakerDate;
+ string HUpdater = mainList[0].HUpdater;
+ string HUpdaterDate = mainList[0].HUpdaterDate;
if (OperationType == 2)
{
@@ -539,8 +541,8 @@
"',HBillNo = '" + HBillNo +
"',HBillStatus = " + HBillStatus +
",HRemark = '" + HRemark +
- "',HMaker = '" + HMaker +
- "',HMakeDate = '" + HMakerDate +
+ "',HUpdater = '" + HUpdater +
+ "',HUpdateDate = '" + HUpdaterDate +
"' where HInterID = " + HInterID;
oCN.RunProc(sql);
@@ -593,7 +595,7 @@
string HStageNote = oSub.HStageNote;
int HPMGoodsID = oSub.HPMGoodsID;
string HRelationGoods = oSub.HPMGoodsName;
- int HIsKey = oSub.HIsKey;
+ int HIsKey = oSub.HIsKey?1:0;
double HRate = oSub.HRate;
string HRemark = oSub.HRemarkSub;
@@ -835,7 +837,7 @@
public int RowID;
public int HEmpID;
public string HEmpName;
- public int HIsPM;
+ public bool HIsPM;
public double HRate;
public double HAvgMoney;
public double HCountMoney;
@@ -941,6 +943,8 @@
string HRemark = mainList[0].HRemark;
string HMaker = mainList[0].HMaker;
string HMakerDate = mainList[0].HMakerDate;
+ string HUpdater = mainList[0].HUpdater;
+ string HUpdaterDate = mainList[0].HUpdaterDate;
if (OperationType == 2)
@@ -1005,8 +1009,8 @@
"',HBillNo = '" + HBillNo +
"',HBillStatus = " + HBillStatus +
",HRemark = '" + HRemark +
- "',HMaker = '" + HMaker +
- "',HMakeDate = '" + HMakerDate +
+ "',HUpdater = '" + HUpdater +
+ "',HUpdateDate = '" + HUpdaterDate +
"',HProNumber = '" + HProNumber +
"',HProjectStageID = " + HProjectStageID +
",HStageNote = '" + HStageNote +
@@ -1068,7 +1072,7 @@
int HEntryID = i;
int HEmpID = oSub.HEmpID;
- int HIsPM = oSub.HIsPM;
+ int HIsPM = oSub.HIsPM?1:0;
double HRate = oSub.HRate;
double HAvgMoney = oSub.HAvgMoney;
double HCountMoney = oSub.HCountMoney;
--
Gitblit v1.9.1