MES-WEB-API.git

			@@ -326,7 +326,7 @@
			}
			}

			oCN.RunProc("update QC_ProcessCheckBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);
			oCN.RunProc("update QC_ProcessCheckBillMain set HBillStatus=2,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");
			@@ -380,7 +380,7 @@
			}
			}

			oCN.RunProc("update QC_ProcessCheckBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);
			oCN.RunProc("update QC_ProcessCheckBillMain set HBillStatus=1,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");
			@@ -860,6 +860,7 @@
			BillNew.omodel.HBillNo = mainList[0].HBillNo;//éå¥typeå¾å°çåæ®å·
			BillNew.omodel.HDate = HDate;
			BillNew.omodel.HRemark = mainList[0].HRemark;//å¤æ³¨
			BillNew.omodel.HRemarkSN = mainList[0].HRemarkSN;//SNå¤æ³¨
			BillNew.omodel.HMaker = mainList[0].HMaker;
			BillNew.omodel.HSourceID = ClsPub.isLong(mainList[0].HSourceID);
			BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
			@@ -930,6 +931,11 @@
			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
			@@ -941,6 +947,10 @@
			return objJsonResult;
			}
			}




			//ä¿åå®æ¯åå¤ç
			if (OperationType.Equals("1") \|\| OperationType.Equals("2"))
			{
			@@ -948,6 +958,25 @@
			}
			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);
			}
			//æç¤º
			@@ -955,7 +984,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;
			@@ -1230,6 +1258,26 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			var s = "";
			if (BillOld.ShowBill(long.Parse(HItemID.ToString()), 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;
			}

			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");
			@@ -1324,7 +1372,7 @@
			}
			}

			#region é¦ä»¶æ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºå·¥åºåºç«å
			#region æ«ä»¶æ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºå·¥åºåºç«å
			[Route("QC_ProcessCheckBill/get_StationOutBill")]
			[HttpGet]
			public object get_StationOutBill(string HInterID, string user)
			@@ -1466,5 +1514,58 @@
			}
			}
			#endregion

			#region å·¥åºæ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºçäº§è®¢å
			[Route("QC_ProcessCheckBill/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_ProcessCheck_GetICMOBillList " + "'ç©æ','" + HICMOInterID + "','" + HICMOEntryID + "'";
			break;
			case "å·¥èºè·¯çº¿":
			sql = "exec h_p_QC_ProcessCheckB_GetICMOBillList " + "'å·¥èºè·¯çº¿','" + HICMOInterID + "','" + HICMOEntryID + "'";
			break;
			}

			}

			ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheckB_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
			}
			}