From a0586edd1c53e6c7065fd2a90809ecb4fa293922 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 12 十一月 2024 17:43:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/项目管理/工程项目/PM_ProjectBillController.cs | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 105 insertions(+), 2 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 59fb125..26184fa 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"
@@ -101,6 +101,31 @@
public string HContacts;
public string HContactNumber;
+ public int HSupplierID; //鍒嗗寘鍗曚綅锛坓y_supllier锛�
+ public int HMangerEmpID; //绠＄悊鍛橈紙gy_Employee锛�
+ public string HMaterPlanDate; //鏉愭枡璁″垝
+ public int HWorkerID; //鏂藉伐鍛橈紙gy_Employee锛�
+ public double HPlanWorkTimes; //璁″垝宸ユ湡
+ public double HRelWorkTimes; //瀹為檯宸ユ湡
+ public string HTestDate; //璇曞帇鏃ユ湡
+ public int HTestCheckerID; //璇曞帇楠屾敹浜猴紙gy_Employee锛�
+ public string HTestNote; //璇曞帇璁板綍锛堝瘜鏂囨湰锛�
+ public string HSewageDate; //鎺掓薄鏃ユ湡
+ public string HWaterSupplyDate; //閫氭按鏃ユ湡
+ public string HWorkNote; //绔ｅ伐璧勬枡锛堝瘜鏂囨湰锛�
+ public string HWorkProcNote; //鏂藉伐瀹屾垚鎯呭喌锛堝瘜鏂囨湰锛�
+
+ public double HYuSuanMoney; //棰勭畻閫犱环
+ public double HHeTongMoney; //鍚堝悓閫犱环
+ public double HJieSuanMoney; //缁撶畻閫犱环
+ public double HShenJiMoney; //瀹¤閫犱环
+ public double HCaiLiaoMoney; //鏉愭枡璐�
+ public double HAnZhuangMoney; //瀹夎璐�
+ public double HBanZuMoney; //鐝粍宸ヨ垂
+ public double HYuShouKuanMoney; //棰勬敹娆�
+ public double HGongFeiMoney; //宸ヨ垂缁撹处
+ public double HJieZhangMoney; //缁撶畻缁撹处
+
}
#endregion
#region 宸ョ▼椤圭洰 椤圭洰闃舵琛ㄤ綋鏁版嵁
@@ -254,6 +279,34 @@
string HProjectNote = mainList[0].HProjectNote;
string HContacts = mainList[0].HContacts;
string HContactNumber = mainList[0].HContactNumber;
+
+
+ int HSupplierID = mainList[0].HSupplierID; //鍒嗗寘鍗曚綅锛坓y_supllier锛�
+ int HMangerEmpID = mainList[0].HMangerEmpID; //绠＄悊鍛橈紙gy_Employee锛�
+ string HMaterPlanDate = mainList[0].HMaterPlanDate; //鏉愭枡璁″垝
+ int HWorkerID = mainList[0].HWorkerID; //鏂藉伐鍛橈紙gy_Employee锛�
+ double HPlanWorkTimes = mainList[0].HPlanWorkTimes; //璁″垝宸ユ湡
+ double HRelWorkTimes = mainList[0].HRelWorkTimes; //瀹為檯宸ユ湡
+ string HTestDate = mainList[0].HTestDate; //璇曞帇鏃ユ湡
+ int HTestCheckerID = mainList[0].HTestCheckerID; //璇曞帇楠屾敹浜猴紙gy_Employee锛�
+ string HTestNote = mainList[0].HTestNote; //璇曞帇璁板綍锛堝瘜鏂囨湰锛�
+ string HSewageDate = mainList[0].HSewageDate; //鎺掓薄鏃ユ湡
+ string HWaterSupplyDate = mainList[0].HWaterSupplyDate; //閫氭按鏃ユ湡
+ string HWorkNote = mainList[0].HWorkNote; //绔ｅ伐璧勬枡锛堝瘜鏂囨湰锛�
+ string HWorkProcNote = mainList[0].HWorkProcNote; //鏂藉伐瀹屾垚鎯呭喌锛堝瘜鏂囨湰锛�
+
+ double HYuSuanMoney = mainList[0].HYuSuanMoney; //棰勭畻閫犱环
+ double HHeTongMoney = mainList[0].HHeTongMoney; //鍚堝悓閫犱环
+ double HJieSuanMoney = mainList[0].HJieSuanMoney; //缁撶畻閫犱环
+ double HShenJiMoney = mainList[0].HShenJiMoney; //瀹¤閫犱环
+ double HCaiLiaoMoney = mainList[0].HCaiLiaoMoney; //鏉愭枡璐�
+ 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; //缁撶畻缁撹处
+
+
if (OperationType == 2)
{
ds = oCN.RunProcReturn("select * from PM_ProjectBillMain where HBillNo ='" + HBillNo + "'", "PM_ProjectBillMain");
@@ -273,7 +326,8 @@
{
string sql = "insert into PM_ProjectBillMain" +
"(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) " +
+ "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) " +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -315,7 +369,30 @@
"','" + 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 + "'" +
+ ")";
//涓昏〃
oCN.RunProc(sql);
@@ -364,6 +441,32 @@
"',HProjectNote ='" + HProjectNote +
"',HContacts ='" + HContacts +
"',HContactNumber ='" + HContactNumber +
+
+ "',HSupplierID = '" + HSupplierID +
+ "',HMangerEmpID = '" + HMangerEmpID +
+ "',HMaterPlanDate = '" + HMaterPlanDate +
+ "',HWorkerID = '" + HWorkerID +
+ "',HPlanWorkTimes = '" + HPlanWorkTimes +
+ "',HRelWorkTimes = '" + HRelWorkTimes +
+ "',HTestDate = '" + HTestDate +
+ "',HTestCheckerID = '" + HTestCheckerID +
+ "',HTestNote = '" + HTestNote +
+ "',HSewageDate = '" + HSewageDate +
+ "',HWaterSupplyDate = '" + HWaterSupplyDate +
+ "',HWorkNote = '" + HWorkNote +
+ "',HWorkProcNote = '" + HWorkProcNote +
+ "',HYuSuanMoney = '" + HYuSuanMoney +
+ "',HHeTongMoney = '" + HHeTongMoney +
+ "',HJieSuanMoney = '" + HJieSuanMoney +
+ "',HShenJiMoney = '" + HShenJiMoney +
+ "',HCaiLiaoMoney = '" + HCaiLiaoMoney +
+ "',HAnZhuangMoney = '" + HAnZhuangMoney +
+ "',HBanZuMoney = '" + HBanZuMoney +
+ "',HYuShouKuanMoney = '" + HYuShouKuanMoney +
+ "',HGongFeiMoney = '" + HGongFeiMoney +
+ "',HJieZhangMoney = '" + HJieZhangMoney +
+
+
"' where HInterID = " + HInterID;
oCN.RunProc(sql);
--
Gitblit v1.9.1