MES-WEB-API.git

			@@ -24,7 +24,7 @@
			//è·åç³»ç»åæ°
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

			#region è½¦é´èªæ£ååè¡¨ ä¸ ç¼è¾åæ¾
			#region è½¦é´èªæ£ååè¡¨
			[Route("QC_WorkSelfCheckBill/QC_WorkSelfCheckBillList")]
			[HttpGet]
			public object QC_FirstPieceCheckBillList(string sWhere, string user)
			@@ -33,9 +33,19 @@
			{
			List<object> columnNameList = new List<object>();

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

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

			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			@@ -47,6 +57,109 @@

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			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_WorkSelfCheckBill/QC_WorkSelfCheckBillEdit")]
			[HttpGet]
			public object QC_WorkSelfCheckBillEdit(string sWhere, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();

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

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

			//æ·»å åå
			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.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_WorkSelfCheckBill/QC_WorkSelfCheckBillListPage")]
			[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_WorkSelfCheckBill_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_WorkSelfCheckBillListPage " + page + "," + size + ",''", "h_p_QC_WorkSelfCheckBillListPage");
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_QC_WorkSelfCheckBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_QC_WorkSelfCheckBillListPage");
			}

			//æ·»å åå
			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];
			@@ -128,6 +241,7 @@
			BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID);
			BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);
			BillNew.omodel.HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty);
			BillNew.omodel.HProcID = ClsPub.isLong(mainList[0].HProcID);
			BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
			BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
			BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);
			@@ -187,7 +301,7 @@
			oSub.HUpOffSet= DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
			oSub.HDownOffSet= DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
			oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);
			oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
			oSub.HKeyInspect = DBUtility.ClsPub.isBool(subList[i].HKeyInspect);
			oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
			oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
			BillNew.DetailColl.Add(oSub);
			@@ -397,44 +511,32 @@
			return objJsonResult;
			}

			ClsPub.CurUserName = user;
			BillOld.MvarItemKey = "QC_WorkSelfCheckBillMain";
			oCN.BeginTran();//å¼å§äºå¡
			ClsPub.CurUserName = user;
			DAL.ClsQC_WorkSelfCheckBill oBill = new DAL.ClsQC_WorkSelfCheckBill();
			oBill.MvarItemKey = "QC_WorkSelfCheckBillMain";

			//Type 1 å®¡æ ¸ 2 åå®¡æ ¸
			if (Type == 1)
			//éå¯¹éè¦è¿è¡çæä½ï¼æ£éªå½ååæ®çç¶ææ¯å¦æ¯æéè¦è¿è¡çæä½
			if (oBill.ShowBill(long.Parse(HInterID), 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.HCloseMan.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.HDeleteMan.Trim() != "")
			{
			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 (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]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·²ä½åº!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (Type == 1) //å®¡æ ¸å¤æ
			{
			if (oBill.omodel.HChecker.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -442,42 +544,10 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//å®¡æ ¸åæ®
			if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			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 (Type == 2) //åå®¡æ ¸å¤æ
			{
			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 (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]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			if (oBill.omodel.HChecker.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -485,25 +555,113 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//åå®¡æ ¸åæ®
			if (!BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			{
			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; ;
			//Type 1 å®¡æ ¸ 2 åå®¡æ ¸
			if (Type == 1)
			{
			oCN.BeginTran();

			//å®¡æ ¸åæ§å¶=========================================
			string sql1 = "exec h_p_QC_WorkSelfCheckBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_WorkSelfCheckBill_BeforeCheckCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :å®¡æ ¸åå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			oCN.RollBack();
			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;
			oCN.RollBack();
			return objJsonResult;
			}
			//==================================================================================

			//å®¡æ ¸æäº¤
			if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_QC_WorkSelfCheckBill_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			oCN.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸æåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			oCN.RollBack();

			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_WorkSelfCheckBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_WorkSelfCheckBill_BeforeUnCheckCtrl");
			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;
			}
			//===========================================================

			//åå®¡æ ¸æäº¤AbandonCheck
			if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_QC_WorkSelfCheckBill_AfterUnCheckCtrl", 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)
			@@ -544,57 +702,47 @@
			}

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

			//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]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
			}
			if (Type == 2) //åå³éå¤æ
			{
			if (oBill.omodel.HCloseMan.Trim() == "")
			{
			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.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.Message = "åæ®æªå³é!ä¸éè¦åå³éï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -602,55 +750,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]["HChecker"] == null \|\| ds.Tables[0].Rows[0]["HChecker"].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_WorkSelfCheckBill_BeforeCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_WorkSelfCheckBill_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_WorkSelfCheckBill_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_WorkSelfCheckBill_BeforeUnCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_WorkSelfCheckBill_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_WorkSelfCheckBill_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)
			@@ -826,13 +1020,58 @@


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

			//å é¤åæ§å¶=========================================
			string sql1 = "exec h_p_QC_WorkSelfCheckBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_WorkSelfCheckBill_BeforeDelCtrl");
			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;
			}
			//==================================================================================

			oCN.RunProc("Delete From QC_WorkSelfCheckBillMain where HInterID = " + HInterID);
			oCN.RunProc("Delete From QC_WorkSelfCheckBillSub where HInterID = " + HInterID);
			oCN.RunProc("Delete From QC_WorkSelfCheckBillSub_ValueGrid where HInterID = " + HInterID);
			oCN.RunProc("Delete From QC_WorkSelfCheckBillSub_Result where HInterID = " + HInterID);


			//å é¤åæ§å¶==================================================================================
			string sql2 = "exec h_p_QC_WorkSelfCheckBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_QC_WorkSelfCheckBill_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤å¤±è´¥!åå :å é¤åå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			oCN.RollBack();
			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;
			oCN.RollBack();
			return objJsonResult;
			}
			//==============================================================================================

			//æäº¤äºå¡
			oCN.Commit();
			objJsonResult.code = "1";
			@@ -913,7 +1152,7 @@
			#region è½¦é´æ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºå·¥åºæµè½¬å¡
			[Route("QC_WorkSelfCheckBill/get_ProcessExchangeBill")]
			[HttpGet]
			public object get_ProcessExchangeBill(string HInterID, string user)
			public object get_ProcessExchangeBill(string HInterID, string HEntryID, string user)
			{
			try
			{
			@@ -926,13 +1165,13 @@
			switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
			{
			case "å·¥åº":
			sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'å·¥åº','" + HInterID + "'";
			sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'å·¥åº','" + HInterID + "','" + HEntryID + "'";
			break;
			case "ç©æ":
			sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'ç©æ','" + HInterID + "'";
			sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'ç©æ','" + HInterID + "','" + HEntryID + "'";
			break;
			case "å·¥èºè·¯çº¿":
			sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'å·¥èºè·¯çº¿','" + HInterID + "'";
			sql = "exec h_p_QC_FirstPiece_GetProcessExchangeBillList " + "'å·¥èºè·¯çº¿','" + HInterID + "','" + HEntryID + "'";
			break;
			}