MES-WEB-API.git

			@@ -20,9 +20,10 @@
			public DBUtility.ClsPub.Enum_BillStatus BillStatus;//åæ®ç¶æï¼æ°å¢ï¼ä¿®æ¹ï¼æµè§ï¼æ´æ°åä»·ï¼åæ´ï¼
			private json objJsonResult = new json();
			public DataSet ds = new DataSet();
			public DataSet ds1 = new DataSet();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			public DAL.ClsGy_EnvironmentTestSchemeBillMain OBill = new DAL.ClsGy_EnvironmentTestSchemeBillMain();
			public DAL.ClsGy_EnvironmentTestSchemeBillMain BillOld = new DAL.ClsGy_EnvironmentTestSchemeBillMain();
			public DAL.ClsGy_EnvironmentTestSchemeBillMain OBill = new DAL.ClsGy_EnvironmentTestSchemeBillMain(); //ç¯å¢æ£æµæ¹æ¡
			public DAL.ClsGy_EnvironmentTestSchemeBillMain BillOld = new DAL.ClsGy_EnvironmentTestSchemeBillMain(); //ç¯å¢æ£æµæ¹æ¡

			#region ç¯å¢æ£æµé¡¹ç® æ¥è¯¢
			[Route("Gy_BaseInformation/getï»¿Gy_EnvironmentTestSchemeBillMainList")]
			@@ -140,8 +141,7 @@
			string msg3 = sArray[1].ToString();
			string refSav = sArray[2].ToString();//æä½æ¹å¼æ°æ®ç±»å 1æ·»å 3ä¿®æ¹ 2 å¤å¶
			string user = sArray[3].ToString();//ç¨æ·å

			string UserName = "";

			string s = "";
			ListModels oListModels = new ListModels();
			try
			@@ -204,7 +204,7 @@
			}

			}
			UserName = oItem.HMaker; //å¶åäºº
			oItem.HMaker= user; //å¶åäºº
			oItem.HBillType = "7516";
			oItem.HBillSubType = "7516";

			@@ -313,12 +313,55 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			DAL.ClsGy_EnvironmentTestSchemeBillMain BillOld = new DAL.ClsGy_EnvironmentTestSchemeBillMain();
			//å¤æåå¨æ§
			if (BillOld.ShowBill(Int64.Parse(HInterID), ref DBUtility.ClsPub.sExeReturnInfo))
			{
			//å é¤åæ§å¶=========================================
			string sql1 = "exec h_p_Gy_EnvironmentTestSchemeBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Gy_EnvironmentTestSchemeBill_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤å¤±è´¥!åå :å é¤åå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.BeginTran();
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤å¤±è´¥!åå :" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//==================================================================================

			oCN.RunProc("delete from Gy_EnvironmentTestSchemeBillMain where HInterID = " + HInterID);
			//å é¤åæ®ï¼åå«å é¤åæ§å¶ãåå¥æ¥å¿ï¼
			if (!BillOld.DeleteBill(BillOld.omodel.HInterID, BillOld.omodel.HBillNo, "h_p_Gy_EnvironmentTestSchemeBill_AfterDelCtrl", user, ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤æåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			}

			oCN.Commit();



			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -365,13 +408,13 @@

			ClsPub.CurUserName = user;
			BillOld.MvarItemKey = "Gy_EnvironmentTestSchemeBillMain";

			oCN.BeginTran();//å¼å§äºå¡

			//Type 1 å®¡æ ¸ 2 åå®¡æ ¸
			if (Type == 1)
			{
			//å¤æåæ®æ¯å¦å·²ç»å®¡æ ¸
			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)
			@@ -408,8 +451,32 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//å®¡æ ¸åæ§å¶=========================================
			string sql1 = "exec h_p_Gy_EnvironmentTestSchemeBill_BeforeCheckCtrl " + HInterID + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + user + "'";
			ds1 = oCN.RunProcReturn(sql1, "h_p_Gy_EnvironmentTestSchemeBill_BeforeCheckCtrl");
			if (ds1 == null \|\| ds1.Tables.Count == 0 \|\| ds1.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :å®¡æ ¸åå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds1.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ds1.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================

			//å®¡æ ¸åæ®
			if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			if (!BillOld.CheckBill(Int64.Parse(HInterID), ds.Tables[0].Rows[0]["HBillNo"].ToString(), "h_p_Gy_EnvironmentTestSchemeBill_AfterCheckCtrl", user, ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -422,7 +489,6 @@
			else
			{
			//å¤æåæ®æ¯å¦å·²ç»åå®¡æ ¸
			DataSet ds;
			string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
			ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			@@ -451,8 +517,29 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//åå®¡æ ¸åæ§å¶=========================================
			string sql1 = "exec h_p_Gy_EnvironmentTestSchemeBill_BeforeUnCheckCtrl " + HInterID + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + user + "'";
			ds1 = oCN.RunProcReturn(sql1, "h_p_Gy_EnvironmentTestSchemeBill_BeforeUnCheckCtrl");
			if (ds1 == null \|\| ds1.Tables.Count == 0 \|\| ds1.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :åå®¡æ ¸åå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			return objJsonResult;

			}
			if (ds1.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ds1.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//===========================================================
			//åå®¡æ ¸åæ®
			if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ds.Tables[0].Rows[0]["HBillNo"].ToString(), "h_p_Gy_EnvironmentTestSchemeBill_AfterUnCheckCtrl", user, ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -664,7 +751,6 @@
			if (Type == 1)
			{
			//å¤æåæ®æ¯å¦å·²ç»ä½åº
			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)
			@@ -693,8 +779,31 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//ä½åºåæ§å¶=========================================
			string sql1 = "exec h_p_Gy_EnvironmentTestSchemeBill_BeforeDropCtrl " + HInterID + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + user + "'";
			ds1 = oCN.RunProcReturn(sql1, "h_p_Gy_EnvironmentTestSchemeBill_BeforeDropCtrl");
			if (ds1 == null \|\| ds1.Tables.Count == 0 \|\| ds1.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :å®¡æ ¸åå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds1.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ds1.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================
			//ä½åºåæ®
			if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			if (!BillOld.Cancelltion(Int64.Parse(HInterID), ds.Tables[0].Rows[0]["HBillNo"].ToString(), "h_p_Gy_EnvironmentTestSchemeBill_AfterDropCtrl", user, ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -728,8 +837,31 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//åä½åºåæ§å¶=========================================
			string sql1 = "exec h_p_Gy_EnvironmentTestSchemeBill_BeforeUnDropCtrl " + HInterID + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + user + "'";
			ds1 = oCN.RunProcReturn(sql1, "h_p_Gy_EnvironmentTestSchemeBill_BeforeUnDropCtrl");
			if (ds1 == null \|\| ds1.Tables.Count == 0 \|\| ds1.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :åä½åºåå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			if (ds1.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ds1.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================
			//åä½åºåæ®
			if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ds.Tables[0].Rows[0]["HBillNo"].ToString(), "h_p_Gy_EnvironmentTestSchemeBill_AfterDropCtrl", user, ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -758,7 +890,137 @@
			return objJsonResult;
			}
			}
			#endregion
			#endregion

			#region SPCä¸å¿çº¿åè¡¨ æ¥è¯¢
			[Route("QC_SpcCenterlineList/List")]
			[HttpGet]
			public object List(string sWhere, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();



			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_QC_SpcCenterlineList order by HInterID desc", "ï»¿h_v_QC_SpcCenterlineList");
			}
			else
			{
			string sql1 = "select * from h_v_QC_SpcCenterlineList where 1 = 1 ";
			string sql = sql1 + sWhere + " order by HInterID desc";
			ds = oCN.RunProcReturn(sql, "ï»¿h_v_QC_SpcCenterlineList");
			}

			//æ·»å åå
			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 = "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 SPCä¸å¿çº¿åè¡¨ å¼å¸¸æ°æ® æ´æ°
			[Route("QC_SpcCenterlineList/UpdateData")]
			[HttpGet]
			public object UpdateData(string HInterID, string HBeginDate, string HEndDate, string user)
			{
			try
			{
			LogService.Write("è¾å¥å¼:" + "exec h_p_QC_SPC_EightJudge_Abnormal " + HInterID + ",'" + HBeginDate + "','" + HEndDate + "'");
			ds = oCN.RunProcReturn("exec h_p_QC_SPC_EightJudge_Abnormal "+ HInterID + ",'"+ HBeginDate + "','"+ HEndDate + "'", "ï»¿h_p_QC_SPC_EightJudge_Abnormal");
			LogService.Write("è¾å¥å¼:" + ds.Tables[0].Rows.Count);
			if (int.Parse(ds.Tables[0].Rows[0]["ç±»å"].ToString()) <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region SPCä¸å¿çº¿åè¡¨ å¼å¸¸æ°æ® æ°å¢
			[Route("QC_SpcCenterlineList/QC_SpcCenterlineAdd")]
			[HttpGet]
			public object UpdateData(string HInterID, string AvgData, string HControlUpperLimit_X, string HControlLowerLimit_X, string user)
			{
			try
			{

			ds = oCN.RunProcReturn("select * from QC_SpcCenterline where HInterID="+ HInterID, "ï»¿QC_SpcCenterline");

			if (ds.Tables[0].Rows.Count==0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message ="æ¥æ æ°æ®!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			var HMaterID = int.Parse( ds.Tables[0].Rows[0]["HMaterID"].ToString());
			var HQCCheckItemID = int.Parse(ds.Tables[0].Rows[0]["HQCCheckItemID"].ToString());
			var HMouldNum = ds.Tables[0].Rows[0]["HMouldNum"].ToString();

			oCN.RunProc("update QC_SpcCenterline set HStart=0 where HMaterID=" + HMaterID + " and HQCCheckItemID=" + HQCCheckItemID + " and HMouldNum='" + HMouldNum + "'");
			oCN.RunProc("insert into QC_SpcCenterline(HMaterID,HQCCheckItemID,HMouldNum,HCenterline_X,HControlUpperLimit_X,HControlLowerLimit_X,HMaker, HMakeDate, HStart)" +
			"values(" + HMaterID + "," + HQCCheckItemID + "," + HMouldNum + "," + AvgData + "," + HControlUpperLimit_X + "," + HControlLowerLimit_X + "," + user + ",getdate(),1) ");


			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æ°å¢æåï¼";
			objJsonResult.data = null;
			objJsonResult.list = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			}
			}