MES-WEB-API.git

			@@ -34,6 +34,12 @@
			public DAL.ClsPM_ProjectMoneyBillMain BillNew4 = new DAL.ClsPM_ProjectMoneyBillMain(); //é¡¹ç®è´¹ç¨åå¯¹åºåæ®ç±»
			public DAL.ClsPM_ProjectMoneyBillMain BillOld4 = new DAL.ClsPM_ProjectMoneyBillMain();

			public DAL.ClsPM_ProjectBeginBillMain BillNew5 = new DAL.ClsPM_ProjectBeginBillMain(); //é¡¹ç®å¯å¨åå¯¹åºåæ®ç±»
			public DAL.ClsPM_ProjectBeginBillMain BillOld5 = new DAL.ClsPM_ProjectBeginBillMain();

			public DAL.ClsPM_ProjectEndBillMain BillNew6 = new DAL.ClsPM_ProjectEndBillMain(); //é¡¹ç®éªæ¶åå¯¹åºåæ®ç±»
			public DAL.ClsPM_ProjectEndBillMain BillOld6 = new DAL.ClsPM_ProjectEndBillMain();

			#region å·¥ç¨é¡¹ç® æ°å¢/ç¼è¾
			#region å·¥ç¨é¡¹ç® è¡¨å¤´æ°æ®
			public class PM_ProjectBill_Main
			@@ -81,6 +87,14 @@
			public int HConWorkDays;
			public int HDepDays;
			public double HLastMoney;
			public int HProjectClassID;
			public string HBuildComp;
			public string HBuildAddress;
			public string HWorkNo;
			public string HReDate;
			public string HPicNo;
			public string HWorkTask;
			public string HProjectNote;

			}
			#endregion
			@@ -225,7 +239,14 @@
			int HMaterID = mainList[0].HMaterID;
			string HUpdater = mainList[0].HUpdater;
			string HUpdaterDate = mainList[0].HUpdaterDate;

			int HProjectClassID = mainList[0].HProjectClassID;
			string HBuildComp = mainList[0].HBuildComp;
			string HBuildAddress = mainList[0].HBuildAddress;
			string HWorkNo = mainList[0].HWorkNo;
			string HReDate = mainList[0].HReDate;
			string HPicNo = mainList[0].HPicNo;
			string HWorkTask = mainList[0].HWorkTask;
			string HProjectNote = mainList[0].HProjectNote;
			if (OperationType == 2)
			{
			ds = oCN.RunProcReturn("select * from PM_ProjectBillMain where HBillNo ='" + HBillNo + "'", "PM_ProjectBillMain");
			@@ -245,7 +266,7 @@
			{
			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) " +
			"HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote) " +
			"values(" +
			"" + HYear +
			"," + HPeriod +
			@@ -277,7 +298,15 @@
			"," + HPayCusID +
			"," + HOrgID +
			"," + HMaterID +
			")";
			"," + HProjectClassID +
			",'" + HBuildComp +
			"','" + HBuildAddress +
			"','" + HWorkNo +
			"','" + HReDate +
			"','" + HPicNo +
			"','" + HWorkTask +
			"','" + HProjectNote +
			"')";

			//ä¸»è¡¨
			oCN.RunProc(sql);
			@@ -316,7 +345,15 @@
			",HPayCusID = " + HPayCusID +
			",HOrgID = " + HOrgID +
			",HMaterID = " + HMaterID +
			" where HInterID = " + HInterID;
			",HProjectClassID = " + HProjectClassID +
			",HBuildComp = '" + HBuildComp +
			"',HBuildAddress = '" + HBuildAddress +
			"',HWorkNo = '" + HWorkNo +
			"',HReDate = '" + HReDate +
			"',HPicNo = '" + HPicNo +
			"',HWorkTask = '" + HWorkTask +
			"',HProjectNote ='" + HProjectNote +
			"' where HInterID = " + HInterID;

			oCN.RunProc(sql);

			@@ -3224,7 +3261,7 @@
			if (refSav == "Add")
			{
			//åæ®å·æ¯å¦éå¤
			if (BillNew1.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
			if (BillNew5.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -3235,7 +3272,7 @@
			}
			if (refSav == "Update")
			{
			if (BillOld1.ShowBill(oItem.HInterID, ref s) == false)
			if (BillOld5.ShowBill(oItem.HInterID, ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -3244,7 +3281,7 @@
			return objJsonResult;
			}
			//å¤ææ¯å¦å¯ç¼è¾
			if (BillOld1.omodel.HChecker != "" && BillOld1.omodel.HChecker != null)
			if (BillOld5.omodel.HChecker != "" && BillOld5.omodel.HChecker != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -3252,7 +3289,7 @@
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (BillOld1.omodel.HBillStatus > 1)
			if (BillOld5.omodel.HBillStatus > 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -3862,7 +3899,7 @@
			if (refSav == "Add")
			{
			//åæ®å·æ¯å¦éå¤
			if (BillNew1.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
			if (BillNew6.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -3873,7 +3910,7 @@
			}
			if (refSav == "Update")
			{
			if (BillOld1.ShowBill(oItem.HInterID, ref s) == false)
			if (BillOld6.ShowBill(oItem.HInterID, ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -3882,7 +3919,7 @@
			return objJsonResult;
			}
			//å¤ææ¯å¦å¯ç¼è¾
			if (BillOld1.omodel.HChecker != "" && BillOld1.omodel.HChecker != null)
			if (BillOld6.omodel.HChecker != "" && BillOld6.omodel.HChecker != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -3890,7 +3927,7 @@
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (BillOld1.omodel.HBillStatus > 1)
			if (BillOld6.omodel.HBillStatus > 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;