From 9b6cd6ba2508314b3a4967b3764153170d40e66c Mon Sep 17 00:00:00 2001 From: wtt <1985833171@qq.com> Date: 星期四, 14 八月 2025 10:32:46 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/项目管理/工程项目/PM_ProjectBillController.cs | 273 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 255 insertions(+), 18 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 64cd4db..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; //绔e伐璧勬枡锛堝瘜鏂囨湰锛� public string HWorkProcNote; //鏂藉伐瀹屾垚鎯呭喌锛堝瘜鏂囨湰锛� + public string HProBeginDate; //宸ョ▼寮�宸ユ棩鏈� + public string HProEndDate; //宸ョ▼瀹屽伐鏃ユ湡 + public int HProPMEmpID; //宸ョ▼椤圭洰缁忕悊 + public string HWorkPicNumber; //绔e伐鍥剧紪鍙� 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; //绔e伐璧勬枡锛堝瘜鏂囨湰锛� string HWorkProcNote = mainList[0].HWorkProcNote; //鏂藉伐瀹屾垚鎯呭喌锛堝瘜鏂囨湰锛� - + int HProPMEmpID = mainList[0].HProPMEmpID; //椤圭洰缁忕悊 + string HWorkPicNumber = mainList[0].HWorkPicNumber; //绔e伐鍥剧紪鍙� + 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 (浠诲姟绫伙級鐨勫伐绋嬮」鐩柊澧� 鏍规嵁浠诲姟澶х被 浠诲姟椤圭洰鍒嗙被 鏃ユ湡 鏇存柊 椤圭洰浠g爜 + [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) @@ -5804,7 +5851,7 @@ { if (ds.Tables[0].Rows[0]["HTaskSetupMoneyCheckFlag"].ToString() == "False") { - oCN.RunProcReturn("update PM_ProjectBillMain set HTaskSetupMoneyCheckFlag = 1", "PM_ProjectBillMain"); + oCN.RunProcReturn("update PM_ProjectBillMain set HTaskSetupMoneyCheckFlag = 1 where HInterID = " + HInterID, "PM_ProjectBillMain"); } else { @@ -5820,7 +5867,7 @@ { if (ds.Tables[0].Rows[0]["HTaskOtherMoneyCheckFlag"].ToString() == "False") { - oCN.RunProcReturn("update PM_ProjectBillMain set HTaskOtherMoneyCheckFlag = 1", "PM_ProjectBillMain"); + oCN.RunProcReturn("update PM_ProjectBillMain set HTaskOtherMoneyCheckFlag = 1 where HInterID = " + HInterID, "PM_ProjectBillMain"); } else { @@ -5836,7 +5883,7 @@ { if (ds.Tables[0].Rows[0]["HTaskExamMoneyCheckFlag"].ToString() == "False") { - oCN.RunProcReturn("update PM_ProjectBillMain set HTaskExamMoneyCheckFlag = 1", "PM_ProjectBillMain"); + oCN.RunProcReturn("update PM_ProjectBillMain set HTaskExamMoneyCheckFlag = 1 where HInterID = " + HInterID, "PM_ProjectBillMain"); } else { @@ -5852,7 +5899,7 @@ { if (ds.Tables[0].Rows[0]["HTaskWorkMoneyCheckFlag"].ToString() == "False") { - oCN.RunProcReturn("update PM_ProjectBillMain set HTaskWorkMoneyCheckFlag = 1", "PM_ProjectBillMain"); + oCN.RunProcReturn("update PM_ProjectBillMain set HTaskWorkMoneyCheckFlag = 1 where HInterID = " + HInterID, "PM_ProjectBillMain"); } else { @@ -5867,7 +5914,197 @@ else if (Type == "UnCheck") { - oCN.RunProcReturn("update PM_ProjectBillMain set HTaskWorkMoneyCheckFlag = 0,HTaskExamMoneyCheckFlag = 0,HTaskOtherMoneyCheckFlag = 0,HTaskSetupMoneyCheckFlag = 0", "PM_ProjectBillMain"); + oCN.RunProcReturn("update PM_ProjectBillMain set HTaskWorkMoneyCheckFlag = 0,HTaskExamMoneyCheckFlag = 0,HTaskOtherMoneyCheckFlag = 0,HTaskSetupMoneyCheckFlag = 0 where HInterID = " + HInterID, "PM_ProjectBillMain"); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳绫诲瀷涓嶅瓨鍦紒"; + objJsonResult.data = null; + return objJsonResult; ; + } + + oCN.Commit();//鎻愪氦浜嬪姟 + + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鎵ц鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; ; + + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #endregion + + #region 椤圭洰璐圭敤寰呬繚瀛樺垪琛� + #region 宸ョ▼椤圭洰璐圭敤寰呬繚瀛樺垪琛� + [Route("PM_ProjectBill/NeedSaveQuery")] + [HttpGet] + public object PM_ProjectBillNeedSaveQuery(string user,string sWhere) + { + DataSet ds; + try + { + List<object> columnNameList = new List<object>(); + //鍒ゆ柇鏉冮檺 + //if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user)) + //{ + // objJsonResult.code = CodeConstant.FAIL; + // objJsonResult.count = CountConstant.FAIL; + // objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠$悊鍛樿仈绯伙紒"; + // objJsonResult.data = null; + // return objJsonResult; + //} + //sWhere = sWhere.Replace("'", "''"); + ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillNeedSaveQuery "+sWhere, "h_p_PM_ProjectBillNeedSaveQuery"); + + //娣诲姞鍒楀悕 + 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 = CodeConstant.SUCCEED; + objJsonResult.count = CountConstant.SUCCEED; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.list = columnNameList; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = CodeConstant.FAIL; + objJsonResult.count = CountConstant.FAIL; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 宸ョ▼椤圭洰璐圭敤 淇濆瓨鍙嶄繚瀛� + + [Route("PM_ProjectBill/SaveTaskMoney")] + [HttpGet] + public object SaveTaskMoney(string HInterID, string Type, string user,int HMoney) + { + try + { + //鍒ゆ柇鏄惁鏈夊鏍告潈闄� + if (!DBUtility.ClsPub.Security_Log("Pm_ProjectBill_edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳潈闄愬鏍�!"; + objJsonResult.data = null; + return objJsonResult; + } + + if (string.IsNullOrWhiteSpace(HInterID)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + ClsPub.CurUserName = user; + BillOld.MvarItemKey = "PM_ProjectBillMain"; + oCN.BeginTran();//寮�濮嬩簨鍔� + DataSet ds; + string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID; + ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒"; + objJsonResult.data = null; + return objJsonResult; + } + //Type 浠诲姟瀹夎璐逛繚瀛樻爣璁� + if (Type == "SetupMoneySave") + { + if (ds.Tables[0].Rows[0]["HTaskSetupMoneySaveFlag"].ToString() == "False") + { + oCN.RunProcReturn("update PM_ProjectBillMain set HTaskSetupMoneySaveFlag = 1,HTaskSetupMoney="+HMoney+" where HInterID = " + HInterID, "PM_ProjectBillMain"); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璐圭敤宸蹭繚瀛橈紒"; + objJsonResult.data = null; + return objJsonResult; ; + } + } + //浠诲姟闄勫睘淇濆瓨 + else if (Type == "OtherMoneySave") + { + if (ds.Tables[0].Rows[0]["HTaskOtherMoneySaveFlag"].ToString() == "False") + { + oCN.RunProcReturn("update PM_ProjectBillMain set HTaskOtherMoneySaveFlag = 1,HTaskOtherMoney=" + HMoney + " where HInterID = " + HInterID, "PM_ProjectBillMain"); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璐圭敤宸蹭繚瀛橈紒"; + objJsonResult.data = null; + return objJsonResult; ; + } + } + //浠诲姟鑰冩牳璐逛繚瀛� + else if (Type == "ExamMoneySave") + { + if (ds.Tables[0].Rows[0]["HTaskExamMoneySaveFlag"].ToString() == "False") + { + oCN.RunProcReturn("update PM_ProjectBillMain set HTaskExamMoneySaveFlag = 1,HTaskExamMoney=" + HMoney + " where HInterID = " + HInterID, "PM_ProjectBillMain"); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璐圭敤宸蹭繚瀛橈紒"; + objJsonResult.data = null; + return objJsonResult; ; + } + } + //浠诲姟宸ヨ垂淇濆瓨鏍囪 + else if (Type == "WorkMoneySave") + { + if (ds.Tables[0].Rows[0]["HTaskWorkMoneySaveFlag"].ToString() == "False") + { + oCN.RunProcReturn("update PM_ProjectBillMain set HTaskWorkMoneySaveFlag = 1,HTaskWorkMoney=" + HMoney + " where HInterID = " + HInterID, "PM_ProjectBillMain"); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璐圭敤宸蹭繚瀛橈紒"; + objJsonResult.data = null; + return objJsonResult; ; + } + } + //鍙嶄繚瀛樿垂鐢� + else if (Type == "UnSave") + { + + oCN.RunProcReturn("update PM_ProjectBillMain set HTaskWorkMoneySaveFlag = 0,HTaskExamMoneySaveFlag = 0,HTaskOtherMoneySaveFlag = 0,HTaskSetupMoneySaveFlag = 0 where HInterID = " + HInterID, "PM_ProjectBillMain"); } else { -- Gitblit v1.9.1