MES-WEB-API.git

			@@ -10,7 +10,7 @@
			using System.Web.Http;
			using System.Windows.Forms;
			using WebAPI.Models;

			using SyntacticSugar.constant;
			namespace WebAPI.Controllers.é¡¹ç®ç®¡ç.å·¥ç¨é¡¹ç®
			{
			public class PM_ProjectBillController : ApiController
			@@ -48,6 +48,7 @@
			public class PM_ProjectBill_Main
			{
			public int HInterID;
			public string HBillSubType;
			public string HBillNo;
			public string HProNumber;
			public string HProName;
			@@ -125,6 +126,43 @@
			public double HYuShouKuanMoney; //é¢æ¶æ¬¾
			public double HGongFeiMoney; //å·¥è´¹ç»è´¦
			public double HJieZhangMoney; //ç»ç®ç»è´¦

			public int HTaskClassID; //ä»»å¡å¤§ç±»(Gy_TaskClass)
			public int HTaskClassEntryID; //ä»»å¡é¡¹ç®åç±»(Gy_TaskClass)
			public string HTaskAddress; //ä»»å¡å°ç¹
			public string HBreakStatus; //æåæåµ
			public string HWaterLeakage; //æ¼æ°´é
			public string HPipeDiameter; //ç®¡å¾
			public string HPipeMaterial; //ç®¡éæè´¨
			public string HAlarmEmp; //æ¥æ¼äºº
			public string HAlarmLink; //æ¥æ¼äººèç³»çµè¯
			public string HReceEmp; //åçäºº
			public string HReceTime; //åçæ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			public double HTaskMaterMoney; //ä»»å¡ææè´¹
			public double HTaskSetupMoney; //ä»»å¡å®è£è´¹
			public double HTaskOtherMoney; //ä»»å¡éå±è´¹
			public double HTaskExamMoney; //ä»»å¡èæ ¸è´¹
			public double HTaskWorkMoney; //ä»»å¡å·¥è´¹
			public bool HIsAccount; //æ¯å¦ç»è´¦(å¤éæ¡)
			public string HAccountDate; //ç»ç®ç»è´¦æ¥æ
			public string HAccountWorkMoneyDate; //å·¥è´¹ç»è´¦æ¥æ
			public bool HIsCheckExam; //æ¯å¦å®¡æ ¸èæ ¸è´¹(å¤éæ¡)
			public bool HIsCheckWorkMoney; //æ¯å¦å®¡æ ¸å·¥è´¹(å¤éæ¡)
			public string HInfoBackTime; //åå¤æ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			public string HInfoBackMan; //åå¤äºº
			public string HInfoNote; //åå¤åå®¹(å¯ææ¬ï¼
			public string HTaskBTime; //ä»»å¡å¼å§æ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			public string HTaskETime; //ä»»å¡å®å·¥æ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			public string HTaskNote; //ä»»å¡è¯¦ç»åå®¹ï¼å¯ææ¬ï¼
			public string HTaskWorkEmp; //å·¥ä½äººåï¼å¯ææ¬ï¼
			public string HBeginCloseValveTime; //å¼å§å³éæ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			public string HEndCloseValveTime; //ç»æå³éæ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			public long HCloseValveQty; //å³éåªæ°
			public string HBeginOpenValveTime; //å¼å§å¼éæ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			public string HEndOpenValveTime; //ç»æå¼éæ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			public long HOpenValveQty; //å¼éåªæ°
			public string HValveWorkEmp; //æä½äººå
			public string HTaskRemark; //ä»»å¡å¤æ³¨ï¼å¯ææ¬ï¼

			}
			#endregion
			@@ -240,7 +278,7 @@
			int HYear = int.Parse(mainList[0].HDate.Split('-')[0]);
			int HPeriod = int.Parse(mainList[0].HDate.Split('-')[1]);
			string HBillType = "4750";
			string HBillSubType = "";
			string HBillSubType = mainList[0].HBillSubType;
			int HInterID = mainList[0].HInterID;
			string HDate = mainList[0].HDate;
			string HBillNo = mainList[0].HBillNo;
			@@ -306,6 +344,43 @@
			double HGongFeiMoney = mainList[0].HGongFeiMoney; //å·¥è´¹ç»è´¦
			double HJieZhangMoney = mainList[0].HJieZhangMoney; //ç»ç®ç»è´¦

			int HTaskClassID = mainList[0].HTaskClassID; //ä»»å¡å¤§ç±»(Gy_TaskClass)
			int HTaskClassEntryID = mainList[0].HTaskClassEntryID; //ä»»å¡é¡¹ç®åç±»(Gy_TaskClass)
			string HTaskAddress = mainList[0].HTaskAddress; //ä»»å¡å°ç¹
			string HBreakStatus = mainList[0].HBreakStatus; //æåæåµ
			string HWaterLeakage = mainList[0].HWaterLeakage; //æ¼æ°´é
			string HPipeDiameter = mainList[0].HPipeDiameter; //ç®¡å¾
			string HPipeMaterial = mainList[0].HPipeMaterial; //ç®¡éæè´¨
			string HAlarmEmp = mainList[0].HAlarmEmp; //æ¥æ¼äºº
			string HAlarmLink = mainList[0].HAlarmLink; //æ¥æ¼äººèç³»çµè¯
			string HReceEmp = mainList[0].HReceEmp; //åçäºº
			string HReceTime = mainList[0].HReceTime; //åçæ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			double HTaskMaterMoney = mainList[0].HTaskMaterMoney; //ä»»å¡ææè´¹
			double HTaskSetupMoney = mainList[0].HTaskSetupMoney; //ä»»å¡å®è£è´¹
			double HTaskOtherMoney = mainList[0].HTaskOtherMoney; //ä»»å¡éå±è´¹
			double HTaskExamMoney = mainList[0].HTaskExamMoney; //ä»»å¡èæ ¸è´¹
			double HTaskWorkMoney = mainList[0].HTaskWorkMoney; //ä»»å¡å·¥è´¹
			bool HIsAccount = mainList[0].HIsAccount; //æ¯å¦ç»è´¦(å¤éæ¡)
			string HAccountDate = mainList[0].HAccountDate; //ç»ç®ç»è´¦æ¥æ
			string HAccountWorkMoneyDate = mainList[0].HAccountWorkMoneyDate; //å·¥è´¹ç»è´¦æ¥æ
			bool HIsCheckExam = mainList[0].HIsCheckExam; //æ¯å¦å®¡æ ¸èæ ¸è´¹(å¤éæ¡)
			bool HIsCheckWorkMoney = mainList[0].HIsCheckWorkMoney; //æ¯å¦å®¡æ ¸å·¥è´¹(å¤éæ¡)
			string HInfoBackTime = mainList[0].HInfoBackTime; //åå¤æ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			string HInfoBackMan = mainList[0].HInfoBackMan; //åå¤äºº
			string HInfoNote = mainList[0].HInfoNote; //åå¤åå®¹(å¯ææ¬ï¼
			string HTaskBTime = mainList[0].HTaskBTime; //ä»»å¡å¼å§æ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			string HTaskETime = mainList[0].HTaskETime; //ä»»å¡å®å·¥æ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			string HTaskNote = mainList[0].HTaskNote; //ä»»å¡è¯¦ç»åå®¹ï¼å¯ææ¬ï¼
			string HTaskWorkEmp = mainList[0].HTaskWorkEmp; //å·¥ä½äººåï¼å¯ææ¬ï¼
			string HBeginCloseValveTime = mainList[0].HBeginCloseValveTime; //å¼å§å³éæ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			string HEndCloseValveTime = mainList[0].HEndCloseValveTime; //ç»æå³éæ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			long HCloseValveQty = mainList[0].HCloseValveQty; //å³éåªæ°
			string HBeginOpenValveTime = mainList[0].HBeginOpenValveTime; //å¼å§å¼éæ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			string HEndOpenValveTime = mainList[0].HEndOpenValveTime; //ç»æå¼éæ¶é´ï¼å¹´ææ¥æ¶åç§ï¼
			long HOpenValveQty = mainList[0].HOpenValveQty; //å¼éåªæ°
			string HValveWorkEmp = mainList[0].HValveWorkEmp; //æä½äººå
			string HTaskRemark = mainList[0].HTaskRemark; //ä»»å¡å¤æ³¨ï¼å¯ææ¬ï¼


			if (OperationType == 2)
			{
			@@ -327,7 +402,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" +
			",HSupplierID,HMangerEmpID,HMaterPlanDate,HWorkerID,HPlanWorkTimes,HRelWorkTimes,HTestDate,HTestCheckerID,HTestNote,HSewageDate,HWaterSupplyDate,HWorkNote,HWorkProcNote,HYuSuanMoney,HHeTongMoney,HJieSuanMoney,HShenJiMoney,HCaiLiaoMoney,HAnZhuangMoney,HBanZuMoney,HYuShouKuanMoney,HGongFeiMoney,HJieZhangMoney) " +
			",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)" +
			"values(" +
			"" + HYear +
			"," + HPeriod +
			@@ -392,6 +468,12 @@
			",'" + HYuShouKuanMoney + "'" +
			",'" + HGongFeiMoney + "'" +
			",'" + HJieZhangMoney + "'" +
			",'" + HTaskClassID + "'" + ",'" + HTaskClassEntryID + "'" + ",'" + HTaskAddress + "'" + ",'" + HBreakStatus + "'" + ",'" + HWaterLeakage + "'" + ",'" + HPipeDiameter + "'" + ",'" + HPipeMaterial + "'" +
			",'" + HAlarmEmp + "'" +",'" + HAlarmLink + "'" + ",'" + HReceEmp + "'" + ",'" + HReceTime + "'" + ",'" + HTaskMaterMoney + "'" + ",'" + HTaskSetupMoney + "'" + ",'" + HTaskOtherMoney + "'" +
			",'" + 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 + "'" +
			")";

			//ä¸»è¡¨
			@@ -402,14 +484,14 @@
			else if (OperationType == 3 \|\| ds.Tables[0].Rows.Count != 0) //ç¼è¾
			{
			string sql = "update PM_ProjectBillMain set " +
			"HYear = " + HYear +
			",HPeriod = " + HPeriod +
			",HBillType = '" + HBillType +
			"',HBillSubType = '" + HBillSubType +
			"',HDate = '" + HDate +
			"',HBillNo = '" + HBillNo +
			"',HBillStatus = " + HBillStatus +
			",HRemark = '" + HRemark +
			//"HYear = " + HYear +
			//",HPeriod = " + HPeriod +
			//",HBillType = '" + HBillType +
			//"',HBillSubType = '" + HBillSubType +
			//"',HDate = '" + HDate +
			"HBillNo = '" + HBillNo +
			//"',HBillStatus = " + HBillStatus +
			"',HRemark = '" + HRemark +
			"',HUpdater = '" + HUpdater +
			"',HUpdateDate = '" + HUpdaterDate +
			"',HProNumber = '" + HProNumber +
			@@ -465,7 +547,12 @@
			"',HYuShouKuanMoney = '" + HYuShouKuanMoney +
			"',HGongFeiMoney = '" + HGongFeiMoney +
			"',HJieZhangMoney = '" + HJieZhangMoney +

			"',HTaskClassID = '" + HTaskClassID + "',HTaskClassEntryID = '" + HTaskClassEntryID + "',HTaskAddress = '" + HTaskAddress + "',HBreakStatus = '" + HBreakStatus + "',HWaterLeakage = '" + HWaterLeakage + "',HPipeDiameter = '" + HPipeDiameter +
			"',HPipeMaterial = '" + HPipeMaterial + "',HAlarmEmp = '" + HAlarmEmp + "',HAlarmLink = '" + HAlarmLink + "',HReceEmp = '" + HReceEmp + "',HReceTime = '" + HReceTime + "',HTaskMaterMoney = '" + HTaskMaterMoney +
			"',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 +

			"' where HInterID = " + HInterID;

			@@ -667,6 +754,62 @@
			}
			#endregion

			#region å·¥ç¨é¡¹ç®åé¡µåè¡¨
			[Route("PM_ProjectBill/page")]
			[HttpGet]
			public object PM_ProjectBillPage(string sWhere, string user, int page, int size)
			{
			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;
			//}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillList " + page + "," + size + ",''", "h_p_PM_ProjectBillList");
			}
			else
			{
			sWhere = sWhere.Replace("'", "''");
			ds = oCN.RunProcReturn("exec h_p_PM_ProjectBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_PM_ProjectBillList");
			}

			//æ·»å åå
			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));//è·åå°DataColumnåå¯¹è±¡çåå
			}

			objJsonResult.code = CodeConstant.SUCCEED;
			objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			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 å·¥ç¨é¡¹ç® ç¼è¾-é¡µé¢èµå¼
			/// <summary>
			///åæ°ï¼string HInterIDã