~yxj/MES-WEB-API.git

			@@ -106,7 +106,7 @@
			{
			oCN.BeginTran();
			string sql = "Insert into Gy_ProjectStage" +
			" (HNumber,HName,HShortNumber,HParentID,HLevel,HEndFlag,HStopflag,HRemark,HHelpCode,HMakeEmp,HUSEORGID,HStageNote,HRelationGoods,HIsKey,HRate) " +
			" (HNumber,HName,HShortNumber,HParentID,HLevel,HEndFlag,HStopflag,HRemark,HHelpCode,HMakeEmp,HCREATEORGID,HStageNote,HRelationGoods,HIsKey,HRate) " +
			" Values(" +
			"'" + HNumber + "'" +
			",'" + HName + "'" +
			@@ -146,8 +146,8 @@
			",HHelpCode='" + HHelpCode + "'" +
			",HMakeEmp='" + HMakeEmp + "'" +
			",HModifyEmp = '" + HModifyEmp + "'" +
			",HModifyTime = getDate()" +
			",HUSEORGID=" + HUSEORGID + "" +
			",HModifyTime = getDate()" +
			",HCREATEORGID=" + HUSEORGID + "" +
			",HStageNote='" + HStageNote + "'" +
			",HRelationGoods='" + HRelationGoods + "'" +
			",HIsKey=" + Convert.ToString(HIsKey ? 1 : 0) + "" +
			@@ -203,13 +203,13 @@

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from Gy_ProjectStage order by HNumber ", "Gy_ProjectStage");
			ds = oCN.RunProcReturn("select * from h_v_Gy_ProjectStage order by é¶æ®µç¼ç desc", "h_v_Gy_ProjectStage");
			}
			else
			{
			string sql1 = "select * from Gy_ProjectStage where 1 = 1 ";
			string sql = sql1 + sWhere + " order by HNumber ";
			ds = oCN.RunProcReturn(sql, "Gy_ProjectStage");
			string sql1 = "select * from h_v_Gy_ProjectStage where 1 = 1 ";
			string sql = sql1 + sWhere + " order by é¶æ®µç¼ç desc";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_ProjectStage");
			}

			//æ·»å åå
			@@ -846,13 +846,13 @@

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from PM_ProjectStageBillMain order by HBillNo desc ", "PM_ProjectStageBillMain");
			ds = oCN.RunProcReturn("select * from h_v_PM_ProjectStageBill order by åæ®å· desc", "h_v_PM_ProjectStageBill");
			}
			else
			{
			string sql1 = "select * from PM_ProjectStageBillMain where 1 = 1 ";
			string sql = sql1 + sWhere + " order by HBillNo desc ";
			ds = oCN.RunProcReturn(sql, "PM_ProjectStageBillMain");
			string sql1 = "select * from h_v_PM_ProjectStageBill where 1 = 1 ";
			string sql = sql1 + sWhere + " order by åæ®å· desc";
			ds = oCN.RunProcReturn(sql, "h_v_PM_ProjectStageBill");
			}

			//æ·»å åå
			@@ -1032,25 +1032,49 @@
			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;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//å®¡æ ¸åæ®
			if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//å®¡æ ¸åæ®
			if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			@@ -1061,23 +1085,39 @@
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½è¿è¡åå®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡åå®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²åå®¡æ ¸!ä¸éè¦ååå®¡æ ¸!";
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//åå®¡æ ¸åæ®
			if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//åå®¡æ ¸åæ®
			if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			@@ -1138,25 +1178,50 @@
			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;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸éè¦åå³é!";
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½åæ¬¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//å³éåæ®
			if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//å³éåæ®
			if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			@@ -1167,23 +1232,39 @@
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HCloseMan"] == null \|\| ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²åå³é!ä¸éè¦ååå³é!";
			objJsonResult.Message = "åæ®æªå³é!ä¸éè¦ååå³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//åå³éåæ®
			if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//åå³éåæ®
			if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			@@ -1244,8 +1325,24 @@
			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;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½è¿è¡ä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			@@ -1254,15 +1351,15 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//ä½åºåæ®
			if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//ä½åºåæ®
			if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			@@ -1273,23 +1370,31 @@
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½è¿è¡ä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] == null \|\| ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²åä½åº!ä¸éè¦ååä½åº!";
			objJsonResult.Message = "åæ®æªä½åº!ä¸éè¦ååä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//åä½åºåæ®
			if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//åä½åºåæ®
			if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			@@ -1321,7 +1426,10 @@
			public int HInterID;
			public string HBillNo;
			public string HDate;
			public int HProID;
			public string HProNumber;
			public string HMainSourceBillNo;
			public string HMainSourceBillType;
			public int HProjectStageID;
			public string HProjectStageName;
			public string HStageNote;
			@@ -1434,6 +1542,9 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}else if (OperationType == 4)
			{

			}

			msg2 = "[" + msg2.ToString() + "]";
			@@ -1448,7 +1559,10 @@
			int HInterID = mainList[0].HInterID;
			string HBillNo = mainList[0].HBillNo;
			string HDate = mainList[0].HDate;
			int HProID = mainList[0].HProID;
			string HProNumber = mainList[0].HProNumber;
			string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
			string HMainSourceBillType = mainList[0].HMainSourceBillType;
			int HProjectStageID = mainList[0].HProjectStageID;
			string HStageNote = mainList[0].HStageNote;
			string HRelationGoods = mainList[0].HRelationGoods;
			@@ -1465,7 +1579,7 @@
			string HMakerDate = mainList[0].HMakerDate;
			string HUpdater = mainList[0].HUpdater;
			string HUpdaterDate = mainList[0].HUpdaterDate;



			if (OperationType == 2)
			{
			@@ -1552,9 +1666,48 @@
			//è®°å½æ¥å¿
			LogService.Write("ç¨æ·:" + user + ",æ¥æ:" + DateTime.Now + ",ä¿®æ¹é¡¹ç®é¶æ®µæ±æ¥:" + HBillNo);
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "ä¿®æ¹é¡¹ç®é¶æ®µæ±æ¥ï¼" + HBillNo + "','LMES-é¡¹ç®é¶æ®µæ±æ¥æ¨¡å','" + DBUtility.ClsPub.IPAddress + "','ä¿®æ¹åæ®'", ref DBUtility.ClsPub.sExeReturnInfo);
			}else if(OperationType == 4 && ds.Tables[0].Rows.Count == 0 ) //ä¸æ¨-æ°å¢
			{
			string sql = "insert into PM_ProjectReportBillMain" +
			"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate" +
			",HProNumber,HProjectStageID,HStageNote,HRelationGoods,HIsKey,HReportEmpID,HReportNote,HReportGoods,HReceiveEmp,HCopyEmp,HRate,HOrgID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType,HMainSourceBillNo) " +
			"values(" +
			"" + HYear +
			"," + HPeriod +
			",'" + HBillType +
			"','" + HBillSubType +
			"'," + HInterID +
			",'" + HDate +
			"','" + HBillNo +
			"'," + HBillStatus +
			",'" + HRemark +
			"','" + HMaker +
			"','" + HMakerDate +
			"','" + HProNumber +
			"'," + HProjectStageID +
			",'" + HStageNote +
			"','" + HRelationGoods +
			"'," + HIsKey +
			"," + HReportEmpID +
			",'" + HReportNote +
			"','" + HReportGoods +
			"','" + HReceiveEmp +
			"','" + HCopyEmp +
			"'," + HRate +
			"," + HOrgID +
			"," + HProID +
			"," + HProjectStageID +
			",'" + HMainSourceBillType +
			"','" + HMainSourceBillNo +
			"')";

			//ä¸»è¡¨
			oCN.RunProc(sql);
			LogService.Write("ç¨æ·:" + user + ",æ¥æ:" + DateTime.Now + ",æ°å¢é¡¹ç®é¶æ®µæ±æ¥:" + HBillNo);
			oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "æ°å¢é¡¹ç®é¶æ®µæ±æ¥ï¼" + HBillNo + "','LMES-é¡¹ç®é¶æ®µæ±æ¥æ¨¡å','" + DBUtility.ClsPub.IPAddress + "','æ°å¢åæ®'", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			//ä¿ååè¡¨
			objJsonResult = AddBillSub_ProjectReportBill(msg3, HInterID, HBillNo, OperationType);
			objJsonResult = AddBillSub_ProjectReportBill(msg3, HInterID, HBillNo, OperationType,HProID, HProjectStageID, HMainSourceBillType, HMainSourceBillNo);

			if (objJsonResult.code == "0")
			{
			@@ -1582,36 +1735,73 @@
			}
			#endregion
			#region æ·»å é¡¹ç®é¶æ®µæ¸å åè¡¨
			public json AddBillSub_ProjectReportBill(string msg3, long HInterID, string HBillNo, int OperationType)
			public json AddBillSub_ProjectReportBill(string msg3, long HInterID, string HBillNo, int OperationType, int HSourceInterID, int HSourceEntryID, string HSourceBillType, string HSourceBillNo)
			{
			List<PM_ProjectReportBill_Sub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PM_ProjectReportBill_Sub>>(msg3);
			int i = 0; //ä½ä¸ºåè¡¨åç
			foreach (PM_ProjectReportBill_Sub oSub in DetailColl)
			if(OperationType == 4)
			{
			i++; //åä¸ä¸ªä¸»è¡¨ä¸çåè¡¨çåç èªå¢
			foreach (PM_ProjectReportBill_Sub oSub in DetailColl)
			{
			i++; //åä¸ä¸ªä¸»è¡¨ä¸çåè¡¨çåç èªå¢

			int HEntryID = i;
			int HEmpID = oSub.HEmpID;
			int HIsPM = oSub.HIsPM?1:0;
			double HRate = oSub.HRate;
			double HAvgMoney = oSub.HAvgMoney;
			double HCountMoney = oSub.HCountMoney;
			string HRemarkSub = oSub.HRemarkSub;
			string sql = "insert into PM_ProjectReportBillSub" +
			"(HInterID,HBillNo_bak,HEntryID,HRemark,HEmpID,HIsPM,HRate,HAvgMoney,HCountMoney) " +
			"values(" +
			"" + HInterID +
			",'" + HBillNo +
			"'," + HEntryID +
			",'" + HRemarkSub +
			"'," + HEmpID +
			"," + HIsPM +
			"," + HRate +
			"," + HAvgMoney +
			"," + HCountMoney +
			")";
			oCN.RunProc(sql);
			int HEntryID = i;
			int HEmpID = oSub.HEmpID;
			int HIsPM = oSub.HIsPM ? 1 : 0;
			double HRate = oSub.HRate;
			double HAvgMoney = oSub.HAvgMoney;
			double HCountMoney = oSub.HCountMoney;
			string HRemarkSub = oSub.HRemarkSub;
			string sql = "insert into PM_ProjectReportBillSub" +
			"(HInterID,HBillNo_bak,HEntryID,HRemark,HEmpID,HIsPM,HRate,HAvgMoney,HCountMoney,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo) " +
			"values(" +
			"" + HInterID +
			",'" + HBillNo +
			"'," + HEntryID +
			",'" + HRemarkSub +
			"'," + HEmpID +
			"," + HIsPM +
			"," + HRate +
			"," + HAvgMoney +
			"," + HCountMoney +
			"," + HSourceInterID +
			"," + HSourceEntryID +
			",'" + HSourceBillType +
			"','" + HSourceBillNo +
			"')";
			oCN.RunProc(sql);
			}
			}
			else
			{
			foreach (PM_ProjectReportBill_Sub oSub in DetailColl)
			{
			i++; //åä¸ä¸ªä¸»è¡¨ä¸çåè¡¨çåç èªå¢

			int HEntryID = i;
			int HEmpID = oSub.HEmpID;
			int HIsPM = oSub.HIsPM ? 1 : 0;
			double HRate = oSub.HRate;
			double HAvgMoney = oSub.HAvgMoney;
			double HCountMoney = oSub.HCountMoney;
			string HRemarkSub = oSub.HRemarkSub;
			string sql = "insert into PM_ProjectReportBillSub" +
			"(HInterID,HBillNo_bak,HEntryID,HRemark,HEmpID,HIsPM,HRate,HAvgMoney,HCountMoney) " +
			"values(" +
			"" + HInterID +
			",'" + HBillNo +
			"'," + HEntryID +
			",'" + HRemarkSub +
			"'," + HEmpID +
			"," + HIsPM +
			"," + HRate +
			"," + HAvgMoney +
			"," + HCountMoney +
			")";
			oCN.RunProc(sql);
			}
			}


			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -1647,13 +1837,13 @@

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from PM_ProjectReportBillMain order by HBillNo desc ", "PM_ProjectReportBillMain");
			ds = oCN.RunProcReturn("select * from h_v_PM_ProjectReportBillList order by åæ®å· desc ", "h_v_PM_ProjectReportBillList");
			}
			else
			{
			string sql1 = "select * from PM_ProjectReportBillMain where 1 = 1 ";
			string sql = sql1 + sWhere + " order by HBillNo desc ";
			ds = oCN.RunProcReturn(sql, "PM_ProjectReportBillMain");
			string sql1 = "select * from h_v_PM_ProjectReportBillList where 1 = 1 ";
			string sql = sql1 + sWhere + " order by åæ®å· desc ";
			ds = oCN.RunProcReturn(sql, "h_v_PM_ProjectReportBillList");
			}

			//æ·»å åå
			@@ -1833,25 +2023,49 @@
			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;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//å®¡æ ¸åæ®
			if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//å®¡æ ¸åæ®
			if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			@@ -1862,23 +2076,39 @@
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½è¿è¡åå®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡åå®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²åå®¡æ ¸!ä¸éè¦ååå®¡æ ¸!";
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//åå®¡æ ¸åæ®
			if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//åå®¡æ ¸åæ®
			if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			@@ -1939,25 +2169,50 @@
			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;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å³é!ä¸éè¦åå³é!";
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½åæ¬¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//å³éåæ®
			if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//å³éåæ®
			if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			@@ -1968,23 +2223,39 @@
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸è½è¿è¡å³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HCloseMan"] == null \|\| ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²åå³é!ä¸éè¦ååå³é!";
			objJsonResult.Message = "åæ®æªå³é!ä¸éè¦ååå³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//åå³éåæ®
			if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//åå³éåæ®
			if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			@@ -2045,8 +2316,24 @@
			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;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½è¿è¡ä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
			{
			objJsonResult.code = "0";
			@@ -2055,15 +2342,15 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//ä½åºåæ®
			if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//ä½åºåæ®
			if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			@@ -2074,23 +2361,31 @@
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			{
			if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½è¿è¡ä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HDeleteMan"] == null \|\| ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²åä½åº!ä¸éè¦ååä½åº!";
			objJsonResult.Message = "åæ®æªä½åº!ä¸éè¦ååä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//åä½åºåæ®
			if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//åä½åºåæ®
			if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}