~yxj/MES-WEB-API.git

			@@ -156,11 +156,15 @@
			",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
			",HGroupID,HDeptID,HDeptNumber" +
			",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
			",HChecker,HCheckDate,HUpDater,HUpDateDate,HDeleteMan,HDeleteDate,HPrintQty,HCheckType" +
			",HERPInterID,HERPBillType,HPRDORGID" +
			") " +
			" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker+ "',getdate()" +
			"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HEmpID.ToString() + "','" + omodel.HEmpNumber +
			"','" + omodel.HGroupID.ToString() + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber +
			"','" + omodel.HMainSourceBillNo.ToString() + "'," + omodel.HMainSourceInterID.ToString() + ",'" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillType + "'" +
			"','" + omodel.HMainSourceBillNo.ToString() + "'," + omodel.HMainSourceInterID.ToString() + ",'" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillType + "','" + omodel.HChecker + "','" + omodel.HCheckDate + "','" + omodel.HUpDater +
			"','" + omodel.HUpDateDate + "','" + omodel.HDeleteMan + "','" + omodel.HDeleteDate + "'," + omodel.HPrintQty +
			",'" + omodel.HCheckType + "'," + omodel.HERPInterID + ",'" + omodel.HERPBillType + "'," + omodel.HPRDORGID +
			") ");
			//插入子表
			foreach (Models.ClsSc_ICMOReportBillSub oSub in DetailColl)
			@@ -173,14 +177,23 @@
			"HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
			",HICMOInterID,HICMOBillNo,HBarCode" +
			",HOWNERTYPEID,HISENTRUST,HSTOCKINORGID,HOWNERID,HCHECKPRODUCT,HQAIP,HCOSTRATE,HISBACKFLUSH" +
			",HREQSRC,HREQBILLNO,HREQBILLID,HREQENTRYSEQ,HREQENTRYID,HMOMAINENTRYID,HSTOCKINQUASELQTY" +
			",HPRODUCTTYPE,HPROJECTNO,HICMOENTRYSEQ,HSEQ,HPRODUCEDATE,HEXPIRYDATE,HBASEUNITID,HDEPTID" +
			",HGroupID,HDESCRIPTION" +
			",HSourceNumber,HQPQty,HICMOEntryID" +
			",HWhID,HSPID,HBatChNo,HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID" +
			") values("
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber + "'" +
			"," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HTimes.ToString() + "," + oSub.HSourceID.ToString() +
			"," + oSub.HQtyMust.ToString() + "," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HBadCount.ToString() + "," + oSub.HWasterQty.ToString() +
			",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			"," + oSub.HSourceInterID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
			"," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "'" +
			"," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "','" + oSub.HOWNERTYPEID + "'," +
			oSub.HISENTRUST + "," + oSub.HSTOCKINORGID + "," + oSub.HOWNERID + "," + oSub.HCHECKPRODUCT + ",'" + oSub.HQAIP + "'," +
			oSub.HCOSTRATE + "," + oSub.HISBACKFLUSH + ",'" + oSub.HREQSRC + "','" + oSub.HREQBILLNO + "'," + oSub.HREQBILLID + "," +
			oSub.HREQENTRYSEQ + "," + oSub.HREQENTRYID + "," + oSub.HMOMAINENTRYID + "," + oSub.HSTOCKINQUASELQTY + "," + oSub.HPRODUCTTYPE + ",'" + oSub.HPROJECTNO + "'," + oSub.HICMOENTRYSEQ + "," + oSub.HSEQ + ",'" + oSub.HPRODUCEDATE + "','" + oSub.HEXPIRYDATE + "'," + oSub.HBASEUNITID + "," + oSub.HDEPTID + "," + oSub.HGroupID + ",'" + oSub.HDESCRIPTION + "','" + oSub.HSourceNumber + "'," + oSub.HQPQty + "," + oSub.HSourceEntryID + "," + oSub.HICMOEntryID + "," + oSub.HWhID + "," + oSub.HSPID + ",'" + oSub.HBatChNo + "'," + oSub.HAuxPropID + ",'" + oSub.HMTONo + "'," + oSub.HPlanMode + "," + oSub.HERPInterID + "," + oSub.HERPEntryID +
			") ");
			}
			//
			@@ -307,6 +320,90 @@
			}
			}

			//审核
			public bool CheckBill(Int64 lngBillKey, ref string sReturn)
			{

			try
			{
			string HChecker = DBUtility.ClsPub.CurUserName;
			string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
			oCn.BeginTran();
			oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());

			sReturn = "审核单据成功！";
			oCn.Commit();

			sReturn = "";
			return true;
			}
			catch (Exception e)
			{
			sReturn = e.Message;
			throw (e);
			}
			}

			//反审核
			public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
			{

			try
			{
			string HChecker = DBUtility.ClsPub.CurUserName;
			string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
			oCn.BeginTran();
			//还原单据状态为未审核状态
			oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='1',HChecker='',HCheckDate='' Where HInterID=" + lngBillKey.ToString());
			sReturn = "反审核单据成功！";
			oCn.Commit();
			sReturn = "";
			return true;
			}
			catch (Exception e)
			{
			sReturn = e.Message;
			throw (e);
			}
			}

			//删除单据
			public virtual bool DeleteBill(Int64 lngBillKey, ref string sReturn)
			{
			try
			{
			oCn.BeginTran();
			//查询生产汇报单表数量
			DataSet ds = oCn.RunProcReturn("select a.HBillNo,b.HSourceInterID,b.HSourceEntryID from Sc_ICMOReportBillMain a inner join Sc_ICMOReportBillSub b on a.HInterID = b.HInterID where a.HInterID = '" + lngBillKey + "'", "Sc_ICMOReportBillMain");
			string HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
			string HSourceInterID = ds.Tables[0].Rows[0]["HSourceInterID"].ToString();
			string HSourceEntryID = ds.Tables[0].Rows[0]["HSourceEntryID"].ToString();
			//
			//更新产量汇报临时表是否报检申请状态
			string sql1 = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set HRelationInterID='0' where HICMOReportBillNo='"+ HBillNo + "' and HICMOInterID='"+ HSourceInterID + "' and HICMOEntryID='"+ HSourceEntryID + "'");
			oCn.RunProc(sql1);

			//删除关联
			DeleteRelation(ref sReturn, lngBillKey);
			//删除明细表
			DeleteBillSub(lngBillKey);
			//删除主表
			DeleteBillMain(lngBillKey);

			sReturn = "删除单据成功！";
			oCn.Commit();
			return true;
			}
			catch (Exception e)
			{
			sReturn = e.Message;
			oCn.RollBack();
			throw (e);
			}
			}



			//扫码生成产量汇报单（无条码出入库记录）
			public bool AddBill_PDA2(ref string sReturn)
			{