From ae4902061bc8e34f341d55b85f28acdf24d3b9dc Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 26 六月 2025 14:41:51 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/项目管理/工程项目/PM_ProjectBillController.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 2172115..1223def 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"
@@ -118,6 +118,10 @@
public string HWaterSupplyDate; //閫氭按鏃ユ湡
public string HWorkNote; //绔ｅ伐璧勬枡锛堝瘜鏂囨湰锛�
public string HWorkProcNote; //鏂藉伐瀹屾垚鎯呭喌锛堝瘜鏂囨湰锛�
+ public string HProBeginDate; //宸ョ▼寮�宸ユ棩鏈�
+ public string HProEndDate; //宸ョ▼瀹屽伐鏃ユ湡
+ public int HProPMEmpID; //宸ョ▼椤圭洰缁忕悊
+ public string HWorkPicNumber; //绔ｅ伐鍥剧紪鍙�
public double HYuSuanMoney; //棰勭畻閫犱环
public double HHeTongMoney; //鍚堝悓閫犱环
@@ -127,8 +131,8 @@
public double HAnZhuangMoney; //瀹夎璐�
public double HBanZuMoney; //鐝粍宸ヨ垂
public double HYuShouKuanMoney; //棰勬敹娆�
- public double HGongFeiMoney; //宸ヨ垂缁撹处
- public double HJieZhangMoney; //缁撶畻缁撹处
+ public string HGongFeiMoney; //宸ヨ垂缁撹处
+ public string HJieZhangMoney; //缁撶畻缁撹处
public int HTaskClassID; //浠诲姟澶х被(Gy_TaskClass)
public int HTaskClassEntryID; //浠诲姟椤圭洰鍒嗙被(Gy_TaskClass)
@@ -335,7 +339,10 @@
string HWaterSupplyDate = mainList[0].HWaterSupplyDate; //閫氭按鏃ユ湡
string HWorkNote = mainList[0].HWorkNote; //绔ｅ伐璧勬枡锛堝瘜鏂囨湰锛�
string HWorkProcNote = mainList[0].HWorkProcNote; //鏂藉伐瀹屾垚鎯呭喌锛堝瘜鏂囨湰锛�
-
+ int HProPMEmpID = mainList[0].HProPMEmpID; //椤圭洰缁忕悊
+ string HWorkPicNumber = mainList[0].HWorkPicNumber; //绔ｅ伐鍥剧紪鍙�
+ string HProBeginDate = mainList[0].HProBeginDate; //椤圭洰寮�宸ユ棩鏈�
+ string HProEndDate = mainList[0].HProEndDate; //椤圭洰瀹屽伐鏃ユ湡
double HYuSuanMoney = mainList[0].HYuSuanMoney; //棰勭畻閫犱环
double HHeTongMoney = mainList[0].HHeTongMoney; //鍚堝悓閫犱环
double HJieSuanMoney = mainList[0].HJieSuanMoney; //缁撶畻閫犱环
@@ -344,8 +351,8 @@
double HAnZhuangMoney = mainList[0].HAnZhuangMoney; //瀹夎璐�
double HBanZuMoney = mainList[0].HBanZuMoney; //鐝粍宸ヨ垂
double HYuShouKuanMoney = mainList[0].HYuShouKuanMoney; //棰勬敹娆�
- double HGongFeiMoney = mainList[0].HGongFeiMoney; //宸ヨ垂缁撹处
- double HJieZhangMoney = mainList[0].HJieZhangMoney; //缁撶畻缁撹处
+ string HGongFeiMoney = mainList[0].HGongFeiMoney; //宸ヨ垂缁撹处
+ string HJieZhangMoney = mainList[0].HJieZhangMoney; //缁撶畻缁撹处
int HTaskClassID = mainList[0].HTaskClassID; //浠诲姟澶х被(Gy_TaskClass)
int HTaskClassEntryID = mainList[0].HTaskClassEntryID; //浠诲姟椤圭洰鍒嗙被(Gy_TaskClass)
@@ -406,7 +413,7 @@
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate,HProNumber,HProName,HCusID,HBeginDate,HEndDate,HSumMoney," +
"HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote,HContacts,HContactNumber" +
",HSupplierID,HMangerEmpID,HMaterPlanDate,HWorkerID,HPlanWorkTimes,HRelWorkTimes,HTestDate,HTestCheckerID,HTestNote,HSewageDate,HWaterSupplyDate,HWorkNote,HWorkProcNote,HYuSuanMoney,HHeTongMoney,HJieSuanMoney,HShenJiMoney,HCaiLiaoMoney,HAnZhuangMoney,HBanZuMoney,HYuShouKuanMoney,HGongFeiMoney,HJieZhangMoney," +
- "HTaskClassID,HTaskClassEntryID,HTaskAddress,HBreakStatus,HWaterLeakage,HPipeDiameter,HPipeMaterial,HAlarmEmp,HAlarmLink,HReceEmp,HReceTime,HTaskMaterMoney,HTaskSetupMoney,HTaskOtherMoney,HTaskExamMoney,HTaskWorkMoney,HIsAccount,HAccountDate,HAccountWorkMoneyDate,HIsCheckExam,HIsCheckWorkMoney,HInfoBackTime,HInfoBackMan,HInfoNote,HTaskBTime,HTaskETime,HTaskNote,HTaskWorkEmp,HBeginCloseValveTime,HEndCloseValveTime,HCloseValveQty,HBeginOpenValveTime,HEndOpenValveTime,HOpenValveQty,HValveWorkEmp,HTaskRemark,HDeptID)" +
+ "HTaskClassID,HTaskClassEntryID,HTaskAddress,HBreakStatus,HWaterLeakage,HPipeDiameter,HPipeMaterial,HAlarmEmp,HAlarmLink,HReceEmp,HReceTime,HTaskMaterMoney,HTaskSetupMoney,HTaskOtherMoney,HTaskExamMoney,HTaskWorkMoney,HIsAccount,HAccountDate,HAccountWorkMoneyDate,HIsCheckExam,HIsCheckWorkMoney,HInfoBackTime,HInfoBackMan,HInfoNote,HTaskBTime,HTaskETime,HTaskNote,HTaskWorkEmp,HBeginCloseValveTime,HEndCloseValveTime,HCloseValveQty,HBeginOpenValveTime,HEndOpenValveTime,HOpenValveQty,HValveWorkEmp,HTaskRemark,HDeptID,HProPMEmpID,HWorkPicNumber,HProBeginDate,HProEndDate)" +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -476,7 +483,7 @@
",'" + HTaskExamMoney + "'" + ",'" + HTaskWorkMoney + "'" + ",'" + (HIsAccount?1:0) + "'" + ",'" + HAccountDate + "'" + ",'" + HAccountWorkMoneyDate + "'" + ",'" + (HIsCheckExam ? 1 : 0) + "'" +
",'" + (HIsCheckWorkMoney ? 1 : 0) + "'" + ",'" + HInfoBackTime + "'" + ",'" + HInfoBackMan + "'" + ",'" + HInfoNote + "'" + ",'" + HTaskBTime + "'" +
",'" + HTaskETime + "'" + ",'" + HTaskNote + "'" + ",'" + HTaskWorkEmp + "'" + ",'" + HBeginCloseValveTime + "'" + ",'" + HEndCloseValveTime + "'" +
- ",'" + HCloseValveQty + "'" + ",'" + HBeginOpenValveTime + "'" + ",'" + HEndOpenValveTime + "'" + ",'" + HOpenValveQty + "'" + ",'" + HValveWorkEmp + "'" + ",'" + HTaskRemark + "','" + HDeptID + "'" +
+ ",'" + HCloseValveQty + "'" + ",'" + HBeginOpenValveTime + "'" + ",'" + HEndOpenValveTime + "'" + ",'" + HOpenValveQty + "'" + ",'" + HValveWorkEmp + "'" + ",'" + HTaskRemark + "','" + HDeptID + "','" + HProPMEmpID + "','" + HWorkPicNumber + "','" + HProBeginDate + "','" + HProEndDate + "'"+
")";
//涓昏〃
@@ -556,6 +563,7 @@
"',HAccountWorkMoneyDate = '" + HAccountWorkMoneyDate + "',HIsCheckExam = '" + (HIsCheckExam?1:0) + "',HIsCheckWorkMoney = '" + (HIsCheckWorkMoney?1:0) + "',HInfoBackTime = '" + HInfoBackTime + "',HInfoBackMan = '" + HInfoBackMan + "',HInfoNote = '" + HInfoNote +
"',HTaskBTime = '" + HTaskBTime + "',HTaskETime = '" + HTaskETime + "',HTaskNote = '" + HTaskNote + "',HTaskWorkEmp = '" + HTaskWorkEmp + "',HBeginCloseValveTime = '" + HBeginCloseValveTime + "',HEndCloseValveTime = '" + HEndCloseValveTime +
"',HCloseValveQty = '" + HCloseValveQty + "',HBeginOpenValveTime = '" + HBeginOpenValveTime + "',HEndOpenValveTime = '" + HEndOpenValveTime + "',HOpenValveQty = '" + HOpenValveQty + "',HValveWorkEmp = '" + HValveWorkEmp + "',HTaskRemark = '" + HTaskRemark + "',HDeptID = '" + HDeptID + "'" +
+ ",HProBeginDate = '" + HProBeginDate + "',HProEndDate = '" + HProEndDate + "',HProPMEmpID = '" + HProPMEmpID + "',HWorkPicNumber = '" + HWorkPicNumber +
" where HInterID = " + HInterID;
oCN.RunProc(sql);
--
Gitblit v1.9.1