~yxj/MES-WEB-API.git

			@@ -144,12 +144,20 @@
			////}
			////
			///
			ClsCN clsCN = new ClsCN();
			ClsIni clsIni = new ClsIni();
			string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp.ini");
			this.sDeptID = text;
			string procName = "exec h_p_QLKB " + this.sDeptID;
			this.DSet = clsCN.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
			//ClsCN clsCN = new ClsCN();
			//ClsIni clsIni = new ClsIni();
			//string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp_SY.ini");
			//this.sDeptID = text;
			string s = "";

			ClsCN SubCn = new ClsCN();
			string sSql = "";
			string sWhere = "";
			ClsIni oIni = new ClsIni();
			string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
			sDeptID = sID;
			string procName = "exec h_p_QLKB_CS " + this.sDeptID;
			this.DSet = SubCn.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
			bool flag = this.DSet == null;
			if (!flag)
			{
			@@ -162,10 +170,25 @@
			});
			this.oSumGrid.BuildTotalCols(cols);
			int frCol = 10;
			string s = "是";
			s = "否";
			Xt_BaseBillFun.DisplayGrid(this.grdMain, base.Name, s, frCol);
			}
			}
			//int HEDateCol = Fun_GetCol("计划开工日期");
			//DateTime oNow = DateTime.Today.Date;
			//for (int i = 0; i < grdMain.Rows.Count; i++)
			//{
			// if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
			// {
			// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
			// }
			//}
			s = "否";
			int MainIDCol = Fun_GetCol("hmainid");
			int SubIDCol = Fun_GetCol("hsubid");
			long n = 0;
			DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n);
			//Total();
			}
			catch (Exception e)
			{
			return;
			@@ -300,7 +323,26 @@

			grdMain.DataSource = null;
			grdMain.DataSource = DSet.Tables[0].DefaultView;


			//int HEDateCol = Fun_GetCol("计划开工日期");
			//DateTime oNow = DateTime.Today.Date;
			//for (int i = 0; i < grdMain.Rows.Count; i++)
			//{
			// if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
			// {
			// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
			// }
			//}


			int MainIDCol = Fun_GetCol("hmainid");
			int SubIDCol = Fun_GetCol("hsubid");
			string s = "否";
			long n = 0;
			DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n);




			////-----------预警状态小于等于显示红色，小于7 橙色，小于等于14 黄色
			//int HYJDateCol = Fun_GetCol("预警状态（天）");
			@@ -465,6 +507,15 @@
			HQty = 0;
			timer1.Enabled = true;
			}
			//int HEDateCol = Fun_GetCol("计划开工日期");
			//DateTime oNow = DateTime.Today.Date;
			//for (int i = 0; i < grdMain.Rows.Count; i++)
			//{
			// if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
			// {
			// grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
			// }
			//}
			}

			private void toolStripButton1_Click(object sender, EventArgs e)