MES-WEB-API.git

			@@ -68,6 +68,10 @@
			bool HLastResult = list[0].HLastResult;//è¯æ ·ç»è®º
			Int64 HProcExchInterID = list[0].HProcExchInterID;//æå¼å¡ID
			Int64 HProcExchEntryID = list[0].HProcExchEntryID;//æå¼å¡åID
			long HMainSourceInterID = list[0].HMainSourceInterID;//æºåID
			long HMainSourceEntryID = list[0].HMainSourceEntryID;//æºååID
			string HMainSourceBillNo = list[0].HMainSourceBillNo;//æºååå·
			string HMainSourceBillType = list[0].HMainSourceBillType;//æºåç±»å

			//è¡¨ä½æ°æ®
			List<Model.ClsQC_ProcessCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillSub>>(msg_entry);
			@@ -154,10 +158,11 @@
			oCN.RunProc("Insert Into QC_ProcessCheckBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
			",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchBillNo" +
			",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID,HProcID)" +
			",HPRDORGID,HLastResult,HProcExchInterID,HProcExchEntryID,HProcID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
			" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
			"," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
			"," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + "," + HProcID + ") ");
			"," + HPRDORGID + ",'" + HLastResult + "'," + HProcExchInterID + "," + HProcExchEntryID + "," + HProcID + "," + HMainSourceInterID +
			"," + HMainSourceEntryID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" + ") ");

			//æå¥åè¡¨
			foreach (Model.ClsQC_ProcessCheckBillSub oSub in BillNew.DetailColl)
			@@ -169,8 +174,8 @@
			",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue,HResult" +
			",HProcCheckEmp,HProcCheckTime,HStatus,HUnitID,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
			") values("
			+ HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HICMOInterID.ToString() +
			"," + HICMOEntryID.ToString() + ",'" + HICMOBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			+ HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + HMainSourceInterID.ToString() +
			"," + HMainSourceEntryID.ToString() + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			"," + oSub.HQCCheckClassID.ToString() + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCRelValue + "','" + oSub.HResult + "'" +
			"," + oSub.HProcCheckEmp.ToString() + ",GETDATE()" + ",'" + oSub.HStatus +
			"'," + oSub.HUnitID + "," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
			@@ -225,6 +230,13 @@
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select ManagerFlag from gy_czygl where czymc='" + user.Trim() + "'", "gy_czygl");
			if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"]) //æ¯å¦ç®¡çå
			{
			//ä¸æ¯ç®¡çå
			sWhere += " and å¶åäºº = '" + user + "'";
			}

			string sql = "select * from h_v_QC_ProcessCheckBillMainList where 1=1 " + sWhere + " order by æ¥æ ";

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