From 560cbe48b5c63634ff351477e00c885c4e162f92 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 11 七月 2023 09:02:30 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/项目管理/工程项目/PM_ProjectBillController.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
index 26f196a..4f35198 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
@@ -81,7 +81,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;
@@ -98,7 +98,7 @@
public int RowID;
public int HEmployeeID;
public string HEmployeeName;
- public int HIsPM;
+ public bool HIsPM;
public double HRate;
public double HPlanAvgMoney;
public double HPlanCountMoney;
@@ -211,6 +211,8 @@
int HPayCusID = mainList[0].HPayCusID;
int HOrgID = mainList[0].HOrgID;
int HMaterID = mainList[0].HMaterID;
+ string HUpdater = mainList[0].HUpdater;
+ string HUpdaterDate = mainList[0].HUpdaterDate;
if (OperationType == 2)
{
@@ -281,8 +283,8 @@
"',HBillNo = '" + HBillNo +
"',HBillStatus = " + HBillStatus +
",HRemark = '" + HRemark +
- "',HMaker = '" + HMaker +
- "',HMakeDate = '" + HMakerDate +
+ "',HUpdater = '" + HUpdater +
+ "',HUpdateDate = '" + HUpdaterDate +
"',HProNumber = '" + HProNumber +
"',HProName = '" + HProName +
"',HCusID = " + HCusID +
@@ -359,7 +361,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;
int HEmpID = oSub.HEmpID;
int HCheckEmpID = oSub.HCheckEmpID;
@@ -408,7 +410,7 @@
int HEntryID = i;
string HRemark = oSub.HRemarkSub;
int HEmpID = oSub.HEmployeeID;
- int HIsPM = oSub.HIsPM;
+ int HIsPM = oSub.HIsPM?1:0;
double HRate = oSub.HRate;
double HPlanAvgMoney = oSub.HPlanAvgMoney;
double HPlanCountMoney = oSub.HPlanCountMoney;
--
Gitblit v1.9.1