From e4f1a927520a98fbc69dd63ef982dd890ba4fbdc Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 03 七月 2025 11:14:26 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/项目管理/工程项目/PM_ProjectBillController.cs | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 15 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 f34016e..8a7181d 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"
@@ -43,6 +43,8 @@
public DAL.ClsGy_ProjectMoneyBOMBill BillNew7 = new DAL.ClsGy_ProjectMoneyBOMBill(); //椤圭洰璐圭敤娓呭崟瀵瑰簲鍗曟嵁绫�
public DAL.ClsGy_ProjectMoneyBOMBill BillOld7 = new DAL.ClsGy_ProjectMoneyBOMBill();
+
+
#region 宸ョ▼椤圭洰 鏂板/缂栬緫
#region 宸ョ▼椤圭洰 琛ㄥご鏁版嵁
public class PM_ProjectBill_Main
@@ -101,6 +103,7 @@
public string HProjectNote;
public string HContacts;
public string HContactNumber;
+ public int HDeptID;
public int HSupplierID; //鍒嗗寘鍗曚綅锛坓y_supllier锛�
public int HMangerEmpID; //绠＄悊鍛橈紙gy_Employee锛�
@@ -115,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; //鍚堝悓閫犱环
@@ -124,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)
@@ -317,7 +324,7 @@
string HProjectNote = mainList[0].HProjectNote;
string HContacts = mainList[0].HContacts;
string HContactNumber = mainList[0].HContactNumber;
-
+ int HDeptID = mainList[0].HDeptID; //閮ㄩ棬
int HSupplierID = mainList[0].HSupplierID; //鍒嗗寘鍗曚綅锛坓y_supllier锛�
int HMangerEmpID = mainList[0].HMangerEmpID; //绠＄悊鍛橈紙gy_Employee锛�
@@ -332,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; //缁撶畻閫犱环
@@ -341,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)
@@ -403,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)" +
+ "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 +
@@ -473,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 + "'" +
+ ",'" + HCloseValveQty + "'" + ",'" + HBeginOpenValveTime + "'" + ",'" + HEndOpenValveTime + "'" + ",'" + HOpenValveQty + "'" + ",'" + HValveWorkEmp + "'" + ",'" + HTaskRemark + "','" + HDeptID + "','" + HProPMEmpID + "','" + HWorkPicNumber + "','" + HProBeginDate + "','" + HProEndDate + "'"+
")";
//涓昏〃
@@ -552,10 +562,9 @@
"',HTaskSetupMoney = '" + HTaskSetupMoney + "',HTaskOtherMoney = '" + HTaskOtherMoney + "',HTaskExamMoney = '" + HTaskExamMoney + "',HTaskWorkMoney = '" + HTaskWorkMoney + "',HIsAccount = '" + (HIsAccount?1:0) + "',HAccountDate = '" + HAccountDate +
"',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 +
-
+ "',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);
//鍒犻櫎瀛愯〃
@@ -809,6 +818,44 @@
}
#endregion
+ #region (浠诲姟绫伙級鐨勫伐绋嬮」鐩柊澧� 鏍规嵁浠诲姟澶х被 浠诲姟椤圭洰鍒嗙被 鏃ユ湡 鏇存柊 椤圭洰浠ｇ爜
+ [Route("PM_ProjectBill/GetHProjectHNumber")]
+ [HttpGet]
+ public object GetHProjectHNumber( int HDeptID, DateTime HDate,int HTaskClassID,int HTaskClassEntryID,int HType)
+ {
+ DataSet ds;
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+
+ ds = oCN.RunProcReturn("exec h_p_Xt_GetMaxBillNo_SubType '4750','" + HDate + "','" + HTaskClassID + "','" + HTaskClassEntryID + "','" + HDeptID + "',"+HType, "h_p_Xt_GetMaxBillNo_SubType");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#region 宸ョ▼椤圭洰 缂栬緫-椤甸潰璧嬪��
/// <summary>
@@ -5714,7 +5761,7 @@
#region 宸ョ▼椤圭洰璐圭敤寰呭鏍稿垪琛�
[Route("PM_ProjectBill/NeedCheckQuery")]
[HttpGet]
- public object PM_ProjectBillNeedCheckQuery(string user)
+ public object PM_ProjectBillNeedCheckQuery(string user,string sWhere)
{
DataSet ds;
try
@@ -5730,7 +5777,7 @@
// return objJsonResult;
//}
//sWhere = sWhere.Replace("'", "''");
- ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedCheckQuery ", "h_p_PM_ProjectBillNeedCheckQuery");
+ ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedCheckQuery " + sWhere, "h_p_PM_ProjectBillNeedCheckQuery");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -5904,7 +5951,7 @@
#region 宸ョ▼椤圭洰璐圭敤寰呬繚瀛樺垪琛�
[Route("PM_ProjectBill/NeedSaveQuery")]
[HttpGet]
- public object PM_ProjectBillNeedSaveQuery(string user)
+ public object PM_ProjectBillNeedSaveQuery(string user,string sWhere)
{
DataSet ds;
try
@@ -5920,7 +5967,7 @@
// return objJsonResult;
//}
//sWhere = sWhere.Replace("'", "''");
- ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedSaveQuery ", "h_p_PM_ProjectBillNeedSaveQuery");
+ ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedSaveQuery "+sWhere, "h_p_PM_ProjectBillNeedSaveQuery");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
--
Gitblit v1.9.1