MES-WEB-API.git

			@@ -22,58 +22,7 @@
			public DAL.ClsQC_ProcessCheckBill BillOld = new DAL.ClsQC_ProcessCheckBill();
			DataSet ds;
			//è·åç³»ç»åæ°
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

			//#region å·¥åºæ£éªååè¡¨
			//[Route("QC_ProcessCheckBill/QC_ProcessCheckBillList")]
			//[HttpGet]
			//public object QC_ProcessCheckBillList(string sWhere, string user)
			//{
			// try
			// {
			// List<object> columnNameList = new List<object>();

			// string sql1 = "select * from h_v_QC_ProcessCheckBill where 1 = 1 ";
			// string sql = sql1 + sWhere + " order by hmainid desc";
			// ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBill");

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

			// if (ds.Tables[0].Rows.Count > 0)
			// {
			// objJsonResult.code = "1";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "Sucessï¼";
			// objJsonResult.list = columnNameList;
			// objJsonResult.data = ds.Tables[0];
			// return objJsonResult;
			// }
			// else
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "æ²¡ææ¥è¯¢å°æ°æ®";
			// objJsonResult.list = columnNameList;
			// 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
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

			#region å·¥åºæ£éªååè¡¨
			[Route("QC_ProcessCheckBill/QC_ProcessCheckBillList")]
			@@ -85,7 +34,7 @@
			List<object> columnNameList = new List<object>();

			string sql1 = "select * from h_v_QC_ProcessCheckBill where 1 = 1 ";
			string sql = sql1 + sWhere + " order by hmainid desc";
			string sql = sql1 + sWhere + " order by å¶åæ¥æ desc";
			ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBill");

			//æ·»å åå
			@@ -135,8 +84,18 @@
			{
			List<object> columnNameList = new List<object>();

			//å¤ææé
			if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Query", 3, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¨æ²¡æè¯¥æ¨¡åæé,è¯·ä¸ç®¡çåèç³»ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			string sql1 = "select * from h_v_QC_ProcessCheckBillMainList where 1 = 1 ";
			string sql = sql1 + sWhere + " order by hmainid desc";
			string sql = sql1 + sWhere + " order by å¶åæ¥æ desc";
			ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillMainList");

			//æ·»å åå
			@@ -177,6 +136,60 @@
			}
			#endregion

			#region å·¥åºæ£éªååé¡µåè¡¨
			[Route("QC_ProcessCheckMainBill/QC_ProcessCheckMainBillListPage")]
			[HttpGet]
			public object QC_ProcessCheckMainBillListPage(string sWhere, string user, int page, int size)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//ç¼è¾æé
			if (!DBUtility.ClsPub.Security_Log_second("QC_ProcessCheckBill_Query", 3, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æ¥çæéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			sWhere = sWhere.Replace("'", "''");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("exec h_p_QC_ProcessCheckMainBillListPage " + page + "," + size + ",''", "h_p_QC_ProcessCheckMainBillListPage");
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_QC_ProcessCheckMainBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_QC_ProcessCheckMainBillListPage");
			}

			//æ·»å åå
			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 = 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 = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion


			#region å·¥åºæ£éªåç¼è¾æ¥è¯¢æ°æ®
			[Route("QC_ProcessCheckBill/QC_ProcessCheckBill_Edit")]
			[HttpGet]
			@@ -187,7 +200,7 @@
			List<object> columnNameList = new List<object>();

			string sql1 = "select * from h_v_QC_ProcessCheckBill_Edit where 1 = 1 ";
			string sql = sql1 + sWhere + " order by hmainid desc";
			string sql = sql1 + sWhere + " order by hmainid desc,HSNO asc,hsubid";
			ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBill_Edit");

			//æ·»å åå
			@@ -444,52 +457,49 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID);
			ClsPub.CurUserName = user;
			BillOld.MvarItemKey = "QC_ProcessCheckBillMain";
			oCN.BeginTran();//å¼å§äºå¡
			DAL.ClsQC_ProcessCheckBill oBill = new DAL.ClsQC_ProcessCheckBill(); //å®ä¾ååæ®æä½ç±»ï¼ç¨äºè¿è¡ç¸å³æä½

			//Type 1 å³é 2 åå³é
			if (Type == 1)
			//éå¯¹éè¦è¿è¡çæä½ï¼æ£éªå½ååæ®çç¶ææ¯å¦æ¯æéè¦è¿è¡çæä½
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //æ ¹æ®HInterIDè·åè¯¥åæ®çæ°æ®
			{
			//å¤æåæ®æ¯å¦å·²ç»å³é
			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)
			if (oBill.omodel.HDeleteMan.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ä¸åå¨ï¼";
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡å³éï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
			if (oBill.omodel.HChecker.Trim() == "")
			{
			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 (Type == 1) //å³éå¤æ
			{
			if (oBill.omodel.HCloseMan.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½è¿è¡å³é!";
			objJsonResult.Message = "åæ®å·²å³é!ä¸è½åæ¬¡å³éï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}


			if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
			}
			if (Type == 2) //åå³éå¤æ
			{
			if (oBill.omodel.HCloseMan.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			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.Message = "åæ®æªå³é!ä¸éè¦åå³éï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -497,49 +507,101 @@
			}
			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)
			{
			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]["HCloseMan"] == null \|\| ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			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;
			}
			}
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ä¸åå¨!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.Commit();//æäº¤äºå¡

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æ§è¡æåï¼";
			objJsonResult.data = null;
			return objJsonResult; ;
			//è¿è¡éè¦è¿è¡çå³é/åå³éæä½
			if (Type == 1) //å³éæäº¤
			{
			//å³éåæ§å¶=========================================
			string sql1 = "exec h_p_QC_ProcessCheckBill_BeforeCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_ProcessCheckBill_BeforeCloseCtrl");
			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;
			}

			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;
			}
			//==================================================================================

			//å³éæäº¤
			if (oBill.CloseBill(lngBillKey, oBill.omodel.HBillNo, "h_p_QC_ProcessCheckBill_AfterCloseCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éæå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (Type == 2) //åå³éæäº¤
			{
			//åå³éåæ§å¶=========================================
			string sql1 = "exec h_p_QC_ProcessCheckBill_BeforeUnCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_ProcessCheckBill_BeforeUnCloseCtrl");
			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;
			}

			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;
			}
			//==================================================================================


			//åå³éæäº¤
			if (oBill.CancelClose(lngBillKey, oBill.omodel.HBillNo, "h_p_QC_ProcessCheckBill_AfterUnCloseCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éæå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			return objJsonResult;
			}
			catch (Exception e)
			{
			@@ -720,22 +782,12 @@
			ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillListDetail");
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "æ æ°æ®";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception e)
			{
			@@ -831,6 +883,8 @@
			BillNew.omodel.HShiftsID = ClsPub.isLong(mainList[0].HShiftsID);
			BillNew.omodel.HErrTreatment = ClsPub.isStrNull(mainList[0].HErrTreatment);
			BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
			BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
			BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
			List<Model.ClsQC_ProcessCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillSub>>(msg3);
			BillNew.DetailColl = new List<Model.ClsQC_ProcessCheckBillSub>();
			for (int i = 0; i < subList.ToArray().Length; i++)
			@@ -868,6 +922,7 @@
			oSub.HTargetVal = DBUtility.ClsPub.isStrNull(subList[i].HTargetVal);
			oSub.HUpLimit = DBUtility.ClsPub.isStrNull(subList[i].HUpLimit);
			oSub.HDownLimit = DBUtility.ClsPub.isStrNull(subList[i].HDownLimit);
			oSub.HQCNote = DBUtility.ClsPub.isStrNull(subList[i].HQCNote);
			oSub.HUpOffSet = DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
			oSub.HDownOffSet = DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
			oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);