~yxj/MES-WEB-API.git

			@@ -42,9 +42,21 @@
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string OperationType = sArray[2].ToString().Trim();
			string user = sArray[3].ToString();//ç¨æ·å

			bool bResult;
			try
			{
			//å¤ææé
			if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ ä¿åæé";
			objJsonResult.data = null;
			return objJsonResult;
			}

			msg2 = "[" + msg2.ToString() + "]";
			List<Model.ClsQC_ProcessCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillMain>>(msg2);
			DAL.ClsQC_ProcessCheckBill BillNew = new DAL.ClsQC_ProcessCheckBill();
			@@ -72,7 +84,7 @@
			BillNew.omodel.HSourceID = ClsPub.isLong(mainList[0].HSourceID);
			BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
			BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
			BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
			BillNew.omodel.HICMOEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
			BillNew.omodel.HProcExchInterID = ClsPub.isLong(mainList[0].HProcExchInterID);
			BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID);
			BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);
			@@ -160,6 +172,57 @@
			}
			#endregion


			#region å·¥åºæ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºçäº§ç¶æä¸´æ¶è¡¨ï¼3722ï¼
			/// <summary>
			///åæ°ï¼string sqlã
			///è¿åå¼ï¼objectã
			/// </summary>
			[Route("QC_ProcessCheckBill/get_ICMOBillStatus_Tmp")]
			[HttpGet]
			public object get_ICMOBillStatus_Tmp(int HInterID, int HEntryID, string HBillType)
			{
			try
			{
			if (HInterID == 0 \|\| HBillType.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ°ä¸å¨ï¼è·åæºåä¿¡æ¯å¤±è´¥ï¼HInterIDï¼" + HInterID + "ï¼HEntryIDï¼" + HEntryID + "ï¼HBillTypeï¼" + HBillType + "ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_QC_GetInfoByICMOStatusBill " + HInterID + "," + HEntryID + "," + HBillType, "h_p_QC_GetInfoByICMOStatusBill");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "è¿åè®°å½æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region å·¥åºæ£éªåOld
			/// <summary>
			@@ -319,11 +382,21 @@
			/// </summary>
			[Route("QC_ProcessCheckBill/Delete_Json")]
			[HttpGet]
			public object Delete_Json(long HItemID)
			public object Delete_Json(long HItemID,string user)
			{
			DAL.ClsQC_ProcessCheckBill BillOld = new DAL.ClsQC_ProcessCheckBill();
			try
			{
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ å é¤æéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (BillOld.DeleteBill(HItemID, ref ClsPub.sExeReturnInfo) != true)
			{
			objJsonResult.code = "1";
			@@ -357,36 +430,47 @@
			/// </summary>
			[Route("QC_ProcessCheckBill/GetProcessCheckBillList")]
			[HttpGet]
			public object GetProcessCheckBillList(string sWhere)
			public object GetProcessCheckBillList(string sWhere,string user)
			{
			try
			{
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_QC_ProcessCheckBillList " + sWhere, "h_v_QC_ProcessCheckBillList");
			}
			else
			{
			string sql1 = "select * from h_v_QC_ProcessCheckBillList where 1 = 1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "falseï¼";
			objJsonResult.Message = "æ æ¥çæéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_QC_ProcessCheckBillListDetail order by hmainid desc ", "h_v_QC_ProcessCheckBillListDetail");
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			string sql1 = "select * from h_v_QC_ProcessCheckBillListDetail where 1 = 1 ";
			string sql = sql1 + sWhere+ " order by hmainid desc ";
			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)
			{