MES-WEB-API.git

			@@ -85,7 +85,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");

			//æ·»å åå
			@@ -126,6 +126,171 @@
			}
			#endregion

			#region å·¥åºæ£éªååè¡¨2 åªè·åè¡¨å¤´æ°æ®ï¼ä¸åæç»è¡ä¿¡æ¯
			[Route("QC_ProcessCheckMainBill/QC_ProcessCheckMainBillList")]
			[HttpGet]
			public object QC_ProcessCheckMainBillList(string sWhere, string user)
			{
			try
			{
			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 å¶åæ¥æ desc";
			ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillMainList");

			//æ·»å åå
			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

			#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]
			public object QC_ProcessCheckBill_Edit(string sWhere, string user)
			{
			try
			{
			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,hsubid asc";
			ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBill_Edit");

			//æ·»å åå
			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

			#region å·¥åºæ£éªå å®¡æ ¸ åå®¡æ ¸ å³é åå³é ä½åº åä½åº
			/// <summary>
			@@ -190,7 +355,52 @@

			if (IsAudit == 0) //å®¡æ ¸å¤æ
			{
			//å®¡æ ¸åæ§å¶
			DataSet BeforeDs = oCN.RunProcReturn("Exec h_p_QC_ProcessCheckBill_BeforeCheckCtrl " + HInterID.ToString() + ",'" + CurUserName + "'", "h_p_QC_ProcessCheckBill_BeforeCheckCtrl ");
			if (BeforeDs == null \|\| BeforeDs.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸åå¤æå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			oCN.RunProc("update QC_ProcessCheckBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);

			//å®¡æ ¸åæ§å¶
			DataSet EndDs = oCN.RunProcReturn("Exec h_p_QC_ProcessCheckBill_AfterCheckCtrl " + HInterID.ToString() + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'", "h_p_QC_ProcessCheckBill_AfterCheckCtrl");
			if (EndDs == null \|\| EndDs.Tables.Count == 0 \|\| EndDs.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸åå¤æå¤±è´¥ï¼";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(EndDs.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(EndDs.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -199,7 +409,53 @@
			}
			if (IsAudit == 1) //åå®¡æ ¸å¤æ
			{
			//åå®¡æ ¸åæ§å¶
			DataSet BeforeDs = oCN.RunProcReturn("Exec h_p_QC_ProcessCheckBill_BeforeUnCheckCtrl " + HInterID.ToString() + ",'" + CurUserName + "'", "h_p_QC_ProcessCheckBill_BeforeUnCheckCtrl");
			if (BeforeDs == null \|\| BeforeDs.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åå®¡æ ¸åå¤æå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			oCN.RunProc("update QC_ProcessCheckBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);

			//åå®¡æ ¸åæ§å¶
			DataSet EndDs = oCN.RunProcReturn("Exec h_p_QC_ProcessCheckBill_AfterUnCheckCtrl " + HInterID.ToString() + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'", " h_p_QC_ProcessCheckBill_AfterUnCheckCtrl");
			if (EndDs == null \|\| EndDs.Tables.Count == 0 \|\| EndDs.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åå®¡æ ¸åå¤æå¤±è´¥ï¼";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(EndDs.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(EndDs.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			}


			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -636,6 +892,11 @@
			BillNew.omodel.HQCSchemeID = ClsPub.isLong(mainList[0].HQCSchemeID);
			BillNew.omodel.HBillStatus = 1;
			BillNew.omodel.HProcID = ClsPub.isLong(mainList[0].HProcID);
			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++)
			@@ -673,6 +934,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);
			@@ -980,8 +1242,30 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			var ds = oCN.RunProcReturn("select * from QC_ProcessCheckBillMain where HInterID=" + HItemID, "QC_ProcessCheckBillMain");
			//å é¤åæ§å¶
			DataSet BeforeDs = oCN.RunProcReturn("Exec h_p_QC_ProcessCheckBill_BeforeDelCtrl " + HItemID.ToString() + ",'" + user + "'", "h_p_QC_ProcessCheckBill_BeforeDelCtrl");
			if (BeforeDs == null \|\| BeforeDs.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤åå¤æå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			if (BillOld.DeleteBill(HItemID, ref ClsPub.sExeReturnInfo) != true)
			if (BillOld.DeleteBill(HItemID, ds.Tables[0].Rows[0]["HBillNo"].ToString(), "h_p_QC_ProcessCheckBill_AfterDelCtrl", user, ref ClsPub.sExeReturnInfo) != true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;