MES-WEB-API.git

			@@ -202,7 +202,7 @@
			List<object> columnNameList = new List<object>();

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

			//æ·»å åå
			@@ -278,6 +278,9 @@
			msg2 = "[" + msg2.ToString() + "]";
			List<Model.ClsQC_FirstPieceCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillMain>>(msg2);
			DAL.ClsQC_FirstPieceCheckBill BillNew = new DAL.ClsQC_FirstPieceCheckBill();



			//å¤æä¼è®¡ææ¯å¦åç
			string s = "";
			int sYear = 0;
			@@ -323,6 +326,7 @@
			BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
			BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
			BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
			BillNew.omodel.HRemarkSN = mainList[0].HRemarkSN;
			List<Model.ClsQC_FirstPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub>>(msg3);
			BillNew.DetailColl = new List<Model.ClsQC_FirstPieceCheckBillSub>();
			for (int i = 0; i < subList.ToArray().Length; i++)
			@@ -369,6 +373,13 @@
			oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
			oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
			oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);

			oSub.HQualityStdID = DBUtility.ClsPub.isLong(subList[i].HQualityStdID);//
			oSub.HInspectMethodID = DBUtility.ClsPub.isLong(subList[i].HInspectMethodID);//
			oSub.HInspectBasisID = DBUtility.ClsPub.isLong(subList[i].HInspectBasisID);//
			oSub.HCompareSymbol = DBUtility.ClsPub.isStrNull(subList[i].HCompareSymbol);//


			BillNew.DetailColl.Add(oSub);
			}
			else
			@@ -380,7 +391,11 @@
			return objJsonResult;
			}
			}






			//ä¿åå®æ¯åå¤ç
			if (OperationType.Equals("1") \|\| OperationType.Equals("2"))
			{
			@@ -388,6 +403,24 @@
			}
			else
			{
			if (BillOld.ShowBill(mainList[0].HInterID, ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®æè¯¯ï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//å¤ææ¯å¦å¯ç¼è¾
			if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®å·²ç»è¢«å®¡æ ¸ï¼ä¸åè®¸ä¿®æ¹ï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
			}
			//æç¤º
			@@ -395,7 +428,6 @@
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			//objJsonResult.Message = "åæ®åçå®æ¯!åæ®å·:" + mainList[0].HBillNo.Trim();
			objJsonResult.Message = ClsPub.sExeReturnInfo+"åæ®å·:" + mainList[0].HBillNo.Trim();
			objJsonResult.data = null;
			return objJsonResult;
			@@ -498,7 +530,7 @@
			}
			#endregion


			#region è¿åæ£éªå¼åè¡¨
			/// <summary>
			///è¿åæ£éªå¼åè¡¨
			/// </summary>
			@@ -553,6 +585,7 @@
			return objJsonResult;
			}
			}
			#endregion

			#region é¦ä»¶æ£éªåç»´æ¤ å®¡æ ¸ åå®¡æ ¸ å³é åå³é ä½åº åä½åº
			/// <summary>
			@@ -1063,9 +1096,7 @@
			}
			#endregion




			# region é¦ä»¶æ£éªé»è¾å é¤åè½
			/// <summary>
			/// é¦ä»¶æ£éªé»è¾å é¤åè½
			/// </summary>
			@@ -1096,11 +1127,30 @@
			return objJsonResult;
			}

			var s = "";
			if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®æè¯¯ï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//å¤ææ¯å¦å¯å é¤
			if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®å·²ç»è¢«å®¡æ ¸ï¼ä¸åè®¸å é¤ï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}

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

			var ds = oCN.RunProcReturn("select * from QC_FirstPieceCheckBillMain where HInterID=" + HInterID, "QC_FirstPieceCheckBillMain");
			var ds = oCN.RunProcReturn("select * from QC_FirstPieceCheckBillMain where HInterID=" + HInterID, "QC_FirstPieceCheckBillMain");

			//å é¤åæ§å¶
			DataSet BeforeDs = oCN.RunProcReturn("Exec h_p_QC_FirstPieceCheckBill_BeforeDelCtrl " + HInterID.ToString() + ",'" + user + "'", "h_p_QC_FirstPieceCheckBill_BeforeDelCtrl");
			if (BeforeDs == null \|\| BeforeDs.Tables[0].Rows.Count == 0)
			@@ -1170,6 +1220,7 @@
			return objJsonResult;
			}
			}
			#endregion

			#region é¦ä»¶æ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºå·¥åºè¿ç«å
			[Route("QC_FirstPieceCheckBill/get_StationInBill")]
			@@ -1227,6 +1278,62 @@
			}
			#endregion

			#region é¦ä»¶æ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºå·¥åºè¿ç«å éè¿åæ®å·è·å
			[Route("QC_FirstPieceCheckBill/get_StationInBill_ByHBillNo")]
			[HttpGet]
			public object get_StationInBill_ByHBillNo(string HBillNo, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			string sReturn = "";
			string sql = "";
			if (oSystemParameter.ShowBill(ref sReturn))
			{
			switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
			{
			case "å·¥åº":
			sql = "exec h_p_QC_FirstPiece_GetStationInBillList_ByHBillNo " + "'å·¥åº','" + HBillNo + "'";
			break;
			case "ç©æ":
			sql = "exec h_p_QC_FirstPiece_GetStationInBillList_ByHBillNo " + "'ç©æ','" + HBillNo + "'";
			break;
			case "å·¥èºè·¯çº¿":
			sql = "exec h_p_QC_FirstPiece_GetStationInBillList_ByHBillNo " + "'å·¥èºè·¯çº¿','" + HBillNo + "'";
			break;
			}

			}

			ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPiece_GetStationInBillList");

			//æ·»å åå
			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 = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region é¦ä»¶/å·¥åº æ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºå·¥åºæµè½¬å¡
			[Route("CheckBill/get_ProcessExchangeBill")]
			[HttpGet]
			@@ -1250,6 +1357,62 @@
			break;
			case "å·¥èºè·¯çº¿":
			sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'å·¥èºè·¯çº¿','" + HInterID + "','" + HEntryID + "'";
			break;
			}

			}

			ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPiece_GetProcessExchangeBillList");

			//æ·»å åå
			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 = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region é¦ä»¶/å·¥åº æ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºå·¥åºæµè½¬å¡ æ ¹æ®åæ®å·æ¥è¯¢
			[Route("CheckBill/get_ProcessExchangeBill_ByBillNo")]
			[HttpGet]
			public object get_ProcessExchangeBill_ByBillNo(string HBillNo, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			string sReturn = "";
			string sql = "";
			if (oSystemParameter.ShowBill(ref sReturn))
			{
			switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
			{
			case "å·¥åº":
			sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList_ByBillNo " + "'å·¥åº','" + HBillNo + "'";
			break;
			case "ç©æ":
			sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList_ByBillNo " + "'ç©æ','" + HBillNo + "'";
			break;
			case "å·¥èºè·¯çº¿":
			sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList_ByBillNo " + "'å·¥èºè·¯çº¿','" + HBillNo + "'";
			break;
			}

			@@ -1393,5 +1556,164 @@
			}
			#endregion

			#region é¦ä»¶æ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºçäº§è®¢å
			[Route("QC_FirstPieceCheckBill/get_ICMOBill")]
			[HttpGet]
			public object get_ICMOBill(string HICMOInterID, string HICMOEntryID, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			string sReturn = "";
			string sql = "";
			if (oSystemParameter.ShowBill(ref sReturn))
			{
			switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
			{
			case "ç©æ":
			sql = "exec h_p_QC_FirstPiece_GetICMOBillList " + "'ç©æ','" + HICMOInterID + "','" + HICMOEntryID + "'";
			break;
			case "å·¥èºè·¯çº¿":
			sql = "exec h_p_QC_FirstPiece_GetICMOBillList " + "'å·¥èºè·¯çº¿','" + HICMOInterID + "','" + HICMOEntryID + "'";
			break;
			}

			}

			ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPiece_GetICMOBillList");

			//æ·»å åå
			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 = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region é¦ä»¶æ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºçäº§è®¢å éè¿åæ®å·å¸¦åº
			[Route("QC_FirstPieceCheckBill/get_ICMOBill_ByBillNo")]
			[HttpGet]
			public object get_ICMOBill_ByBillNo(string HBillNo, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			string sReturn = "";
			string sql = "";
			if (oSystemParameter.ShowBill(ref sReturn))
			{
			switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
			{
			case "ç©æ":
			sql = "exec h_p_QC_FirstPiece_GetICMOBillList_ByBillNo " + "'ç©æ','" + HBillNo + "'";
			break;
			case "å·¥èºè·¯çº¿":
			sql = "exec h_p_QC_FirstPiece_GetICMOBillList_ByBillNo " + "'å·¥èºè·¯çº¿','" + HBillNo + "'";
			break;
			}

			}

			ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPiece_GetICMOBillList_ByBillNo");

			//æ·»å åå
			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 = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region å·¡æ£æ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºçäº§è®¢å
			[Route("QC_PatrolProcCheckBill/get_ICMOBill")]
			[HttpGet]
			public object get_ICMOBill_PatrolProcCheck(string HICMOInterID, string HICMOEntryID, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

			string sReturn = "";
			string sql = "";
			if (oSystemParameter.ShowBill(ref sReturn))
			{
			switch (oSystemParameter.omodel.QC_PatrolProcCheckBill_QCSchemeSource)
			{
			case "ç©æ":
			sql = "exec h_p_QC_PatrolProcCheck_GetICMOBillList " + "'ç©æ','" + HICMOInterID + "','" + HICMOEntryID + "'";
			break;
			case "å·¥èºè·¯çº¿":
			sql = "exec h_p_QC_PatrolProcCheck_GetICMOBillList " + "'å·¥èºè·¯çº¿','" + HICMOInterID + "','" + HICMOEntryID + "'";
			break;
			}

			}

			ds = oCN.RunProcReturn(sql, "h_p_QC_PatrolProcCheck_GetICMOBillList");

			//æ·»å åå
			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 = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			}
			}